Commit f886a42d authored by Matija Obreza's avatar Matija Obreza
Browse files

Links & CSS fixed

parent dfdfe6d0
......@@ -34,7 +34,7 @@
<div style="display: none" id="session_expired_popup" title="<spring:message code="session.expiry-warning-title" />" >
<div style="margin-bottom: 1em;"><spring:message code="session.expiry-warning" /></div>
<a class="btn btn-primary" href="${pageContext.servletContext.contextPath}"><spring:message code="session.expiry-extend" /></a>
<a class="btn btn-primary" href="<c:out value="/" />"><spring:message code="session.expiry-extend" /></a>
</div>
<!-- Bootstrap core JavaScript
......
......@@ -76,7 +76,7 @@
<li><a href="<c:url value="/pt${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Portugese</a></li>
<li><a href="<c:url value="/ru${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Russian</a></li>
<li><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/">Translate Genesys</a></li>
<li><a target="_blank" href="https://www.transifex.com/projects/p/genesys/"><spring:message code="menu.translate" /></a></li>
</ul>
</li>
</ul>
......@@ -143,32 +143,26 @@
<li class="dropdown" id="lang">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><c:out value="${pageContext.response.locale.displayLanguage}" /> <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu">
<li><a href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">English</a></li>
<li><a href="<c:url value="/ar${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.REMAININGURL')}?${pageContext.request.queryString}" />">Arabic</a></li>
<li><a href="<c:url value="/de${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">German</a></li>
<li><a href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">English</a></li>
<li><a href="<c:url value="/ar${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Arabic</a></li>
<li><a href="<c:url value="/de${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">German</a></li>
<li><a href="<c:url value="/es${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Spanish</a></li>
<li><a href="<c:url value="/fa${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Persian</a></li>
<li><a href="<c:url value="/fr${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">French</a></li>
<li><a href="<c:url value="/pt${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Portugese</a></li>
<li><a href="<c:url value="/ru${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />">Russian</a></li>
<li><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/">Translate Genesys</a></li>
<li><a target="_blank" href="https://www.transifex.com/projects/p/genesys/"><spring:message code="menu.translate" /></a></li>
</ul>
</li>
</ul>
</div>
</div>
<div class="logo-container">
<div class="container">
<a href="<c:url value="/welcome" />"><img src="<c:url value="/html/images/logo_genesys.png" />" alt="Genesys - Gateway to Genetic Resources" title="Genesys - Gateway to Genetic Resources" /></a>
</div>
</div>
<form role="search" id="search" action="<c:url value="/acn/search" />">
<div class="container">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search Genesys ..." />
<input type="text" class="form-control" placeholder="<spring:message code="search.input.placeholder" />" />
</div>
<button type="submit" class="btn"><img src="<c:url value="/html/images/icon_search.png" />" alt="" /></button>
</div>
......
......@@ -60,7 +60,7 @@
<ul class="funny-list">
<c:forEach items="${metadatas}" var="metadata" varStatus="status">
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}">
<a class="show pull-left" href="/data/view/${metadata.id}"><c:out value="${metadata.title}" /></a>
<a class="show pull-left" href="<c:out value="/data/view/${metadata.id}" />"><c:out value="${metadata.title}" /></a>
<div class="pull-right">
<c:out value="${metadata.instituteCode}" />
</div></li>
......
......@@ -27,7 +27,7 @@
<ul class="funny-list">
<c:forEach items="${pagedData.content}" var="metadata" varStatus="status">
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show pull-left" href="/data/view/${metadata.id}"><c:out value="${metadata.title}" /></a>
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show pull-left" href="<c:url value="/data/view/${metadata.id}" />"><c:out value="${metadata.title}" /></a>
<div class="pull-right"><c:out value="${metadata.instituteCode}" /></div></li>
</c:forEach>
</ul>
......
......@@ -39,7 +39,7 @@ body {
#footer,
.site-wrapper:after {
height:88px;
margin-top: 88px;
}
/* RTL styles */
......@@ -343,7 +343,12 @@ html[dir="rtl"] #header .nav .dropdown-menu .checkbox {
#left-col .nav li a:hover,
#left-col .nav li.active a {
background:#cfcdc7 url('../images/arrow_croplist_nav.png') no-repeat 95% 8px;
background: #cfcdc7 url('../images/arrow_croplist_nav.png') no-repeat 95% 8px;
}
html[dir="rtl"] #left-col .nav li a:hover,
html[dir="rtl"] #left-col .nav li.active a {
background: #cfcdc7 url('../images/arrow_croplist_nav_rtl.png') no-repeat 5% 8px;
}
#left-col .nav li.active a {font-weight:bold;}
......
......@@ -63,8 +63,6 @@
#right-col {display:none;}
#content #middle-col {padding-top:0;}
.mobile-header .container {padding-left:10px; padding-right:10px;}
.mobile-header {display:block;}
......@@ -153,9 +151,7 @@
@media (max-width: 767px) {
.container {padding-left:0; padding-right:0;}
#middle-col {border-top:10px solid #e7e5df;}
#nav-main.navbar {border-bottom:none; margin:0;}
.navbar-nav {margin:0;}
......
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