Commit 0a0297b6 authored by Matija Obreza's avatar Matija Obreza
Browse files

Working on /1/ designs

parent be3a7516
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
</sec:global-method-security> </sec:global-method-security>
<!--Do not filter static resources --> <!--Do not filter static resources -->
<sec:http pattern="/html/**" security="none" create-session="stateless" /> <sec:http pattern="/0/html/**" security="none" create-session="stateless" />
<sec:http pattern="/1/html/**" security="none" create-session="stateless" />
<!-- And other stuff --> <!-- And other stuff -->
<sec:http pattern="/webapi/**" security="none" create-session="stateless" /> <sec:http pattern="/webapi/**" security="none" create-session="stateless" />
...@@ -52,6 +54,8 @@ ...@@ -52,6 +54,8 @@
<sec:http auto-config="true" use-expressions="true"> <sec:http auto-config="true" use-expressions="true">
<!-- <intercept-url pattern="/data/**" access="isAuthenticated()" /> --> <!-- <intercept-url pattern="/data/**" access="isAuthenticated()" /> -->
<sec:intercept-url pattern="/admin/**" access="hasRole('ADMINISTRATOR')" /> <sec:intercept-url pattern="/admin/**" access="hasRole('ADMINISTRATOR')" />
<sec:intercept-url pattern="/1/admin/**" access="hasRole('ADMINISTRATOR')" />
<sec:intercept-url pattern="/profile**" access="isAuthenticated()" /> <sec:intercept-url pattern="/profile**" access="isAuthenticated()" />
<sec:intercept-url pattern="/oauth/authorize" access="isAuthenticated()" /> <sec:intercept-url pattern="/oauth/authorize" access="isAuthenticated()" />
......
...@@ -8,9 +8,15 @@ $brand-danger: #d9534f !default; ...@@ -8,9 +8,15 @@ $brand-danger: #d9534f !default;
$link-color: #5476b2; $link-color: #5476b2;
/* $link-color: darken($brand-primary, 10%) !default; */ /* $link-color: darken($brand-primary, 10%) !default; */
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default; // Background color for `<body>`.
$font-family-serif: Georgia, "Times New Roman", Times, serif !default; $body-bg: #fff !default;
$font-size-base: 14px !default; // Global text color on `<body>`.
$text-color: #000 !default;
$font-family-sans-serif: "Noto Sans",Helvetica,Arial,Freesans,Clean,sans-serif !default;
$font-size-base: 16px !default;
/* Unit-less `line-height` for use in components like buttons. */
/* $line-height-base: 1.428571429 !default; // 20/14 */
/* /*
$font-size-h1: floor(($font-size-base * 1.8)) !default; // ~36px $font-size-h1: floor(($font-size-base * 1.8)) !default; // ~36px
......
...@@ -29,8 +29,12 @@ $break-xlarge: 1200px; ...@@ -29,8 +29,12 @@ $break-xlarge: 1200px;
} }
/* Sticky Footer */ /* Sticky Footer */
html, body { html {
height: 100%; position: relative;
min-height: 100%;
}
body {
font-family: 'Noto Sans'; font-family: 'Noto Sans';
} }
...@@ -38,4 +42,30 @@ html, body { ...@@ -38,4 +42,30 @@ html, body {
font-family: FontAwesome; font-family: FontAwesome;
} }
#content-header {
#admin-menu a {
display: block;
padding: 10px;
margin: 10px 0px;
}
}
#content-body {
> h1 {
margin-top: 0;
}
}
footer {
position: absolute;
bottom: 0px;
width: 100%;
height: 60px;
background-color: #F5F5F5;
}
.container {
.text-muted {
margin: 20px 0px;
}
}
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</c:when> </c:when>
<c:otherwise> <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/bootstrap.css" />" type="text/css" rel="stylesheet" />
<link href="<c:url value="/html/1/styles/other.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/genesys.css" />" type="text/css" rel="stylesheet" />
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
......
<%@include file="/WEB-INF/jsp/init.jsp"%> <%@include file="/WEB-INF/jsp/init.jsp"%>
<!-- footer start --> <!-- Footer -->
<div id="footer"> <footer class="footer">
<div class="container-fluid">
</div> <p class="text-muted">Place sticky footer content here.</p>
</div>
</footer>
<%-- Placed at the end of the document so the pages load faster --%> <%-- Placed at the end of the document so the pages load faster --%>
<c:choose> <c:choose>
<c:when test="${requestContext.theme.name eq 'one'}"> <c:when test="${requestContext.theme.name eq 'one'}">
<script type="text/javascript" src="<c:url value="/html/1/js/all.min.js" />"></script> <script type="text/javascript" src="<c:url value="/html/1/js/all.min.js" />"></script>
</c:when> </c:when>
<c:when test="${requestContext.theme.name eq 'all'}"> <c:when test="${requestContext.theme.name eq 'all'}">
<script type="text/javascript" src="<c:url value="/html/1/js/libraries.min.js" />"></script> <script type="text/javascript" src="<c:url value="/html/1/js/libraries.min.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/1/js/genesys.js" />"></script> <script type="text/javascript" src="<c:url value="/html/1/js/genesys.js" />"></script>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<script type="text/javascript" src="<c:url value="/html/1/js/libraries.js" />"></script> <script type="text/javascript" src="<c:url value="/html/1/js/libraries.js" />"></script>
<script type="text/javascript" src="<c:url value="/html/1/js/genesys.js" />"></script> <script type="text/javascript" src="<c:url value="/html/1/js/genesys.js" />"></script>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<script type="text/javascript"> <script type="text/javascript">
L.Icon.Default.imagePath='<c:url value="/html/styles/images" />'; L.Icon.Default.imagePath = '<c:url value="/html/1/styles/images" />';
<%--dynCss.config.debug=true;--%> <%--dynCss.config.debug=true;--%>
//enableSessionWarning(${pageContext.session.maxInactiveInterval}); //enableSessionWarning(${pageContext.session.maxInactiveInterval});
</script> </script>
<!-- footer end --> <!-- Footer/End -->
<%@include file="/WEB-INF/jsp/init.jsp" %> <%@include file="/WEB-INF/jsp/init.jsp"%>
<!-- Menu -->
<%-- <div id="genesys-menu" class="bg-dev1">
<a href="<c:url value="/welcome" />">
<img id="genesys-logo" src="<c:url value="/html/0/images/logo.svg" />" alt="Genesys - Gateway to Genetic Resources" title="Genesys - Gateway to Genetic Resources" />
</a>
</div>
--%>
<!-- Menu/End -->
<%@include file="/WEB-INF/jsp/init.jsp"%> <%@include file="/WEB-INF/jsp/init.jsp"%>
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<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" href="<c:url value="/" />">Genesys 2</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="active">
<a href="<c:url value="/welcome" />" title="<spring:message code="menu.home" />">
<spring:message code="menu.home" />
</a>
</li>
<li class="dropdown">
<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>
<ul class="dropdown-menu">
<li>
<a href="<c:url value="/content/about/about" />">
<spring:message code="menu.about" />
</a>
</li>
<li>
<a href="<c:url value="/content/about/contact" />">
<spring:message code="menu.contact" />
</a>
</li>
<li>
<a href="<c:url value="/content/about/what-is-genesys" />">
<spring:message code="menu.what-is-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>
<a href="<c:url value="/content/about/history-of-genesys" />">
<spring:message code="menu.history-of-genesys" />
</a>
</li>
<li>
<a href="<c:url value="/content/about/newsletter" />">
<spring:message code="menu.newsletter" />
</a>
</li>
<li>
<a href="<c:url value="/content/about/frequently-asked-questions" />">
<spring:message code="menu.faq" />
</a>
</li>
<li role="separator" class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li>
<a href="#">Separated link</a>
</li>
<li>
<a href="#">One more separated link</a>
</li>
</ul>
</li>
<li>
<a href="<c:url value="/explore" />">
<spring:message code="menu.browse" />
</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="/geo/" />">
<spring:message code="menu.countries" />
</a>
</li>
<li>
<a href="<c:url value="/wiews/active" />">
<spring:message code="menu.institutes" />
</a>
</li>
<%--<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Dropdown
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li>
<a href="#">Action</a>
</li>
<li>
<a href="#">Another action</a>
</li>
<li>
<a href="#">Something else here</a>
</li>
<li role="separator" class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li>
<a href="#">Separated link</a>
</li>
<li>
<a href="#">One more separated link</a>
</li>
</ul>
</li> --%>
</ul>
<ul class="nav navbar-nav navbar-right">
<security:authorize access="isAnonymous()">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<spring:message code="page.login" />
</a>
<ul class="dropdown-menu pull-left">
<li>
<form role="form" method="post" action="<c:url value="/login-attempt" />">
<div class="form-group">
<label for="username">
<spring:message code="login.username" />
:
</label>
<input type="email" class="form-control" id="username" name="username" placeholder="<spring:message code="login.username"/>" />
</div>
<div class="form-group">
<label for="password">
<spring:message code="login.password" />
</label>
<input type="password" class="form-control" id="password" name="password" placeholder="<spring:message code="login.password"/>" />
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="_spring_security_remember_me" id="_spring_security_remember_me" />
<spring:message code="login.remember-me" />
</label>
</div>
<button type="submit" class="btn btn-green">
<spring:message code="login.login-button" />
</button>
<span class="or">-</span>
<a href="<c:url value="/google/login" />" class="btn btn-default google-signin">
<spring:message code="login.with-google-plus" />
</a>
<a href="<c:url value="/registration" />" class="btn btn-default">
<spring:message code="login.register-now" />
</a>
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
</form>
</li>
</ul>
</li>
</security:authorize>
<security:authorize access="isAuthenticated()">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<spring:message code="user.pulldown.heading" arguments="${user.user.name}" />
<span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/profile/${user.username}" />">
<spring:message code="user.pulldown.profile" />
</a>
</li>
<li>
<a id="logout1" href="#" onclick="document.getElementById('logoutForm').submit();">
<spring:message code="user.pulldown.logout" />
</a>
</li>
<security:authorize access="hasRole('ADMINISTRATOR')">
<li role="separator" class="divider"></li>
<li>
<a href="<c:url value="/admin/" />">
<spring:message code="user.pulldown.administration" />
</a>
</li>
<li>
<a href="<c:url value="/profile/list" />">
<spring:message code="user.pulldown.users" />
</a>
</li>
<li>
<a href="<c:url value="/team" />">
<spring:message code="user.pulldown.teams" />
</a>
</li>
<li>
<a href="<c:url value="/admin/oauth-clients/" />">
<spring:message code="user.pulldown.oauth-clients" />
</a>
</li>
<li>
<a href="<c:url value="/content" />">
<spring:message code="user.pulldown.manage-content" />
</a>
</li>
<li>
<a href="<c:url value="/project" />">
<spring:message code="project.page.list.title" />
</a>
</li>
</security:authorize>
</ul>
</li>
</security:authorize>
</ul>
</div>
<!--/.nav-collapse -->
</div>
</nav>
\ No newline at end of file
...@@ -3,78 +3,79 @@ ...@@ -3,78 +3,79 @@
<!DOCTYPE html> <!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'}"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 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:schema="http://schema.org/" xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#" xmlns:germplasmType="http://purl.org/germplasm/germplasmType#"
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#"
> >
<head> <head>
<title><sitemesh:write property="title" /></title> <title><sitemesh:write property="title" /></title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="language" content="${pageContext.response.locale.language}" /> <meta name="language" content="${pageContext.response.locale.language}" />
<!-- CSRF protection-->
<meta name="_csrf" content="${_csrf.token}"/>
<!-- default header name is X-CSRF-TOKEN -->
<meta name="_csrf_header" content="${_csrf.headerName}"/>
<!-- Links --> <!-- CSRF protection-->
<link rel="shortcut icon" href="<c:url value="/html/0/images/genesys.png" />" /> <meta name="_csrf" content="${_csrf.token}" />
<!-- default header name is X-CSRF-TOKEN -->
<meta name="_csrf_header" content="${_csrf.headerName}" />
<!-- opensearch.org --> <!-- Links -->
<link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />" title="<spring:message code="search.input.placeholder" />" /> <link rel="shortcut icon" href="<c:url value="/html/0/images/genesys.png" />" />
<!-- l10n -->
<link rel="alternate" hreflang="en" href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="ar" href="<c:url value="/ar${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="de" href="<c:url value="/de${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="es" href="<c:url value="/es${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="fa" href="<c:url value="/fa${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="fr" href="<c:url value="/fr${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="pt" href="<c:url value="/pt${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="ru" href="<c:url value="/ru${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="zh" href="<c:url value="/zh${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<!-- Custom styles for this template --> <!-- opensearch.org -->
<%@include file="css.jsp" %> <link rel="search" hreflang="${pageContext.response.locale.language}" type="application/opensearchdescription+xml" href="<c:url value="/acn/opensearch/desc" />"
title="<spring:message code="search.input.placeholder" />"
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> />
<!--[if lt IE 9]>
<!-- l10n -->
<link rel="alternate" hreflang="en" href="<c:url value="/en${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="ar" href="<c:url value="/ar${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="de" href="<c:url value="/de${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="es" href="<c:url value="/es${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="fa" href="<c:url value="/fa${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="fr" href="<c:url value="/fr${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="pt" href="<c:url value="/pt${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="ru" href="<c:url value="/ru${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<link rel="alternate" hreflang="zh" href="<c:url value="/zh${pageContext.request.getAttribute('org.genesys2.server.servlet.filter.LocaleURLFilter.INTERNALURL')}" />" />
<!-- Custom styles for this template -->
<%@include file="css.jsp"%>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]--> <![endif]-->
<sitemesh:write property="head" /> <sitemesh:write property="head" />
<meta name="author" content="Global Crop Diversity Trust" /> <meta name="author" content="Global Crop Diversity Trust" />
</head> </head>
<security:authentication var="user" property="principal" /> <security:authentication var="user" property="principal" />
<body class="<sitemesh:write property="body.class" />"> <body>
<div class="site-wrapper"> <%@include file="header.jsp"%>
<%@include file="menu.jsp"%>
<%@include file="header.jsp" %> <!-- Begin page content -->
<%@include file="menu.jsp" %> <div id="content" class="<sitemesh:write property="body.class" />">
<div class="container-fluid">
<div id="content" class="<sitemesh:write property="body.class" />"> <div id="content-header" class="row">
<div id="content-header">
<sitemesh:write property="page.header" /> <sitemesh:write property="page.header" />
</div> </div>
<div id="content-body"> <div id="content-body" class="row">
<div id="dialog"></div> <h1>
<div typeof="<sitemesh:write property="body.typeof" />"> <sitemesh:write property="title" />
</h1>
<div id="dialog" class="row"></div>
<div id="content-body-content" class="" typeof="<sitemesh:write property="body.typeof" />">
<sitemesh:write property="body" /> <sitemesh:write property="body" />
</div> </div>
</div> </div>
</div> </div>
<%@include file="footer.jsp"%>
<sitemesh:write property="page.javascript" />
<%@include file="ga.jsp"%>
</div> </div>
<%@include file="footer.jsp"%>
<sitemesh:write property="page.javascript" />
<%@include file="ga.jsp"%>
</body> </body>
</html> </html>
Supports Markdown
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