Commit f24071a6 authored by Matija Obreza's avatar Matija Obreza

Further work on /1/ GUI

parent 0af852b0
...@@ -238,8 +238,12 @@ module.exports = function(grunt) { ...@@ -238,8 +238,12 @@ module.exports = function(grunt) {
dest : '<%= app.dist1 %>/js/libraries.js', dest : '<%= app.dist1 %>/js/libraries.js',
}, },
app1 : { app1 : {
src : [ '<%= app.source1 %>/js/prologue.js', '<%= app.source1 %>/js/epilogue.js' ], src : [ '<%= app.source1 %>/js/prologue.js', '<%= app.source1 %>/js/crophub.js', '<%= app.source1 %>/js/epilogue.js' ],
dest : '<%= app.dist1 %>/js/genesys.js' dest : '<%= app.dist1 %>/js/genesys.js'
},
world1 : {
src: [ 'bower_components/highmaps-beta/highmaps.src.js', 'bower_components/highcharts/modules/data.src.js', '<%= app.source1 %>/js/world.js'],
dest : '<%= app.dist1 %>/js/genesyshighcharts.js'
} }
}, },
...@@ -367,7 +371,7 @@ module.exports = function(grunt) { ...@@ -367,7 +371,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-newer'); grunt.loadNpmTasks('grunt-newer');
grunt.registerTask('build0', [ 'newer:jshint:dist', 'compass:dist', 'copy:dist', 'concat:dist', 'concat:world', 'concat:app', 'autoprefixer:dist', 'uglify:dist', 'cssmin:dist' ]); grunt.registerTask('build0', [ 'newer:jshint:dist', 'compass:dist', 'copy:dist', 'concat:dist', 'concat:world', 'concat:app', 'autoprefixer:dist', 'uglify:dist', 'cssmin:dist' ]);
grunt.registerTask('build1', [ 'newer:jshint:dist1', 'compass:dist1', 'copy:dist1', 'concat:dist1', 'concat:app1', 'autoprefixer:dist1', 'uglify:dist1', 'cssmin:dist1' ]); grunt.registerTask('build1', [ 'newer:jshint:dist1', 'compass:dist1', 'copy:dist1', 'concat:dist1', 'concat:world1', 'concat:app1', 'autoprefixer:dist1', 'uglify:dist1', 'cssmin:dist1' ]);
// grunt.registerTask('js', [ 'jshint:all', 'copy:dist', 'concat', 'autoprefixer', 'uglify:dist' ]); // grunt.registerTask('js', [ 'jshint:all', 'copy:dist', 'concat', 'autoprefixer', 'uglify:dist' ]);
// grunt.registerTask('css', [ 'compass:dist', 'copy:dist', 'concat', 'autoprefixer', 'cssmin' ]); // grunt.registerTask('css', [ 'compass:dist', 'copy:dist', 'concat', 'autoprefixer', 'cssmin' ]);
grunt.registerTask('default', [ 'build0', 'build1' ]); grunt.registerTask('default', [ 'build0', 'build1' ]);
......
...@@ -1370,6 +1370,10 @@ html[dir="rtl"] #country-in-genesys table .alignleft { ...@@ -1370,6 +1370,10 @@ html[dir="rtl"] #country-in-genesys table .alignleft {
ul.funny-list { ul.funny-list {
margin: 0; margin: 0;
padding: 0; padding: 0;
div.row > & {
margin: 0 10px;
}
} }
.main-col ul.funny-list li { .main-col ul.funny-list li {
...@@ -1387,11 +1391,11 @@ ul.funny-list { ...@@ -1387,11 +1391,11 @@ ul.funny-list {
display: inline-block; display: inline-block;
} }
.main-col table.accessions tr.odd td, .main-col table tr:nth-of-type(odd) td, #middle-col table tr:nth-of-type(odd) td, .main-col ul.funny-list>li.odd { .main-col table.accessions tr.odd td, .main-col table tr:nth-of-type(odd) td, #middle-col table tr:nth-of-type(odd) td, .main-col ul.funny-list>li:nth-of-type(odd) {
background-color: #f8f7f5; background-color: #f8f7f5;
} }
.main-col table.accessions tr.even td, .main-col table tr:nth-of-type(even) td, #middle-col table tr:nth-of-type(even) td, .main-col ul.funny-list>li.even { .main-col table.accessions tr.even td, .main-col table tr:nth-of-type(even) td, #middle-col table tr:nth-of-type(even) td, .main-col ul.funny-list>li:nth-of-type(even) {
background-color: #f3f2ee; background-color: #f3f2ee;
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -50,11 +50,44 @@ body { ...@@ -50,11 +50,44 @@ body {
} }
footer { footer {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
width: 100%; width: 100%;
height: $footer-height; height: $footer-height;
background-color: #F5F5F5;
> div {
background-color: #707070;
font-size: 75%;
}
.nav {
margin: 10px 0px;
li {
display: inline-block;
a {
color: #d0d0d0;
font-size: 12px;
padding: 0;
margin: 0 .5em;
}
}
}
#copyright {
padding: 0 0 10px 0;
p {
color: #d0d0d0;
font-size: 12px;
padding: 11px 0 0 10px;
html[dir="rtl"] & {
padding: 11px 10px 0 0;
}
}
}
} }
.container { .container {
...@@ -91,3 +124,104 @@ h1.page-title { ...@@ -91,3 +124,104 @@ h1.page-title {
border-top: 2px solid White; border-top: 2px solid White;
border-bottom: 2px solid white; border-bottom: 2px solid white;
} }
#content-header h1, #content-body-content .informative-h1, #content-body-content>h1:FIRST-CHILD {
background: none repeat scroll 0 0 #88ba42;
color: #fff;
font-size: 24px;
font-weight: bold;
}
#content-body-content {
.informative-h1 {
font-size: small;
font-weight: normal;
h1 {
margin-top: 0;
margin-bottom: 0;
font-size: 24px;
font-weight: bold;
padding: 10px 0;
}
}
/** Absolutely first H1 in the content section */
&>h1:FIRST-CHILD {
margin: 0 -15px;
padding: 10px 15px;
small {
font-size: 18px;
color: rgba(255, 255, 255, 0.7);
}
}
}
/** Header-related stuff: pagination and such */
.main-col-header {
background: #d4d1c6;
margin: 0 -15px;
padding: 10px 15px;
}
/** Alphabetic list */
.letter-pointer {
padding: 0 0.7em;
font-weight: bold;
}
ul > li.hoofdleter {
font-size: 150%;
font-weight: bold;
list-style-type: none;
margin: 1em 0 0.5em;
padding: 0;
small {
font-size: 10px;
html[dir="rtl"] & {
margin-right: 3em;
}
html:not([dir="rtl"]) & {
margin-left: 3em;
}
}
}
/** Funny List */
ul.funny-list {
margin: 0;
padding: 0;
> li {
list-style-type: none;
margin: 3px 0;
padding: 10px 15px;
&:nth-of-type(odd) {
background-color: #f8f7f5;
}
&:nth-of-type(even) {
background-color: #f3f2ee;
}
&.not-current * {
font-style: italic;
opacity: 0.5;
}
}
}
/** Unit of Measure */
.uom {
html[dir="rtl"] & {
margin-right: 1em;
}
html:not([dir="rtl"]) & {
margin-left: 1em;
}
}
...@@ -4,7 +4,38 @@ ...@@ -4,7 +4,38 @@
<footer class="footer"> <footer class="footer">
<div class="container-fluid"> <div class="container-fluid">
<p class="text-muted">Place sticky footer content here.</p> <!-- <p class="text-muted">Place sticky footer content here.</p> -->
<div id="nav-foot" class="clearfix">
<ul class="nav pull-left">
<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>
</ul>
<ul class="nav pull-right">
<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>
</ul>
</div>
<div class="pull-left" id="copyright">
<a href="<c:url value="/1/welcome" />" class="pull-left"><img style="height: 30px" src="<c:url value="/html/0/images/logo.svg" />" alt="Genesys - Gateway to Genetic Resources" /></a>
<p class="pull-left"><spring:message code="footer.copyright-statement" /></p>
</div>
<div class="pull-right">
<div class="pull-left text-right" style="color: #808080; font-family: monospace; font-size: 8px;">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br />
<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
</div>
</div>
</div> </div>
</footer> </footer>
......
...@@ -29,17 +29,19 @@ ...@@ -29,17 +29,19 @@
<c:set value="" var="hoofdleter" /> <c:set value="" var="hoofdleter" />
<ul class="funny-list"> <div class="row">
<c:forEach items="${countries}" var="country" varStatus="status"> <ul class="funny-list">
<c:if test="${hoofdleter ne country.getName(pageContext.response.locale).substring(0, 1)}"> <c:forEach items="${countries}" var="country" varStatus="status">
<c:set var="hoofdleter" value="${country.getName(pageContext.response.locale).substring(0, 1)}" /> <c:if test="${hoofdleter ne country.getName(pageContext.response.locale).substring(0, 1)}">
<li id="letter-${hoofdleter}" class="hoofdleter"><c:out value="${hoofdleter}" /> <c:set var="hoofdleter" value="${country.getName(pageContext.response.locale).substring(0, 1)}" />
<small><a href="#letter-top"><spring:message code="jump-to-top" /></a></small> <li id="letter-${hoofdleter}" class="hoofdleter"><c:out value="${hoofdleter}" />
</li> <small><a href="#letter-top"><spring:message code="jump-to-top" /></a></small>
</c:if> </li>
<li class="${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show ${not country.current ? 'disabled' : ''}" href="<c:url value="/geo/${country.code3}" />"><c:out value="${country.getName(pageContext.response.locale)}" /></a></li> </c:if>
</c:forEach> <li><a class="show ${not country.current ? 'disabled' : ''}" href="<c:url value="/geo/${country.code3}" />"><c:out value="${country.getName(pageContext.response.locale)}" /></a></li>
</ul> </c:forEach>
</ul>
</div>
<c:remove var="hoofdleter" /> <c:remove var="hoofdleter" />
</body> </body>
......
...@@ -26,17 +26,19 @@ ...@@ -26,17 +26,19 @@
</div> </div>
</div> </div>
<ul class="funny-list"> <div class="row">
<c:forEach items="${pagedData.content}" var="faoInstitute" varStatus="status"> <ul class="funny-list">
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'} ${faoInstitute.current ? '' : 'not-current'}"><a <c:forEach items="${pagedData.content}" var="faoInstitute" varStatus="status">
class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code}" />"><b><c:out <li class="clearfix ${faoInstitute.current ? '' : 'not-current'}"><a
value="${faoInstitute.code}"/></b> <c:out value="${faoInstitute.fullName}"/></a> class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code}" />"><b><c:out
value="${faoInstitute.code}"/></b> <c:out value="${faoInstitute.fullName}"/></a>
<div class="pull-right"><spring:message code="faoInstitute.accessionCount"
arguments="${faoInstitute.accessionCount}"/></div> <div class="pull-right"><spring:message code="faoInstitute.accessionCount"
</li> arguments="${faoInstitute.accessionCount}"/></div>
</c:forEach> </li>
</ul> </c:forEach>
</ul>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
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