Skip to content

GitLab

Commit 9bfbe489 authored by Matija Obreza's avatar Matija Obreza
Browse files

/content/help section and entry-page graphics

parent 19f82044
Hide whitespace changes
Inline Side-by-side
Showing with 313 additions and 212 deletions
src/main/java/org/genesys2/server/listener/sample/CreateContentListener.java
View file @ 9bfbe489
......@@ -124,11 +124,18 @@ public class CreateContentListener extends RunAsAdminListener {
contentService.ensureMenuItem("about", "/content/about/about", "menu.about");
contentService.ensureMenuItem("about", "/content/about/contact", "menu.contact");
contentService.ensureMenuItem("about", "/content/about/what-is-genesys", "menu.what-is-genesys");
// contentService.ensureMenuItem("about", "/content/about/who-uses-genesys", "menu.who-uses-genesys");
// contentService.ensureMenuItem("about", "/content/about/how-to-use-genesys", "menu.how-to-use-genesys");
contentService.ensureMenuItem("about", "/content/about/history-of-genesys", "menu.history-of-genesys");
// contentService.ensureMenuItem("about", "/content/about/about-genesys-data", "menu.about-genesys-data");
contentService.ensureMenuItem("about", "/content/about/newsletter", "menu.newsletter");
contentService.ensureMenuItem("about", "/content/about/frequently-asked-questions", "menu.faq");
contentService.ensureMenuItem("about", "/content/help/how-to-use-genesys", "menu.how-to-use-genesys");
// legal
contentService.ensureMenuItem("help", "/content/help/how-to-use-genesys", "menu.how-to-use-genesys");
// contentService.ensureMenuItem("help", "/content/help/about-genesys-data", "menu.about-genesys-data");
// contentService.ensureMenuItem("help", "/content/help/who-uses-genesys", "menu.who-uses-genesys");
// contentService.ensureMenuItem("help", "/content/help/how-to-use-genesys", "menu.how-to-use-genesys");
contentService.ensureMenuItem("help", "/content/about/about", "menu.about");
}
}
src/main/resources/content/language.properties
View file @ 9bfbe489
......@@ -685,3 +685,5 @@ heading.see-also=See also
see-also.map=Map of accession localities
see-also.overview=Overview of the collection
see-also.country=More about PGR conservation in {0}
help.page.intro=Visit the tutorials section to learn how to use Genesys.
src/main/sourceapp/styles/genesys.scss
View file @ 9bfbe489
......@@ -3,6 +3,12 @@
$header-height: 70;
$brand-primary: #88ba42 !default; // darken(#428bca, 6.5%) !default; // #337ab7
$break-small: 320px;
$break-normal: 1024px;
$break-xlarge: 1200px;
@font-face {
font-family: 'FontAwesome';
src: url('fonts/fontawesome-webfont.eot');
......@@ -534,18 +540,6 @@ html[dir="rtl"] .nav-tabs>li>a {
font-size: 24px;
}
.tab-pane .all-posts {
border-left: 2px solid #c3c3c3;
margin-left: 23px;
}
html[dir="rtl"] .tab-pane .all-posts {
border-left: none;
border-right: 2px solid #c3c3c3;
margin-left: 0;
margin-right: 23px;
}
.tab-pane .all-posts .post {
padding-bottom: 30px;
position: relative;
......@@ -582,11 +576,11 @@ html[dir="rtl"] .tab-pane .all-posts .post .post-icon {
.tab-pane .all-posts .post .post-head {
display: table;
padding: 5px 0 0 30px;
padding: 5px 0 0 0;
}
html[dir="rtl"] .tab-pane .all-posts .post .post-head {
padding: 5px 30px 0 0;
padding: 5px 0 0 0;
}
.tab-pane .all-posts .post .post-head .user-icon {
......@@ -604,6 +598,7 @@ html[dir="rtl"] .tab-pane .all-posts .post .post-head {
.tab-pane .all-posts .post .post-head .post-head-content {
display: table-cell;
font-weight: bold;
padding: 0 0 0 5px;
vertical-align: middle;
}
......@@ -619,11 +614,11 @@ html[dir="rtl"] .all-posts .post .post-head .post-head-content {
.tab-pane .all-posts .post-inner {
background: #e7e5df;
border: 1px solid #d2d0cb;
margin: 10px 0 0 72px;
margin: 10px 0 0 40px;
}
html[dir="rtl"] .tab-pane .all-posts .post-inner {
margin: 10px 72px 0 0;
margin: 10px 40px 0 0;
}
.tab-pane .all-posts .post-inner .post-image {
......@@ -997,38 +992,50 @@ html[dir="rtl"] #country-in-genesys table .alignleft {
#stats {
.stats-map {
/* background: #fff url('../images/pic_map_stats.png') no-repeat center center; */
background-color: White;
background-color: #4d4c46;
color: #fff;
height: 250px;
position: relative;
@media (max-width: 767px) {
height: auto;
}
.all-stats {
position: absolute;
bottom: 20px;
left: 10px;
html[dir="rtl"] & {
right: 10px;
@media (min-width: 767px) {
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;
/* background: rgba(105, 163, 23, 0.7); */
font-family: 'forzamedium';
font-size: 14px;
margin: 0 0 3px 0;
padding: 1px 5px;
@media (min-width: 767px) {
display: block;
float: left;
clear: left;
}
/* @media (max-width: 767px) {
display: block;
float: left;
clear: left;
} */
html[dir="rtl"] & {
float: right;
clear: right;
}
a {
/* a {
color: White;
}
} */
}
}
......@@ -1981,11 +1988,6 @@ html[dir="rtl"] ul.statistics .stats-number {
padding-left: 30px;
}
.welcome-blurp {
padding: 20px;
font-size: 110%;
background-color: #FFF;
}
.ui-autocomplete.ui-widget {
font-size: 12px;
......@@ -1999,6 +2001,10 @@ html[dir="rtl"] ul.statistics .stats-number {
#globalmap.gis-map {
height: 250px;
margin-top: 0;
background-image: url('../images/mapshot.png');
background-repeat: no-repeat;
background-size: cover;
background-position: center;
}
.no-close .ui-dialog-titlebar-close {
......@@ -2102,15 +2108,15 @@ table.terms-table td {
padding: 5px 0 10px 0;
}
@media ( max-width : 1200px) {
/* @media ( max-width : 1200px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog {
width: 970px;
}
#search {
width: 35%;
}
}
} */
/*
@media ( max-width : 1024px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog {
width: 100%;
......@@ -2125,7 +2131,7 @@ table.terms-table td {
height: auto;
width: 100%;
}
}
} */
@media ( max-width : 992px) {
#header {
......@@ -2144,10 +2150,16 @@ table.terms-table td {
.mobile-header {
display: block;
}
#nav-main.navbar {
min-height: inherit;
height: inherit;
background: #4d4c46;
#nav-main.navbar ul li {
display: block;
a {
border-bottom: 1px solid #2b2924;
padding: 10px;
&:hover, &:focus {
background: none;
}
}
}
#search {
background: #4d4c46;
......@@ -2232,25 +2244,19 @@ table.terms-table td {
min-height: inherit;
height: inherit;
}
.navbar-nav {
.mobile-header .navbar-nav {
margin: 0;
li {
float: left;
}
}
html[dir="rtl"] .mobile-header .header-top .navbar-nav {
float: left;
}
.navbar-nav>li {
/* .navbar-nav>li {
display: inline-block;
}
#nav-main.navbar ul li {
display: block;
}
#nav-main.navbar ul li a {
border-bottom: 1px solid #2b2924;
padding: 10px;
}
#nav-main.navbar ul li a:hover, #nav-main.navbar ul li a:focus, #nav-main.navbar ul li.active a {
background: none;
}
} */
#header .nav li a, .mobile-header .nav li a {
padding: 10px 20px;
}
......@@ -2292,7 +2298,7 @@ table.terms-table td {
.tab-pane .all-posts .post-inner {
border-left: none;
border-right: none;
margin: 10px -15px 0 -40px;
margin: 10px -15px 0 -10px;
}
.tab-pane .all-posts .post .post-head .post-head-content {
font-size: 12px;
......@@ -2341,3 +2347,54 @@ div[x-href] {
cursor: pointer;
}
#content.entry-page .row.no-space {
margin-left: -5px;
margin-right: -5px;
> div {
padding-left: 0;
padding-right: 0;
}
}
.entry-page .row.intro {
.intro-image {
height: 250px;
background-color: Yellow;
overflow: hidden;
img {
height: 250px;
}
}
.intro-text {
height: 250px;
padding: 20px;
font-size: 110%;
background-color: #88ba42;
color: White;
h1 {
margin-top: 0;
font-size: 28px;
}
.btn-default, .btn-default:focus, , .btn-default:active {
color: White;
border-color: White;
background-color: transparent;
text-transform: uppercase;
}
@media (max-width: 767px) {
height: auto;
}
}
}
.padding10 {
padding: 10px;
}
.white-background {
background-color: White;
}
src/main/sourceapp/styles/pages.scss
View file @ 9bfbe489
#content .see-also {
#content .content-section-2015 {
margin-top: 2em;
h3 {
......@@ -34,26 +34,32 @@
font-size: 16px;
}
}
.row {
div.see-also-block {
min-height: 200px;
height: 200px;
position: relative;
background-size: cover;
background-repeat: no-repeat;
}
div.see-also-block {
min-height: 250px;
height: 250px;
position: relative;
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
div.content {
position: absolute;
bottom: 0;
z-index: 20;
width: 100%;
h2 {
text-transform: none;
font-size: 18px;
background: #88ba42;
padding: 15px 19px 15px;
font-family: 'Noto Sans';
h2 {
.short {
display: inline-block;
width: 100%;
text-transform: none;
font-size: 18px;
background: #88ba42;
padding: 15px 19px 15px;
font-family: 'Noto Sans';
position: absolute;
bottom: 0;
z-index: 20;
max-width: 250px;
}
}
}
......@@ -599,11 +605,11 @@
}
}
}
// **********************************************************************
//**********************************************************************
// *********** 320px ***********
//**********************************************************************
//***********************************************************************
/**********************************************************************
***********************************************************************
*********** 320px ***********
***********************************************************************
***********************************************************************/
@media (max-width: 320px) {
.user-block {
......@@ -617,9 +623,13 @@
#content.wiews-institute {
#genebank-info {
background-color: #d0d0d0;
background-color: #D7D5CF;
margin-top: -10px;
div.genebank-text {
padding: 0 1em;
}
h1 {
font-weight: bold;
font-size: 26px;
......
src/main/webapp/WEB-INF/jsp/index.jsp
View file @ 9bfbe489
......@@ -8,28 +8,37 @@
<title><spring:message code="page.home.title" /></title>
</head>
<body>
<div class="row">
<div class="col-xs-12">
<c:if test="${welcomeBlurp ne null}">
<h2>
<div class="row no-space intro">
<div class="hidden-xs col-sm-6">
<div class="intro-image">
<img src="<c:url value="/html/images/aim/accession.png" />" />
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="intro-text">
<c:if test="${welcomeBlurp ne null}">
<h1>
<c:out value="${welcomeBlurp.title}" escapeXml="false" />
</h2>
<div class="welcome-blurp">
</h1>
<div class="">
<c:set var="blurp" value="${welcomeBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
<c:remove var="blurp" />
<a class="btn btn-default" href="<c:url value="/content/about/about" />"><spring:message code="welcome.read-more" /></a>
</div>
</c:if>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row no-space">
<div id="stats" class="col-sm-4">
<h2>
<%-- <h2>
<spring:message code="data-overview" />
</h2>
</h2> --%>
<div class="stats-map">
<div class="stats-map padding10">
<p><spring:message code="maps.accession-map.intro" /></p>
<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">
......@@ -47,44 +56,64 @@
</div>
<div class="col-sm-8">
<h2>
<%-- <h2>
<spring:message code="maps.accession-map" />
</h2>
</h2> --%>
<div class="">
<div id="globalmap" class="gis-map"></div>
<div id="globalmap" x-href="<c:url value="/explore/map" />" 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 class="row see-also-row">
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/aim/three-1.jpg" />')">
<div class="content">
<h2 class="short">
<spring:message code="search.input.placeholder" />
</h2>
<div class="padding10 white-background">
<p><spring:message code="search.search-query-missing" /></p>
<form action="<c:url value="/acn/search" />" class="form-inline">
<div class="form-group">
<input type="text" name="q" class="form-control" />
<input type="submit" class="btn btn-primary" value="<spring:message code="search.button.label" />" />
</div>
</form>
</div>
</div>
</div>
</div>
<div class="col-sm-4 index-box">
<h2>
<spring:message code="organization.page.list.title" />
</h2>
<div>
?
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/aim/three-2.jpg" />')">
<div class="content">
<h2 class="short">
<spring:message code="organization.page.list.title" />
</h2>
<div class="padding10 white-background" dir="">
<a href="<c:url value="/org/CGIAR" />">CGIAR International Genebanks</a>
&bull;
<a href="<c:url value="/org/EURISCO" />">ECPGR EURISCO network</a>
&bull;
<a href="<c:url value="/org/USDA" />">USDA ARS NPGS</a>
&bull;
<a href="<c:url value="/org/COGENT" />">COGENT</a>
</div>
</div>
</div>
</div>
<div class="col-sm-4 index-box">
<h2>
<spring:message code="menu.newsletter" />
</h2>
<div>
?
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" x-href="<c:url value="/content/help/how-to-use-genesys" />" style="background-image: url('<c:url value="/html/images/aim/three-3.jpg" />')">
<div class="content">
<h2 class="short">
<spring:message code="menu.help" />
</h2>
<div class="padding10 white-background"><a><spring:message code="help.page.intro" /></a></div>
</div>
</div>
</div>
</div>
<div class="row">
<!-- left column end / middle columns start -->
......@@ -166,11 +195,6 @@
<content tag="javascript">
<script type="text/javascript">
$( document ).ready(function() {
$('#news a').click(function (e) {
e.preventDefault();
$(this).tab('show');
});
$(".autocomplete-genus").each(function() {
var t=$(this);
t.autocomplete({ delay: 200, minLength: 3, source: t.attr('x-source'),
......@@ -178,11 +202,7 @@
select: function(event, ui) { document.location.pathname='/acn/t/'+ui.item.value; } });
});
$("#globalmap").on("click", function(e) {
e.preventDefault();
window.location='<c:url value="/explore/map" />';
});
var map = L.map('globalmap', {minZoom:2, maxZoom:2, dragging:false, zoomControl:false, keyboard:false}).setView([20,0], 2);
/* var map = L.map('globalmap', {minZoom:2, maxZoom:2, dragging:false, zoomControl:false, keyboard:false}).setView([20,0], 2);
L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
attribution: "MapQuest",
styleId: 22677,
......@@ -195,7 +215,7 @@
styleId: 22677,
noWrap: true,
subdomains: [${props.tileserverCdn}]
}).addTo(map);
}).addTo(map); */
});
</script>
</content>
......
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @ 9bfbe489
......@@ -42,101 +42,101 @@
<div class="row" id="genebank-info">
<div class="col-sm-9">
<div class="genebank-text">
<h1 property="schema:Organization#name">
<c:out value="${faoInstitute.fullName}" />
</h1>
<h1 property="schema:Organization#name">
<c:out value="${faoInstitute.fullName}" />
</h1>
<div class="row">
<div class="col-xs-3">
<spring:message code="faoInstitute.country" />
</div>
<div class="col-xs-9" property="schema:Organization#location">
<span itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="<c:url value="/geo" />" itemprop="url">
<span itemprop="title">
<spring:message code="menu.countries" />
</span>
</a>
›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">