Commit bd1b593b authored by Matija Obreza's avatar Matija Obreza

JSP formatted

parent 531590e1
......@@ -4,8 +4,7 @@
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dwc="http://rs.tdwg.org/dwc/terms/"
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#" xmlns:germplasmType="http://purl.org/germplasm/germplasmType#"
>
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#" xmlns:germplasmType="http://purl.org/germplasm/germplasmType#">
<head>
<title><sitemesh:write property="title" /></title>
<meta charset="utf-8" />
......@@ -24,8 +23,7 @@
<!-- opensearch.org -->
<link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />"
title="<spring:message code="search.input.placeholder" />"
/>
title="<spring:message code="search.input.placeholder" />" />
<!-- l10n -->
<link rel="alternate" hreflang="en" href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
......@@ -65,76 +63,62 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<c:url value="/1/admin/" />">
<spring:message code="page.home.title" />
<a class="navbar-brand" href="<c:url value="/1/admin/" />"> <spring:message code="page.home.title" />
</a>
</div>
<div id="navbar-admin" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="hidden-sm">
<a href="<c:url value="/1/welcome" />" title="<spring:message code="menu.home" />">
<spring:message code="menu.home" />
<a href="<c:url value="/1/welcome" />" title="<spring:message code="menu.home" />"> <spring:message code="menu.home" />
</a>
</li>
<li>
<a class="" href="<c:url value="/1/admin/cache/" />">
<spring:message code="menu.admin.caches" />
<a class="" href="<c:url value="/1/admin/cache/" />"> <spring:message code="menu.admin.caches" />
</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<spring:message code="menu.admin.usermanagement" />
<span class="caret"></span>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.usermanagement" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/1/admin/users/" />">
<spring:message code="user.pulldown.users" />
<a href="<c:url value="/1/admin/users/" />"> <spring:message code="user.pulldown.users" />
</a>
</li>
<li>
<a href="<c:url value="/1/admin/teams/" />">
<spring:message code="user.pulldown.teams" />
<a href="<c:url value="/1/admin/teams/" />"> <spring:message code="user.pulldown.teams" />
</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<spring:message code="menu.admin.repository" />
<span class="caret"></span>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.repository" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/1/admin/r/files/" />">
<spring:message code="menu.admin.repository.files" />
<a href="<c:url value="/1/admin/r/files/" />"> <spring:message code="menu.admin.repository.files" />
</a>
</li>
<li>
<a href="<c:url value="/1/admin/r/g" />">
<spring:message code="menu.admin.repository.galleries" />
<a href="<c:url value="/1/admin/r/g" />"> <spring:message code="menu.admin.repository.galleries" />
</a>
</li>
</ul>
</li>
<li>
<a class="" href="<c:url value="/1/admin/logger/" />">
<spring:message code="menu.admin.loggers" />
<a class="" href="<c:url value="/1/admin/logger/" />"> <spring:message code="menu.admin.loggers" />
</a>
</li>
<li>
<a class="" href="<c:url value="/1/admin/ds2/" />">
<spring:message code="menu.admin.ds2" />
<a class="" href="<c:url value="/1/admin/ds2/" />"> <spring:message code="menu.admin.ds2" />
</a>
</li>
<li>
<a class="" href="<c:url value="/1/admin/kpi/" />">
<spring:message code="menu.admin.kpi" />
<a class="" href="<c:url value="/1/admin/kpi/" />"> <spring:message code="menu.admin.kpi" />
</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<%@include file="languages.jspf" %>
<%@include file="languages.jspf"%>
</ul>
</div>
</div>
......
......@@ -6,30 +6,50 @@
<div class="container-fluid">
<!-- <p class="text-muted">Place sticky footer content here.</p> -->
<div class="footer-logo">
<a href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg" alt="Genesys - Gateway to Genetic Resources" /><img src="/html/1/images/GENESYS-LOGO_black.svg" alt="Genesys - Gateway to Genetic Resources" /></a>
<a href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg" alt="Genesys - Gateway to Genetic Resources" /><img src="/html/1/images/GENESYS-LOGO_black.svg"
alt="Genesys - Gateway to Genetic Resources" /></a>
</div>
<div id="nav-foot" class="clearfix">
<ul class="nav text-center">
<li><a href="<c:url value="/1/content/about/about" />"><spring:message code="menu.about" /></a></li>
<li><a href="<c:url value="/1/content/about/contact" />"><spring:message code="menu.contact" /></a></li>
<li><a href="<c:url value="/1/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a></li>
<li><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a></li>
<li class="notimportant"><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a></li>
<li><a href="<c:url value="/1/content/legal/terms" />"><spring:message code="menu.terms" /></a></li>
<li><a href="<c:url value="/1/content/legal/copying" />"><spring:message code="menu.copying" /></a></li>
<li><a href="<c:url value="/1/content/legal/privacy" />"><spring:message code="menu.privacy" /></a></li>
</ul>
<div class="text-center" id="copyright">
<p><spring:message code="footer.copyright-statement" /></p>
<ul class="nav text-center">
<li>
<a href="<c:url value="/1/content/about/about" />"><spring:message code="menu.about" /></a>
</li>
<li>
<a href="<c:url value="/1/content/about/contact" />"><spring:message code="menu.contact" /></a>
</li>
<li>
<a href="<c:url value="/1/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a>
</li>
<li>
<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a>
</li>
<li class="notimportant">
<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a>
</li>
<li class="notimportant">
<a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a>
</li>
<li>
<a href="<c:url value="/1/content/legal/terms" />"><spring:message code="menu.terms" /></a>
</li>
<li>
<a href="<c:url value="/1/content/legal/copying" />"><spring:message code="menu.copying" /></a>
</li>
<li>
<a href="<c:url value="/1/content/legal/privacy" />"><spring:message code="menu.privacy" /></a>
</li>
</ul>
<div class="text-center" id="copyright">
<p>
<spring:message code="footer.copyright-statement" />
</p>
</div>
</div>
</div>
<div class="text-center footer-link">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br />
<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
<div class="text-center footer-link">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br /> <a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
</div>
</div>
</footer>
......
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<c:out value="${pageContext.response.locale.displayLanguage}" />
<span class="caret"></span>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <c:out value="${pageContext.response.locale.displayLanguage}" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
......@@ -32,8 +30,7 @@
<a href="<c:url value="/zh${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Chinese</a>
</li>
<li>
<a target="_blank" href="https://www.transifex.com/projects/p/genesys/">
<spring:message code="menu.translate" />
<a target="_blank" href="https://www.transifex.com/projects/p/genesys/"> <spring:message code="menu.translate" />
</a>
</li>
</ul>
......
......@@ -2,10 +2,9 @@
<!DOCTYPE html>
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}" class="genesys-page"
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}" class="genesys-page"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dwc="http://rs.tdwg.org/dwc/terms/"
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#" xmlns:germplasmType="http://purl.org/germplasm/germplasmType#"
>
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#" xmlns:germplasmType="http://purl.org/germplasm/germplasmType#">
<head>
<title><sitemesh:write property="title" /></title>
<meta charset="utf-8" />
......@@ -24,8 +23,7 @@
<!-- opensearch.org -->
<link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />"
title="<spring:message code="search.input.placeholder" />"
/>
title="<spring:message code="search.input.placeholder" />" />
<!-- l10n -->
<link rel="alternate" hreflang="en" href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment