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

Merge commit '68e4054a' into staging

* commit '68e4054a':
  rtl-languages-layout
parents 415ea61d 68e4054a
This diff is collapsed.
...@@ -25,36 +25,36 @@ ...@@ -25,36 +25,36 @@
</div> </div>
<ul class="nav navbar-nav nav-menu"> <ul class="nav navbar-nav nav-menu">
<li class="active"> <li class="active pull-left">
<a href="<c:url value="/welcome" />" title="<spring:message code="menu.home" />"> <spring:message code="menu.home" /> <a href="<c:url value="/welcome" />" title="<spring:message code="menu.home" />"> <spring:message code="menu.home" />
</a> </a>
</li> </li>
<li class="dropdown"> <li class="dropdown pull-left">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.about" /> <span class="caret"></span> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.about" /> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li class="pull-left">
<a href="<c:url value="/content/about/about" />"> <spring:message code="menu.about" /> <a href="<c:url value="/content/about/about" />"> <spring:message code="menu.about" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/content/about/contact" />"> <spring:message code="menu.contact" /> <a href="<c:url value="/content/about/contact" />"> <spring:message code="menu.contact" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/content/about/what-is-genesys" />"> <spring:message code="menu.what-is-genesys" /> <a href="<c:url value="/content/about/what-is-genesys" />"> <spring:message code="menu.what-is-genesys" />
</a> </a>
</li> </li>
<%-- <li><a href="<c:url value="/content/about/about" />"><i class="fa fa-caret-right"></i> <spring:message code="menu.who-uses-genesys" /></a></li> --%> <%-- <li><a href="<c:url value="/content/about/about" />"><i class="fa fa-caret-right"></i> <spring:message code="menu.who-uses-genesys" /></a></li> --%>
<li> <li class="pull-left">
<a href="<c:url value="/content/about/history-of-genesys" />"> <spring:message code="menu.history-of-genesys" /> <a href="<c:url value="/content/about/history-of-genesys" />"> <spring:message code="menu.history-of-genesys" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/content/about/newsletter" />"> <spring:message code="menu.newsletter" /> <a href="<c:url value="/content/about/newsletter" />"> <spring:message code="menu.newsletter" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/content/about/frequently-asked-questions" />"> <spring:message code="menu.faq" /> <a href="<c:url value="/content/about/frequently-asked-questions" />"> <spring:message code="menu.faq" />
</a> </a>
</li> </li>
...@@ -68,21 +68,21 @@ ...@@ -68,21 +68,21 @@
</li> --%> </li> --%>
</ul> </ul>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/explore" />"> <spring:message code="menu.browse" /> <a href="<c:url value="/explore" />"> <spring:message code="menu.browse" />
</a> </a>
</li> </li>
<%-- <li><a href="<c:url value="/data/" />"><spring:message code="menu.datasets" /></a></li> --%> <%-- <li><a href="<c:url value="/data/" />"><spring:message code="menu.datasets" /></a></li> --%>
<%-- <li><a href="<c:url value="/descriptors/" />"><spring:message code="menu.descriptors" /></a></li> --%> <%-- <li><a href="<c:url value="/descriptors/" />"><spring:message code="menu.descriptors" /></a></li> --%>
<li> <li class="pull-left">
<a href="<c:url value="/geo/" />"> <spring:message code="menu.countries" /> <a href="<c:url value="/geo/" />"> <spring:message code="menu.countries" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/wiews/active" />"> <spring:message code="menu.institutes" /> <a href="<c:url value="/wiews/active" />"> <spring:message code="menu.institutes" />
</a> </a>
</li> </li>
<li> <li class="pull-left">
<a href="<c:url value="/sel/" />"> <spring:message code="menu.my-list" /> <span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter"><c:out value="${selection.size() gt 0 ? selection.size() : '0'}" /></span> <a href="<c:url value="/sel/" />"> <spring:message code="menu.my-list" /> <span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter"><c:out value="${selection.size() gt 0 ? selection.size() : '0'}" /></span>
</a> </a>
</li> </li>
...@@ -129,19 +129,19 @@ ...@@ -129,19 +129,19 @@
<li> <li>
<form id="loginForm" role="form" method="post" action="<c:url value="/login-attempt" />"> <form id="loginForm" role="form" method="post" action="<c:url value="/login-attempt" />">
<div class="form-group"> <div class="form-group">
<label for="username"> <label class="pull-left" for="username">
<spring:message code="login.username" /> <spring:message code="login.username" />
</label> </label>
<input type="email" class="form-control" id="username" name="username" placeholder="<spring:message code="login.username"/>" /> <input type="email" class="form-control" id="username" name="username" placeholder="<spring:message code="login.username"/>" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password"> <label class="pull-left" for="password">
<spring:message code="login.password" /> <spring:message code="login.password" />
</label> </label>
<input type="password" class="form-control" id="password" name="password" placeholder="<spring:message code="login.password"/>" /> <input type="password" class="form-control" id="password" name="password" placeholder="<spring:message code="login.password"/>" />
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label class="pull-left">
<input type="checkbox" name="_spring_security_remember_me" id="_spring_security_remember_me" /> <input type="checkbox" name="_spring_security_remember_me" id="_spring_security_remember_me" />
<spring:message code="login.remember-me" /> <spring:message code="login.remember-me" />
</label> </label>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<%@ include file="/WEB-INF/jsp/content/transifex-responses.jspf" %> <%@ include file="/WEB-INF/jsp/content/transifex-responses.jspf" %>
<div class="article clearfix"> <div class="article clearfix">
<div class="right-side main-col"> <div class="right-side main-col pull-left">
<div class="free-text" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}"> <div class="free-text" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}">
<c:out value="${article.body}" escapeXml="false"/> <c:out value="${article.body}" escapeXml="false"/>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="row institute-list" dir="ltr"> <div class="row institute-list" dir="ltr">
<c:forEach items="${pagedData.content}" var="news" varStatus="status"> <c:forEach items="${pagedData.content}" var="news" varStatus="status">
<div class="col-sm-12 clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"> <div class="col-sm-12 col-xs-12 clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}">
<a class="pull-left" href="<c:url value="/content/news/${news.id}/${jspHelper.suggestUrlForText(news.title)}" />"><c:out value="${jspHelper.htmlToText(news.title)}" /></a> <a class="pull-left" href="<c:url value="/content/news/${news.id}/${jspHelper.suggestUrlForText(news.title)}" />"><c:out value="${jspHelper.htmlToText(news.title)}" /></a>
<div class="pull-right"><local:prettyTime date="${news.postDate.time}" locale="${pageContext.response.locale}" /></div> <div class="pull-right"><local:prettyTime date="${news.postDate.time}" locale="${pageContext.response.locale}" /></div>
</div> </div>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="row"> <div class="row">
<h1 class="green-bg"><c:out value="${news.title}" escapeXml="false" /></h1> <h1 class="green-bg"><c:out value="${news.title}" escapeXml="false" /></h1>
<div class="article clearfix"> <div class="article clearfix">
<div class="right-side main-col col-md-9"> <div class="right-side main-col col-md-9 pull-left">
<div class="free-text" dir="ltr"> <div class="free-text" dir="ltr">
<c:out value="${news.body}" escapeXml="false" /> <c:out value="${news.body}" escapeXml="false" />
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
</div> </div>
<div class="row no-space map"> <div class="row no-space map">
<div id="stats" class="col-md-4 col-sm-12"> <div id="stats" class="col-md-4 col-sm-12 col-xs-12">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<spring:message code="maps.accession-map" /> <spring:message code="maps.accession-map" />
</h2> </h2>
...@@ -65,10 +65,10 @@ ...@@ -65,10 +65,10 @@
</div> </div>
<div class="row see-also-row"> <div class="row see-also-row">
<div class="col-md-4 col-sm-12 no-space"> <div class="col-md-4 col-sm-12 col-xs-12 no-space">
<div class="see-also-block"> <div class="see-also-block">
<div class="content"> <div class="content">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<spring:message code="welcome.search-genesys" /> <spring:message code="welcome.search-genesys" />
</h2> </h2>
<div class="body"> <div class="body">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<div class="col-lg-4 hidden-md"> <div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background-image: url('/html/1/images/three-1.jpg');"></div> <div class="see-also-img" style="background-image: url('/html/1/images/three-1.jpg');"></div>
</div> </div>
<div class="col-md-12 col-lg-8 no-space"> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-8 no-space">
<p> <p>
<spring:message code="search.search-query-missing" /> <spring:message code="search.search-query-missing" />
...@@ -95,10 +95,10 @@ ...@@ -95,10 +95,10 @@
</div> </div>
<!-- Block Organizations --> <!-- Block Organizations -->
<div class="col-md-4 col-sm-12 no-space"> <div class="col-md-4 col-sm-12 col-xs-12 no-space">
<div class="see-also-block"> <div class="see-also-block">
<div class="content"> <div class="content">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<c:out value="${organizationsBlurb.title}" /> <c:out value="${organizationsBlurb.title}" />
</h2> </h2>
<div class="body free-text"> <div class="body free-text">
...@@ -110,11 +110,11 @@ ...@@ -110,11 +110,11 @@
</div> </div>
<!-- Block Help --> <!-- Block Help -->
<div class="col-md-4 col-sm-12 no-space"> <div class="col-md-4 col-sm-12 col-xs-12 no-space">
<div class="see-also-block" x-href="/1/content/help/how-to-use-genesys"> <div class="see-also-block" x-href="/1/content/help/how-to-use-genesys">
<div class="content"> <div class="content">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<spring:message code="menu.help" /> <spring:message code="menu.help" />
</h2> </h2>
<div class="body"> <div class="body">
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<div class="row white-background"> <div class="row white-background">
<!-- left column end / middle columns start --> <!-- left column end / middle columns start -->
<div class="col-lg-8 col-md-8 no-space" id="middle-col"> <div class="col-lg-8 col-md-8 col-xs-12 no-space" id="middle-col">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<spring:message code="activity.recent-activity" /> <spring:message code="activity.recent-activity" />
</h2> </h2>
...@@ -164,17 +164,17 @@ ...@@ -164,17 +164,17 @@
</div> </div>
<!-- middle column end / right columns start --> <!-- middle column end / right columns start -->
<div class="col-lg-4 col-md-4 no-space" id="right-col"> <div class="col-lg-4 col-md-4 col-xs-12 no-space" id="right-col">
<c:if test="${sideBlurp ne null}"> <c:if test="${sideBlurp ne null}">
<div class="content-block"> <div class="content-block">
<h2 class="short text-right"><c:out value="${sideBlurp.title}" /></h2> <h2 class="short text-right pull-left"><c:out value="${sideBlurp.title}" /></h2>
<cms:blurb blurb="${sideBlurp}"/> <cms:blurb blurb="${sideBlurp}"/>
</div> </div>
</c:if> </c:if>
<div class="content-block" id="crop-list"> <div class="content-block" id="crop-list">
<h2 class="short text-right"> <h2 class="short text-right pull-left">
<spring:message code="crop.croplist" /> <spring:message code="crop.croplist" />
</h2> </h2>
<sec:authorize access="hasRole('ADMINISTRATOR')"> <sec:authorize access="hasRole('ADMINISTRATOR')">
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<c:set var="cropCount" value="${cropList.size()}" /> <c:set var="cropCount" value="${cropList.size()}" />
<ul class="nav"> <ul class="nav">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12 col-sm-12 col-xs-12">
<li class="all-crops"> <li class="all-crops">
<a class="show" href="<c:url value="/explore/" />"> <a class="show" href="<c:url value="/explore/" />">
<spring:message code="crop.all-crops" /> <spring:message code="crop.all-crops" />
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</li> </li>
<c:if test="${status.count % Math.round(cropCount / 3) == 0}"> <c:if test="${status.count % Math.round(cropCount / 3) == 0}">
</div> </div>
<div class="col-md-12"> <div class="col-md-12 col-sm-12 col-xs-12">
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> </div>
......
...@@ -107,11 +107,11 @@ ...@@ -107,11 +107,11 @@
</div> </div>
</div> </div>
<div class="form-group transparent"> <div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-10 col-sm-offset-3 col-sm-10 col-xs-12"> <div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-9 col-sm-offset-3 col-sm-9 col-xs-12">
<form:button class="btn btn-primary col-lg-2 col-md-2 col-sm-2 col-xs-12"> <form:button class="btn btn-primary">
<spring:message code="registration.create-account" /> <spring:message code="registration.create-account" />
</form:button> </form:button>
<a class="btn btn-default col-lg-2 col-md-2 col-sm-2 col-xs-12" <a class="btn btn-default"
href='<c:url value="/" />' id="registration"> href='<c:url value="/" />' id="registration">
<spring:message code="cancel" /> <spring:message code="cancel" />
</a> </a>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-4"><p><spring:message code="faoInstitute.url" /></p></div> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-4"><p><spring:message code="faoInstitute.url" /></p></div>
<div class="col-lg-9 col-md-9 col-sm-6 col-xs-8 text-ellipsis"> <div class="col-lg-9 col-md-9 col-sm-6 col-xs-8 text-ellipsis">
<c:forEach items="${faoInstitute.safeUrls}" var="url"> <c:forEach items="${faoInstitute.safeUrls}" var="url">
<div><a target="_blank" rel="nofollow" href="<c:out value="${url}" />"> <div class="text-ellipsis"><a target="_blank" rel="nofollow" href="<c:out value="${url}" />">
<span dir="ltr"><c:out value="${url}" /></span> <span dir="ltr"><c:out value="${url}" /></span>
</a></div> </a></div>
</c:forEach> </c:forEach>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<c:when test="${'en es fr ru ar zh'.indexOf(pageContext.response.locale.language) ge 0}"><c:set var="wiewsLang" value="${pageContext.response.locale.language}" /></c:when> <c:when test="${'en es fr ru ar zh'.indexOf(pageContext.response.locale.language) ge 0}"><c:set var="wiewsLang" value="${pageContext.response.locale.language}" /></c:when>
<c:otherwise><c:set var="wiewsLang" value="en" /></c:otherwise> <c:otherwise><c:set var="wiewsLang" value="en" /></c:otherwise>
</c:choose> </c:choose>
<div><a target="_blank" rel="nofollow" <div class="text-ellipsis"><a target="_blank" rel="nofollow"
href="<c:url value="http://www.fao.org/wiews/instab/${wiewsLang}/"><c:param name="instcode" value="${faoInstitute.code}" /></c:url>"> href="<c:url value="http://www.fao.org/wiews/instab/${wiewsLang}/"><c:param name="instcode" value="${faoInstitute.code}" /></c:url>">
<spring:message code="faoInstitute.wiewsLink" arguments="${faoInstitute.code}" /> <spring:message code="faoInstitute.wiewsLink" arguments="${faoInstitute.code}" />
</a></div> </a></div>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="row institute-list"> <div class="row institute-list">
<c:forEach items="${pagedData.content}" var="faoInstitute" varStatus="status"> <c:forEach items="${pagedData.content}" var="faoInstitute" varStatus="status">
<div class="col-sm-12 clearfix ${faoInstitute.current ? '' : 'not-current'}"> <div class="col-sm-12 col-xs-12 clearfix ${faoInstitute.current ? '' : 'not-current'}">
<a class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code}" />"> <a class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code}" />">
<b> <b>
<c:out value="${faoInstitute.code}" /> <c:out value="${faoInstitute.code}" />
......
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