Commit 19f82044 authored by Matija Obreza's avatar Matija Obreza
Browse files

Entry page layout

parent 00df6e36
......@@ -34,8 +34,8 @@ body {
.col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11,
.col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
min-height: 1px;
padding-left: 10px;
padding-right: 10px;
padding-left: 5px;
padding-right: 5px;
position: relative;
}
......
......@@ -372,19 +372,13 @@ html[dir="rtl"] .navbar#nav-main ul li a{
}
}
/* Left column */
#content #left-col {
padding-top: 10px;
padding-bottom: 10px;
}
#content h2 {
background: #88ba42;
color: #fff;
font-size: 14px;
font-weight: bold;
margin: 0;
padding: 5px 10px;
padding: 10px;
text-transform: uppercase;
}
......@@ -403,67 +397,45 @@ html[dir="rtl"] .navbar#nav-main ul li a{
margin: 1em 0 0.5em;
}
#left-col .nav {
#crop-list .nav {
margin: 0 0 10px 0;
}
#left-col .nav li a {
background: #d7d5cf;
border-bottom: 1px solid #c9c7c1;
border-top: 1px solid #d7d5cf;
color: #4d4c46;
font-size: 12px;
padding: 3px 10px;
text-transform: uppercase;
}
#left-col .nav li a:hover, #left-col .nav li.active a {
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;
}
#crop-list .dropdown, #crop-list-dropdown .dropdown, #countries-list-dropdown .dropdown {
background: #d7d5cf;
padding: 10px;
}
#crop-list .dropdown button, #crop-list-dropdown .dropdown button, #countries-list-dropdown .dropdown button {
background: #fff;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
border: 1px solid #4d4c46;
padding: 0 0 0 5px;
position: relative;
height: 27px;
text-align: left;
width: 100%;
li a {
background: #d7d5cf;
border-bottom: 1px solid #c9c7c1;
border-top: 1px solid #d7d5cf;
color: #4d4c46;
font-size: 12px;
padding: 3px 10px;
text-transform: uppercase;
}
li a:hover, li.active a {
font-weight: bold;
background: #cfcdc7 url('../images/arrow_croplist_nav.png') no-repeat 95% 8px;
html[dir="rtl"] & {
background: #cfcdc7 url('../images/arrow_croplist_nav_rtl.png') no-repeat 5% 8px;
}
}
}
#crop-list .dropdown button .caret, #crop-list-dropdown .dropdown button .caret, #countries-list-dropdown .dropdown button .caret {
background: #b4b3ae url('../images/arrow_croplist.png') no-repeat center center;
border: none;
height: 25px;
width: 23px;
position: absolute;
top: 0;
right: 0;
#crop-list-dropdown {
margin-bottom: 0;
.dropdown {
background: #d7d5cf;
padding: 10px;
}
}
#crop-list .dropdown .dropdown-menu, #crop-list-dropdown .dropdown .dropdown-menu, #countries-list-dropdown .dropdown .dropdown-menu {
/* #crop-list .dropdown .dropdown-menu, #crop-list-dropdown .dropdown .dropdown-menu, #countries-list-dropdown .dropdown .dropdown-menu {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
left: 10px;
top: auto;
}
}
html[dir="rtl"] #countries-list-dropdown .dropdown .dropdown-menu {
margin-left: -100px;
......@@ -472,6 +444,7 @@ html[dir="rtl"] #countries-list-dropdown .dropdown .dropdown-menu {
#crop-list .dropdown .dropdown-menu li a, #crop-list-dropdown .dropdown .dropdown-menu li a, #countries-list-dropdown .dropdown .dropdown-menu li a {
font-size: 12px;
}
*/
#crop-list .nav, #crop-list-dropdown .nav {
margin-top: 1px;
......@@ -500,11 +473,6 @@ html[dir="rtl"] #countries-list-dropdown .dropdown .dropdown-menu {
}
/* Middle Column */
#content #middle-col {
padding-bottom: 10px;
padding-top: 10px;
}
#middle-col .nav-tabs {
border-top: 1px solid #4d4c46;
border-bottom: none;
......@@ -937,13 +905,7 @@ html[dir="rtl"] #country-in-genesys table .alignleft {
padding: 3px 5px;
}
/* Right Column */
#content #right-col {
padding-top: 10px;
padding-bottom: 10px;
}
#right-col .content-block {
.content-block {
margin-bottom: 1em;
}
......@@ -1033,94 +995,88 @@ html[dir="rtl"] #country-in-genesys table .alignleft {
}
#stats {
background: #fff;
}
#stats .stats-map {
background: url('../images/pic_map_stats.png') no-repeat center center;
height: 135px;
position: relative;
}
#stats .stats-map .all-stats {
position: absolute;
bottom: 20px;
left: 10px;
}
html[dir="rtl"] #stats .stats-map .all-stats {
right: 10px;
}
#stats .stats-map .one-stat {
background: rgba(105, 163, 23, 0.7);
color: #fff;
display: block;
float: left;
clear: left;
font-family: 'forzamedium';
font-size: 14px;
margin: 0 0 3px 0;
padding: 1px 5px;
.stats-map {
/* background: #fff url('../images/pic_map_stats.png') no-repeat center center; */
background-color: White;
height: 250px;
position: relative;
html[dir="rtl"] & {
float: right;
clear: right;
.all-stats {
position: absolute;
bottom: 20px;
left: 10px;
html[dir="rtl"] & {
right: 10px;
}
}
.one-stat {
background: rgba(105, 163, 23, 0.7);
color: #fff;
display: block;
float: left;
clear: left;
font-family: 'forzamedium';
font-size: 14px;
margin: 0 0 3px 0;
padding: 1px 5px;
html[dir="rtl"] & {
float: right;
clear: right;
}
a {
color: White;
}
}
}
}
#stats .one-stat a {
color: White;
}
html[dir="rtl"] #stats .stats-map .one-stat {
}
#stats .stat-lists {
background: #fff;
border-top: 1px solid #4d4c46;
margin: 0 10px;
padding: 10px 0;
}
#stats .stat-lists h3 {
color: #88ba42;
font-family: 'forzabook';
font-size: 18px;
}
#stats .stat-lists h3 a {
display: block;
float: right;
}
html[dir="rtl"] #stats .stat-lists h3 a {
float: left;
}
#stats .stat-lists ol {
margin: 0;
padding: 0 0 0 20px;
}
html[dir="rtl"] #stats .stat-lists ol {
padding: 0 20px 0 0;
}
#stats .stat-lists ol li {
color: #5476b2;
font-size: 12px;
padding: 5px 0;
}
#stats .stat-lists ol li img {
padding-right: 5px;
}
html[dir="rtl"] #stats .stat-lists ol li img {
padding-right: 0;
padding-left: 5px;
.stat-lists {
background: #fff;
border-top: 1px solid #4d4c46;
margin: 0 10px;
padding: 10px 0;
h3 {
color: #88ba42;
font-family: 'forzabook';
font-size: 18px;
a {
display: block;
float: right;
html[dir="rtl"] & {
float: left;
}
}
}
ol {
margin: 0;
padding: 0 0 0 20px;
html[dir="rtl"] & {
padding: 0 20px 0 0;
}
li {
color: #5476b2;
font-size: 12px;
padding: 5px 0;
img {
padding-right: 5px;
html[dir="rtl"] & {
padding-right: 0;
padding-left: 5px;
}
}
}
}
}
}
/* Main column - General styles */
......@@ -2029,7 +1985,6 @@ html[dir="rtl"] ul.statistics .stats-number {
padding: 20px;
font-size: 110%;
background-color: #FFF;
margin-bottom: 1em;
}
.ui-autocomplete.ui-widget {
......@@ -2042,8 +1997,7 @@ html[dir="rtl"] ul.statistics .stats-number {
}
#globalmap.gis-map {
max-width: 250px;
height: 180px;
height: 250px;
margin-top: 0;
}
......@@ -2209,7 +2163,7 @@ table.terms-table td {
#search .form-group .form-control {
display: inline-block;
}
#content #left-col #crop-list {
#content #crop-list {
display: none;
}
.main-col .table-responsive {
......
......@@ -624,9 +624,10 @@
font-weight: bold;
font-size: 26px;
border-bottom: 1px solid Gray;
line-height: 1.4em;
margin-top: 1.5em;
line-height: 1.2em;
padding-bottom: 0.5em;
max-height: 3.7em;
overflow: hidden;
}
a {
font-weight: bold;
......@@ -640,7 +641,20 @@
}
}
#map {
margin: 0 10px;
margin: 0 5px;
height: 280px;
}
}
/* Welcome page funnies */
#content.entry-page .row {
margin-bottom: 10px;
.index-box {
> div {
min-height: 100px;
background-color: White;
padding: 10px;
}
}
}
......@@ -54,7 +54,7 @@
<%@include file="header.jsp" %>
<%@include file="menu.jsp" %>
<div id="content" class="clearfix">
<div id="content" class="clearfix entry-page">
<div class="container">
<div id="dialog"></div>
<div class="content-block clearfix">
......
......@@ -9,50 +9,89 @@
</head>
<body>
<div class="row">
<div class="col-md-2" id="left-col">
<div class="content-block" id="crop-list-dropdown">
<h2><spring:message code="crop.croplist" /></h2>
<sec:authorize access="hasRole('ADMINISTRATOR')">
<form method="post" action="<c:url value="/c/rebuild" />">
<input type="submit" class="btn form-control" value="Rebuild" />
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
</form>
</sec:authorize>
<div class="dropdown">
<input class="form-control autocomplete-genus" placeholder="<spring:message code="autocomplete.genus" />" x-source="<c:url value="/explore/ac/taxonomy.genus" />" />
</div>
</div>
<c:if test="${cropList ne null and cropList.size() gt 0}">
<div class="content-block" id="crop-list">
<ul class="nav">
<li class="all-crops"><a class="show" href="<c:url value="/explore/" />"><spring:message code="crop.all-crops" /></a></li>
<c:forEach items="${cropList}" var="crop" varStatus="status">
<li><a class="show" href="<c:url value="/explore/c/${crop.shortName}" />"><c:out value="${crop.getName(pageContext.response.locale)}" /></a></li>
</c:forEach>
</ul>
</div>
</c:if>
<div class="col-xs-12">
<c:if test="${welcomeBlurp ne null}">
<h2>
<c:out value="${welcomeBlurp.title}" escapeXml="false" />
</h2>
<div class="welcome-blurp">
<c:set var="blurp" value="${welcomeBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
</c:if>
</div>
</div>
<div class="row">
<div id="stats" class="col-sm-4">
<h2>
<spring:message code="data-overview" />
</h2>
<!-- left column end / middle columns start -->
<div class="col-md-7" id="middle-col">
<c:if test="${welcomeBlurp ne null}">
<h2><c:out value="${welcomeBlurp.title}" escapeXml="false" /></h2>
<div class="welcome-blurp">
<c:set var="blurp" value="${welcomeBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
</c:if>
<h2><spring:message code="activity.recent-activity" /></h2>
<div class="stats-map">
<div class="all-stats">
<%-- <div class="one-stat"><a href="<c:url value="/geo/" />"><spring:message code="stats.number-of-countries" arguments="${numberOfCountries}" /></a></div> --%>
<div class="one-stat">
<a href="<c:url value="/wiews/active" />">
<spring:message code="stats.number-of-institutes" arguments="${numberOfInstitutes}" />
</a>
</div>
<div class="one-stat">
<a href="<c:url value="/explore" />">
<spring:message code="stats.number-of-accessions" arguments="${numberOfAccessions}" />
</a>
</div>
</div>
</div>
</div>
<div class="col-sm-8">
<h2>
<spring:message code="maps.accession-map" />
</h2>
<div class="">
<div id="globalmap" class="gis-map"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4 index-box">
<h2>
<spring:message code="menu.help" />
</h2>
<div>
?
</div>
</div>
<div class="col-sm-4 index-box">
<h2>
<spring:message code="organization.page.list.title" />
</h2>
<div>
?
</div>
</div>
<div class="col-sm-4 index-box">
<h2>
<spring:message code="menu.newsletter" />
</h2>
<div>
?
</div>
</div>
</div>
<div class="row">
<!-- left column end / middle columns start -->
<div class="col-md-8" id="middle-col">
<h2>
<spring:message code="activity.recent-activity" />
</h2>
<div class="tab-content">
<div class="tab-pane active" id="news-feed">
......@@ -70,42 +109,61 @@
</div>
</div>
</div>
<!-- middle column end / right columns start -->
<div class="col-md-3" id="right-col">
<div class="content-block" id="stats">
<h2><spring:message code="data-overview" /></h2>
<div class="stats-map">
<div class="all-stats">
<%-- <div class="one-stat"><a href="<c:url value="/geo/" />"><spring:message code="stats.number-of-countries" arguments="${numberOfCountries}" /></a></div> --%>
<div class="one-stat"><a href="<c:url value="/wiews/active" />"><spring:message code="stats.number-of-institutes" arguments="${numberOfInstitutes}" /></a></div>
<div class="one-stat"><a href="<c:url value="/explore" />"><spring:message code="stats.number-of-accessions" arguments="${numberOfAccessions}" /></a></div>
</div>
</div>
</div>
<c:if test="${sideBlurp ne null}">
<div class="content-block">
<h2>${sideBlurp.title}</h2>
<div class="blurp">
<c:set var="blurp" value="${sideBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
</div>
</c:if>
<div class="content-block">
<h2><spring:message code="maps.accession-map" /></h2>
<div class="blurp">
<div id="globalmap" class="gis-map"></div>
<!-- middle column end / right columns start -->
<div class="col-md-4" id="right-col">
<c:if test="${sideBlurp ne null}">
<div class="content-block">
<h2>${sideBlurp.title}</h2>
<div class="blurp">
<c:set var="blurp" value="${sideBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
</div>
</div>
</c:if>
<div class="content-block" id="crop-list-dropdown">
<h2>
<spring:message code="crop.croplist" />
</h2>
<sec:authorize access="hasRole('ADMINISTRATOR')">
<form method="post" action="<c:url value="/c/rebuild" />">
<input type="submit" class="btn form-control" value="Rebuild" />
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
</form>
</sec:authorize>
<div class="dropdown">
<input class="form-control autocomplete-genus" placeholder="<spring:message code="autocomplete.genus" />" x-source="<c:url value="/explore/ac/taxonomy.genus" />" />
</div>
</div>
<c:if test="${cropList ne null and cropList.size() gt 0}">
<div class="content-block" id="crop-list">
<ul class="nav">
<li class="all-crops">
<a class="show" href="<c:url value="/explore/" />">
<spring:message code="crop.all-crops" />
</a>
</li>
<c:forEach items="${cropList}" var="crop" varStatus="status">
<li>
<a class="show" href="<c:url value="/explore/c/${crop.shortName}" />">
<c:out value="${crop.getName(pageContext.response.locale)}" />
</a>
</li>