Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

10527 404static.xhtml has an old date in the footer (2023 is hard-coded) and update URLs #10535

Merged
merged 3 commits into from
Sep 12, 2024
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 52 additions & 43 deletions src/main/webapp/404static.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,71 +8,71 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="description" content="Share, archive, and get credit for your data. Find and cite data across all research fields." />

<link type="image/png" rel="icon" href="https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/images/favicondataverse.png.xhtml" />

<link type="image/png" rel="image_src" href="https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/images/dataverseproject.png.xhtml" />

<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" />
<link type="image/png" rel="icon" href="https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/images/fav/favicon-16x16.png" />

<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css" />
<link type="image/png" rel="image_src" href="https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/images/dataverseproject.png" />

<link rel="stylesheet" href="https://cdn.rawgit.com/IQSS/dataverse/develop/src/main/webapp/resources/css/structure.css" />
<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" />

<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap-theme.min.css" />

<link rel="stylesheet" type="text/html" href="https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/css/structure.css" />

<style type="text/css">
/* FontCustom CSS */
@font-face {
font-family: "fontcustom";
src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot");
src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot?#iefix") format("embedded-opentype"),
url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.woff") format("woff"),
url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.ttf") format("truetype"),
url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
font-weight: normal;
font-style: normal;
font-family: "fontcustom";
src: url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot");
src: url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot?#iefix") format("embedded-opentype"),
url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff") format("woff"),
url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf") format("truetype"),
url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg");
font-weight: normal;
font-style: normal;
}

@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: "fontcustom";
src: url("https://cdn.rawgit.com/IQSS/dataverse/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg");
}
@font-face {
font-family: "fontcustom";
src: url("https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg");
}
}

[data-icon]:before { content: attr(data-icon); }

[data-icon]:before,
.icon-dataverse:before {
display: inline-block;
font-family: "fontcustom";
font-style: normal;
font-weight: normal;
font-variant: normal;
line-height: 1;
text-decoration: inherit;
text-rendering: optimizeLegibility;
text-transform: none;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
display: inline-block;
font-family: "fontcustom";
font-style: normal;
font-weight: normal;
font-variant: normal;
line-height: 1;
text-decoration: inherit;
text-rendering: optimizeLegibility;
text-transform: none;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
}

.icon-dataverse:before { content: "\f100"; }

/* Custom CSS */
#navbarFixed div.navbar-header img.navbar-brand.custom-logo {height:50px !important;}
#dataverseDesc span > span > span > h3 {font-weight: 300 !important;}
#dataverseDesc span>span>span>h3 {font-weight: 300 !important;}

nav.navbar.navbar-default {background: #ececec !important;}
</style>
</head>
<body>
<div id="dataverse-header-block">
<nav id="dataverse-header-block">
<!-- Navbar Panel -->
<nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
<div id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<h:outputFormat class="navbar-brand custom-logo" value="#{bundle['footer.dataverseProject']}"/>
<h:outputFormat class="navbar-brand custom-logo" value="#{bundle['footer.dataverseProject']}" />
</div>
<div class="collapse navbar-collapse" id="topNavBar">
<ul class="nav navbar-nav navbar-right">
Expand All @@ -82,9 +82,9 @@
</ul>
</div>
</div>
</nav>
</div>
<div class="container" id="content">
</div>
</nav>
<div class="container" id="content" role="main" style="margin-top:3em;">
<div class="alert alert-danger" role="alert" style="margin-top:3em;">
<h:outputFormat value="#{bundle['error.404.message']}" escape="false" />
</div>
Expand All @@ -93,17 +93,26 @@
<div class="container">
<div class="row">
<div class="col-sm-8 small">
<p>Copyright &#169; 2023, The President &#38; Fellows of Harvard College | <a href="http://best-practices.dataverse.org/harvard-policies/harvard-privacy-policy.html" target="_blank">Privacy Policy</a>
<p>Copyright &#169;<span id="current-year"></span>, The President &#38; Fellows of Harvard College | <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink>
</p>
</div>
<div class="col-sm-4 text-right">
<div class="poweredbylogo">
<span>Powered by</span>
<a href="http://dataverse.org/" title="The Dataverse Project" target="_blank"><img src="https://cdn.rawgit.com/IQSS/dataverse/develop/src/main/webapp/resources/images/dataverseproject_logo.png" alt="The Dataverse Project" /></a>
<span>Powered by</span>
<a href="https://dataverse.org/" title="The Dataverse Project" target="_blank"><img src="https://raw.githubusercontent.com/IQSS/dataverse/develop/src/main/webapp/resources/images/dataverseproject_logo.png" alt="The Dataverse Project" /></a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

<script>
//<![CDATA[
const d = new Date();
let year = d.getFullYear();
document.getElementById("current-year").innerHTML = " " + d.getFullYear();
//]]>
</script>

</html>