Commit 435bf7e5 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '48-administration-pages' into 'master'

Administration pages

Closes #48

See merge request !18
parents 9015c26b 680dcac1
......@@ -82,7 +82,7 @@ $light-font-family: 'Roboto-Light';
}
.genesys-page {
.genesys-page, .admin-page{
font-family: $default-font-family;
.navbar-right ul.dropdown-menu {
......@@ -184,7 +184,7 @@ $light-font-family: 'Roboto-Light';
}
.navbar-inverse.navbar-default .navbar-nav {
&.nav-menu {
&.nav-menu, &.nav-menu-admin {
> li {
> a {
padding: 32px 16px 23px;
......@@ -3448,12 +3448,12 @@ table.accessions {
}
//
@media (min-width: 990px) and (max-width: 1919px) {
.genesys-page {
.genesys-page, .admin-page {
.navbar-collapse.collapse, .navbar-collapse.collapsing {
height: auto !important;
overflow-x: hidden;
.nav.navbar-nav.nav-menu {
.nav.navbar-nav.nav-menu, .nav.navbar-nav.nav-menu-admin{
display: none;
position: fixed;
top: 79px;
......@@ -3464,7 +3464,7 @@ table.accessions {
}
&.in {
.nav.navbar-nav.nav-menu {
.nav.navbar-nav.nav-menu, .nav.navbar-nav.nav-menu-admin {
display: block;
padding-bottom: 43px;
}
......@@ -3569,7 +3569,9 @@ table.accessions {
}
}
.navbar-collapse.collapse .nav.navbar-nav.nav-menu,
.navbar-collapse.collapsing .nav.navbar-nav.nav-menu {
.navbar-collapse.collapse .nav.navbar-nav.nav-menu-admin,
.navbar-collapse.collapsing .nav.navbar-nav.nav-menu,
.navbar-collapse.collapsing .nav.navbar-nav.nav-menu-admin {
html[dir="rtl"] & {
right: 0;
left: auto;
......@@ -3578,12 +3580,12 @@ table.accessions {
}
@media (max-width: 1919px) {
.genesys-page {
.genesys-page, .admin-page {
.hidden-md {
display: none;
}
.navbar-collapse.collapse {
.nav.navbar-nav.nav-menu {
.nav.navbar-nav.nav-menu, .nav.navbar-nav.nav-menu-admin {
width: 262px;
background: $dark-text-color;
......@@ -3778,7 +3780,8 @@ table.accessions {
margin-left: 20px;
}
}
.navbar-collapse.collapse .nav.navbar-nav.nav-menu {
.navbar-collapse.collapse .nav.navbar-nav.nav-menu,
.navbar-collapse.collapse .nav.navbar-nav.nav-menu-admin {
li {
html[dir="ltr"] & {
text-align: left;
......@@ -4385,7 +4388,7 @@ table.accessions {
}
@media (max-width: 989px) {
.genesys-page {
.genesys-page, .admin-page {
.navbar-toggle {
display: block;
margin-right: 20px;
......@@ -4467,6 +4470,18 @@ table.accessions {
}
}
&.nav-menu-admin {
width: 100%;
padding-top: 0px;
li {
padding: 0px;
a {
padding: 14px 0px;
}
}
}
li {
&:hover, &:focus, &.active, &.open {
a {
......
......@@ -2,9 +2,7 @@
<!DOCTYPE html>
<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: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#">
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}" class="genesys-page">
<head>
<title><sitemesh:write property="title" /></title>
<meta charset="utf-8" />
......@@ -54,78 +52,96 @@
<body>
<%@ include file="header.jsp" %>
<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 pull-left" data-toggle="collapse" data-target="#navbar-admin" 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="/admin/" />"> <spring:message code="page.home.title" />
</a>
</div>
<div id="navbar-admin" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="hidden-sm">
<a href="<c:url value="/welcome" />" title="<spring:message code="menu.home" />"> <spring:message code="menu.home" />
</a>
</li>
<li>
<a class="" href="<c:url value="/admin/cache/" />"> <spring:message code="menu.admin.caches" />
</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.admin.usermanagement" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<div class="admin-page">
<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 pull-left" 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="/admin/" />"> <spring:message code="page.home.title" /> </a>--%>
<a class="navbar-brand nav-logo clearfix" href="<c:url value="/admin/" />"><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 pull-left" 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="/admin/" />"> <spring:message code="page.home.title" /> </a>--%>
<a class="navbar-brand nav-logo clearfix" href="<c:url value="/admin/" />"><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-admin">
<li class="hidden-sm">
<a href="<c:url value="/welcome" />" title="<spring:message code="menu.home" />"> <spring:message code="menu.home" />
</a>
</li>
<li>
<a href="<c:url value="/admin/users/" />"> <spring:message code="user.pulldown.users" />
<a class="" href="<c:url value="/admin/cache/" />"> <spring:message code="menu.admin.caches" />
</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.admin.usermanagement" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/admin/users/" />"> <spring:message code="user.pulldown.users" />
</a>
</li>
<li>
<a href="<c:url value="/admin/teams/" />"> <spring:message code="user.pulldown.teams" />
</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.repository" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/admin/r/files/" />"> <spring:message code="menu.admin.repository.files" />
</a>
</li>
<li>
<a href="<c:url value="/admin/r/g" />"> <spring:message code="menu.admin.repository.galleries" />
</a>
</li>
</ul>
</li>
<li>
<a href="<c:url value="/admin/teams/" />"> <spring:message code="user.pulldown.teams" />
<a class="" href="<c:url value="/admin/logger/" />"> <spring:message code="menu.admin.loggers" />
</a>
</li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.repository" /> <span class="caret"></span>
</a>
<ul class="dropdown-menu pull-left">
<li>
<a href="<c:url value="/admin/r/files/" />"> <spring:message code="menu.admin.repository.files" />
<a class="" href="<c:url value="/admin/hazelcast/" />"> <spring:message code="menu.admin.hazelcast" /></a>
</li>
<li>
<a class="" href="<c:url value="/admin/ds2/" />"> <spring:message code="menu.admin.ds2" />
</a>
</li>
<li>
<a href="<c:url value="/admin/r/g" />"> <spring:message code="menu.admin.repository.galleries" />
<a class="" href="<c:url value="/admin/kpi/" />"> <spring:message code="menu.admin.kpi" />
</a>
</li>
</ul>
</li>
<li>
<a class="" href="<c:url value="/admin/logger/" />"> <spring:message code="menu.admin.loggers" />
</a>
</li>
<li>
<a class="" href="<c:url value="/admin/hazelcast/" />"> <spring:message code="menu.admin.hazelcast" /></a>
</li>
<li>
<a class="" href="<c:url value="/admin/ds2/" />"> <spring:message code="menu.admin.ds2" />
</a>
</li>
<li>
<a class="" href="<c:url value="/admin/kpi/" />"> <spring:message code="menu.admin.kpi" />
</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<%@ include file="languages.jspf" %>
</ul>
</div>
<div class="col-md-6 no-space">
<ul class="nav navbar-nav navbar-right">
<%@ include file="languages.jspf" %>
</ul>
</div>
</div>
</div>
</div>
</nav>
</nav>
</div>
<!-- Begin page content -->
<div id="content" class="<sitemesh:write property="body.class" />">
......
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