Commit 6d57846b authored by Matija Obreza's avatar Matija Obreza

Genesys UX 2016 (welcome page)

parent 3a7e3805
......@@ -308,11 +308,11 @@ module.exports = function(grunt) {
'<%= app.dist1 %>/styles/bootstrap.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css' ],
'<%= app.dist1 %>/styles/other.min.css' : [ '<%= app.dist1 %>/styles/jquery-ui.css', '<%= app.dist1 %>/styles/forza.css', '<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css' ],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css', '<%= app.dist1 %>/styles/welcome.css' ],
'<%= app.dist1 %>/styles/genesys.min.css' : [ '<%= app.dist1 %>/styles/genesys.css' ],
'<%= app.dist1 %>/styles/all.min.css' : [ '<%= app.dist1 %>/styles/bootstrap.css', '<%= app.dist1 %>/styles/jquery-ui.css',
'<%= app.dist1 %>/styles/forza.css', '<%= app.dist1 %>/styles/leaflet.css',
'<%= app.dist1 %>/styles/jquery.simplecolorpicker.css', '<%= app.dist1 %>/styles/jquery.simplecolorpicker-regularfont.css',
'<%= app.dist1 %>/styles/genesys.css', '<%= app.dist1 %>/styles/welcome.css'],
'<%= app.dist1 %>/styles/genesys.css'],
}
}
},
......
This diff is collapsed.
This diff is collapsed.
......@@ -7,13 +7,12 @@
<c:when test="${requestContext.theme.name eq 'all'}">
<link href="<c:url value="/html/1/styles/bootstrap.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/other.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.css" />" type="text/css" rel="stylesheet" />
</c:when>
<c:otherwise>
<link href="<c:url value="/html/1/styles/bootstrap.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/other.min.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/genesys.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/welcome.css" />" type="text/css" rel="stylesheet" />
</c:otherwise>
</c:choose>
......@@ -6,28 +6,25 @@
<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>
<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" />">&bull; <spring:message code="menu.contact" /></a></li>
<li><a href="<c:url value="/1/content/legal/disclaimer" />">&bull; <spring:message code="menu.disclaimer" /></a></li>
<li><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new">&bull; <spring:message code="menu.report-an-issue" /></a></li>
<li class="notimportant"><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git">&bull; <spring:message code="menu.scm" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/crop-trust/genesys/">&bull; <spring:message code="menu.translate" /></a></li>
<li><a href="<c:url value="/1/content/legal/terms" />">&bull; <spring:message code="menu.terms" /></a></li>
<li><a href="<c:url value="/1/content/legal/copying" />">&bull; <spring:message code="menu.copying" /></a></li>
<li><a href="<c:url value="/1/content/legal/privacy" />">&bull; <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 class="text-center footer-link">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
......
<%@include file="/WEB-INF/jsp/init.jsp"%>
<div class="welcome-page">
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-inverse navbar-fixed-top">
<div class="container-fluid">
......@@ -14,8 +13,19 @@
<a class="navbar-brand nav-logo clearfix" href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg" /><img src="/html/1/images/GENESYS-LOGO.svg" /></a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<div class="col-md-6 no-space">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand nav-logo clearfix" href="/1/welcome"><img src="/html/1/images/GENESYS-ICON.svg" /><img src="/html/1/images/GENESYS-LOGO.svg" /></a>
</div>
<ul class="nav navbar-nav nav-menu">
<li class="hidden-sm">
<li class="active">
<a href="<c:url value="/1/welcome" />" title="<spring:message code="menu.home" />">
<spring:message code="menu.home" />
</a>
......@@ -118,6 +128,8 @@
</ul>
</li> --%>
</ul>
</div>
<div class="col-md-6 no-space">
<ul class="nav navbar-nav navbar-right">
<%@include file="languages.jspf" %>
......@@ -234,12 +246,12 @@
</div>
</form>
</div>
</div>
</div>
<!--/.nav-collapse -->
</div>
</div>
</nav>
</div>
<form id="logoutForm" action="/logout" method="post">
<input type="hidden"
......
......@@ -2,7 +2,7 @@
<!DOCTYPE html>
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}"
<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#"
>
......@@ -58,7 +58,7 @@
<%@include file="menu.jsp"%>
<!-- Begin page content -->
<div id="content" class="<sitemesh:write property="body.class" />">
<div id="content" class="entry-page <sitemesh:write property="body.class" />">
<div class="container-fluid">
<div id="content-header" class="row">
<sitemesh:write property="page.header" />
......
......@@ -9,12 +9,11 @@
</head>
<body class="welcome-page">
<div class="row no-space intro">
<div class="hidden-xs col-sm-6">
<div class="hidden-sm hidden-xs col-md-6 col-lg-6">
<div class="intro-image">
<img src="<c:url value="/html/0/images/aim/svalbard.jpg" />" />
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="col-sm-12 col-md-6 col-lg-6 no-space">
<div class="intro-text">
<c:if test="${welcomeBlurp ne null}">
<div class="">
......@@ -28,14 +27,13 @@
</div>
</div>
<div class="row no-space">
<div id="stats" class="col-sm-4">
<h2 class="short">
<div class="row no-space map">
<div id="stats" class="col-md-4 col-sm-12">
<h2 class="short text-right">
<spring:message code="maps.accession-map" />
</h2>
<div class="stats-map padding10">
<p><spring:message code="maps.accession-map.intro" /></p>
<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">
......@@ -54,10 +52,11 @@
</a>
</div>
</div>
<p><spring:message code="maps.accession-map.intro" /></p>
</div>
</div>
<div class="col-sm-8">
<div class="hidden-xs col-md-8 col-sm-12">
<%-- <h2>
<spring:message code="maps.accession-map" />
</h2> --%>
......@@ -67,14 +66,21 @@
</div>
</div>
<div class="hidden-xs row see-also-row">
<div class="col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/0/images/aim/three-1.jpg" />')">
<div class="row see-also-row">
<div class="col-md-4 col-sm-12 no-space">
<div class="see-also-block">
<div class="content">
<h2 class="short">
<h2 class="short text-right">
<spring:message code="search.input.placeholder" />
</h2>
<div class="padding10 white-background body">
<div class="body">
<div class="row">
<div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background-image: url('/html/1/images/three-1.jpg');">
</div>
</div>
<div class="col-md-12 col-lg-8 no-space">
<p><spring:message code="search.search-query-missing" /></p>
<form action="<c:url value="/acn/search2" />" class="form-inline">
<div class="form-group">
......@@ -86,42 +92,73 @@
</div>
</div>
</div>
<div class="col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/0/images/aim/three-2.jpg" />')">
</div>
</div>
<!-- Block Organizations -->
<div class="col-md-4 col-sm-12 no-space">
<div class="see-also-block" >
<div class="content">
<h2 class="short">
<h2 class="short text-right">
<spring:message code="organization.page.list.title" />
</h2>
<div class="padding10 white-background body" dir="ltr">
<a href="<c:url value="/org/CGIAR" />">CGIAR International Genebanks</a>
&bull;
<div class="body" dir="ltr">
<div class="row">
<div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background: url('/html/1/images/three-2.jpg') 62% no-repeat;">
</div>
</div>
<div class="col-md-12 col-lg-8 no-space network-list">
<span>&bull;</span>
<a href="<c:url value="/org/CGIAR" />">CGIAR International Genebanks</a>
<span>&bull;</span>
<a href="<c:url value="/org/EURISCO" />">ECPGR EURISCO network</a>
&bull;
<span>&bull;</span>
<a href="<c:url value="/org/USDA" />">USDA ARS NPGS</a>
&bull;
<span>&bull;</span>
<a href="<c:url value="/org/COGENT" />">COGENT</a>
</div>
</div>
</div>
</div>
</div>
<div class="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/0/images/aim/three-3.jpg" />')">
</div>
<!-- Block Help -->
<div class="col-md-4 col-sm-12 no-space">
<div class="see-also-block" x-href="/1/content/help/how-to-use-genesys" >
<div class="content">
<h2 class="short">
<h2 class="short text-right">
<spring:message code="menu.help" />
</h2>
<div class="padding10 white-background body"><a><spring:message code="help.page.intro" /></a></div>
<div class="body">
<div class="row">
<div class="col-lg-4 hidden-md">
<div class="see-also-img" style="background: url('/html/1/images/three-3.jpg') 82% no-repeat;">
</div>
</div>
<div class="col-md-12 col-lg-8 no-space">
<a><spring:message code="help.page.intro" /></a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="center-divider">
<div class="row white-background">
<!-- left column end / middle columns start -->
<div class="col-md-8" id="middle-col">
<h2>
<spring:message code="activity.recent-activity" />
<div class="col-lg-8 col-md-8 no-space" id="middle-col">
<h2 class="short text-right">
<spring:message code="activity.recent-activity" />
</h2>
<div class="tab-content">
......@@ -144,10 +181,10 @@
</div>
<!-- middle column end / right columns start -->
<div class="col-md-4" id="right-col">
<div class="col-lg-4 col-md-4 no-space" id="right-col">
<c:if test="${sideBlurp ne null}">
<div class="content-block">
<h2>${sideBlurp.title}</h2>
<h2 class="short text-right">${sideBlurp.title}</h2>
<div class="blurp">
<c:set var="blurp" value="${sideBlurp}" />
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
......@@ -157,8 +194,8 @@
</c:if>
<div class="content-block" id="crop-list-dropdown">
<h2>
<div class="content-block" id="crop-list">
<h2 class="short text-right">
<spring:message code="crop.croplist" />
</h2>
<sec:authorize access="hasRole('ADMINISTRATOR')">
......@@ -168,35 +205,45 @@
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
</form>
</sec:authorize>
<div class="dropdown padding10">
<%-- <div class="dropdown padding10">
<input class="form-control autocomplete-genus" placeholder="<spring:message code="autocomplete.genus" />" x-source="<c:url value="/explore/ac/taxonomy.genus" />" />
</div>
</div>
</div> --%>
<c:if test="${cropList ne null and cropList.size() gt 0}">
<div class="content-block" id="crop-list">
<c:set var="cropCount" value="${cropList.size()}" />
<ul class="nav">
<li class="all-crops">
<a class="show" href="<c:url value="/explore/" />">
<spring:message code="crop.all-crops" />
</a>
</li>
<div class="row">
<div class="col-md-12">
<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>
<%-- ${cropCount / 3} ${cropCount / 3 == 0} idx=${status.count} --%>
<c:if test="${status.count % (cropCount / 3) == 0}">
</div>
<div class="col-md-12">
</c:if>
</c:forEach>
</div>
</div>
</ul>
</div>
</div>
</c:if>
</div>
</div>
<content tag="javascript">
<!-- Index Javascripts -->
<script type="text/javascript">
$( document ).ready(function() {
$(".autocomplete-genus").each(function() {
......
......@@ -9,23 +9,14 @@
<div class="post type-article">
<div class="post-head clearfix" x-href="<c:url value="/content/news/${activityPost.id}/${jspHelper.suggestUrlForText(activityPost.title)}" />">
<div class="user-icon">
<img src="<c:url value="/html/0/images/icon_user_genesys.png" />" alt="" />
<div class="user-icon hidden-sm hidden-xs">
</div>
<div class="post-head-content" dir="ltr">
<c:out value="${activityPost.title}" escapeXml="false" />
</div>
</div>
<c:if test="${activityPost.body ne null and activityPost.body.length() gt 0}">
<div class="post-inner clearfix">
<div class="post-content" dir="ltr">
<c:out value="${activityPost.body}" escapeXml="false" />
</div>
</div>
</c:if>
<div class="post-actions">
<div class="post-actions post-left-pad">
<security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
<a href="<c:url value="/content/activitypost/${activityPost.id}/edit" />">
<spring:message code="edit" />
......@@ -41,4 +32,12 @@
</c:if>
<local:prettyTime date="${activityPost.postDate.time}" locale="${pageContext.response.locale}" />
</div>
<c:if test="${activityPost.body ne null and activityPost.body.length() gt 0}">
<div class="post-inner clearfix post-left-pad">
<div class="post-content" dir="ltr">
<c:out value="${activityPost.body}" escapeXml="false" />
</div>
</div>
</c:if>
</div>
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