diff --git a/src/main/java/org/crophub/rest/servlet/controller/DatasetController.java b/src/main/java/org/crophub/rest/servlet/controller/DatasetController.java index 79f981ee27d4c761a80bd69e34f7984e5a7093f2..0b721c223b6e6d11eec3df4c70c98e2f84700fa9 100644 --- a/src/main/java/org/crophub/rest/servlet/controller/DatasetController.java +++ b/src/main/java/org/crophub/rest/servlet/controller/DatasetController.java @@ -56,6 +56,7 @@ public class DatasetController extends BaseController { if (metadata == null) { throw new ResourceNotFoundException(); } + model.addAttribute("page", page); model.addAttribute("metadata", metadata); model.addAttribute("methods", genesysService.listMethods(metadata)); diff --git a/src/main/resources/content/language.properties b/src/main/resources/content/language.properties index b4508d2079b171b270586d56d359202d4cdd14e0..28d08511599d993d70ed9ff363b816965baa125d 100644 --- a/src/main/resources/content/language.properties +++ b/src/main/resources/content/language.properties @@ -71,6 +71,8 @@ sample.message.invite.to.network = Invite to Network data.error.404=The data you requested was not found in the system. page.rendertime=Processing this page took {0}ms. +footer.copyright-statement=©2013 Global Crop Diversity Trust + user.pulldown.logout=Logout user.pulldown.profile=View profile diff --git a/src/main/webapp/WEB-INF/decorator/main.jsp b/src/main/webapp/WEB-INF/decorator/main.jsp index 7589f25cf26dca86479c2a890f7dffcac932441f..11212b0628676b2811642ca830f6250ff186742c 100644 --- a/src/main/webapp/WEB-INF/decorator/main.jsp +++ b/src/main/webapp/WEB-INF/decorator/main.jsp @@ -1,105 +1,130 @@ <%@include file="/WEB-INF/jsp/init.jsp"%> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> - <sitemesh:write property="title" /> - <%@include file="/WEB-INF/jsp/head-init.jsp"%> - - <%--Locked Compatible Mode for IE--%> - - - - - - - - - - - - - - - - - - <%--Fallback for older browsers--%> - - - - - - - - - - +<sitemesh:write property="title" /> +<%@include file="/WEB-INF/jsp/head-init.jsp"%> + +<%--Locked Compatible Mode for IE--%> + + + + + + + + + + + + + + + + + +<%--Fallback for older browsers--%> + + + + + + + + + + - -
- diff --git a/src/main/webapp/WEB-INF/jsp/accession/details.jsp b/src/main/webapp/WEB-INF/jsp/accession/details.jsp index 5f50a4356d5a0336ac446ce089e3f51f7de8aaf3..c88b0c1f5b0eb8baa2c52841af35d42a082cf762 100644 --- a/src/main/webapp/WEB-INF/jsp/accession/details.jsp +++ b/src/main/webapp/WEB-INF/jsp/accession/details.jsp @@ -83,6 +83,7 @@
+
@@ -93,11 +94,12 @@ -

+

-

+ -
+
+ ">
diff --git a/src/main/webapp/WEB-INF/jsp/country/data.jsp b/src/main/webapp/WEB-INF/jsp/country/data.jsp index 6803cd735681d7493cd95968746932b19c7db17d..a313cf3e234f57e6c143de1023f10c10a88a7637 100644 --- a/src/main/webapp/WEB-INF/jsp/country/data.jsp +++ b/src/main/webapp/WEB-INF/jsp/country/data.jsp @@ -32,6 +32,7 @@ + @@ -41,7 +42,8 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/country/index.jsp b/src/main/webapp/WEB-INF/jsp/country/index.jsp index d9f414f499899f5058630c071595834e829dddcb..2b574a9bc31f12964e711c0cf994f15a659ba3d9 100644 --- a/src/main/webapp/WEB-INF/jsp/country/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/country/index.jsp @@ -7,15 +7,34 @@ <spring:message code="country.page.list.title" /> -

+

+ +

+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 2b6082193ae6447803054fd3ccf5d70de5555793..ee84a20c3868989ace58e57544cc70b6b1616a40 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -8,19 +8,20 @@ -
+

Hello

+

-
+ -
+

diff --git a/src/main/webapp/WEB-INF/jsp/metadata/view.jsp b/src/main/webapp/WEB-INF/jsp/metadata/view.jsp index cd946ccbed74c9d85fda07585206cad81fde8ebe..81ff5764313abd28d8e2ef6335c06984fa44da61 100644 --- a/src/main/webapp/WEB-INF/jsp/metadata/view.jsp +++ b/src/main/webapp/WEB-INF/jsp/metadata/view.jsp @@ -8,9 +8,10 @@

- +

+
${status.count + accessions.size * accessions.number} ">
@@ -41,16 +42,22 @@ -

Accessions

- +

Observations

+ + +
+ <%-- --%> @@ -70,7 +77,8 @@ - + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/wiews/data.jsp b/src/main/webapp/WEB-INF/jsp/wiews/data.jsp index dd12da3e66f45cd3e3bab13ded7e4e96b3335111..02e4ce4c3c8678683d87952c7a438cb11c4fe5f5 100644 --- a/src/main/webapp/WEB-INF/jsp/wiews/data.jsp +++ b/src/main/webapp/WEB-INF/jsp/wiews/data.jsp @@ -10,14 +10,14 @@

-
- -
-
+ +<%--
"> -
+
--%>
${status.count + accessions.size * accessions.number} ">">
+ @@ -35,7 +36,8 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/wiews/index.jsp b/src/main/webapp/WEB-INF/jsp/wiews/index.jsp index 69b97bfda476dbf5fc4daeaed1b5c7516601c161..c8ff037933c1bafb89268af787d1dc3f55a034e2 100644 --- a/src/main/webapp/WEB-INF/jsp/wiews/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/wiews/index.jsp @@ -18,7 +18,13 @@ - +
    diff --git a/src/main/webapp/html/css/custom.css b/src/main/webapp/html/css/custom.css index a68b0c55997d2282ffcdbc96d51e5d6539108c45..4f83859321cd53c42e7035ca72b9d387bb7f6de4 100644 --- a/src/main/webapp/html/css/custom.css +++ b/src/main/webapp/html/css/custom.css @@ -1,3 +1,7 @@ +.genesys-bg { + background-color: #88ba41; +} + .alert.alert-info.inline { display: inline-block; padding: 4px 8px 4px 2px; @@ -12,6 +16,10 @@ font-size: 15px; } +.nav-header { + padding: 1em 0; +} + #invite-list .btn{ padding: 2px 5px; } @@ -25,6 +33,7 @@ table { font-size: 12px; } + table thead td { font-size: 15px; font-weight: normal; @@ -34,11 +43,30 @@ table thead td { h1, h2, h3, h4 { } +h1 { + font-size: 30px; +} + td { vertical-align: top; padding: 0.2em 0.5em; } +td.idx-col { + font-size: 80%; + width: 4em; + /* background-color: #eaeaea; */ + /* text-align: right; */ + vertical-align: middle; +} + +tr.odd td { + /* background-color: #f8f7f5; */ +} +tr.even td { + /* background-color: #f3f2ee; */ +} + .activity-post { padding: 1em 0em; } @@ -63,6 +91,115 @@ img.country-flag.bigger { height: 50px; } +li.hoofdleter { + font-size: 150%; + font-weight: bold; + list-style-type: none; + margin: 1em 0 0.5em; +} + +li.hoofdleter small { + font-size: 10px; + margin-left: 3em; +} + +.letter-pointer { + padding: 0 0.7em; + font-weight: bold; +} + .uom { margin-left: 1em; +} + +div.targeted:target { + background-color: #dfd0c0; +} + +body { + background-color: #e8e5e0; + color: #4d4c47; +} + +#content { + +} + +.content-block { + padding: 20px; + background-color: White; +} + +.content-block *:FIRST-CHILD { + margin-top: 0; + padding-top: 0; +} + +#header { + padding: 1em 1em 0.5em 1em; + background-color: #4d4c47; +} + + +#nav-main { + padding-bottom: 1em 2em 1em 2em; + background-color: #2a2924; + margin: 0 0 1em 0; + font-size: 12px; +} + +#header a, #nav-main a, #footer a { + color: White; + font-weight: bold; +} + +#nav-main ul { + margin: 0; + border-bottom: solid 3px White; +} + +#nav-main ul li { + text-transform: uppercase; + display: inline-block; + padding: 0.7em 1em; + margin: 0; +} + +#nav-main ul li:FIRST-CHILD { + +} + +#footer { + padding: 1em 1em 0.5em 1em; + border-top: solid 2px #909090; + background-color: #4d4c47; + margin: 4em 0 0 0; + color: White; + font-size: 11px; +/* position: absolute; + bottom: 0; */ +} + +#nav-foot ul { + margin: 0 0 1em 0; +} + +#nav-foot ul li { + display: inline-block; + /* border-left: solid 1px #707070; */ + padding: 0em 1em; + margin: 0; +} + +#nav-foot ul li:FIRST-CHILD { + border-left: none; + padding-left: 0; +} + +.navbar .nav > li > a { + text-shadow: none; +} + +.dropdown-menu { + background-color: #303030; } \ No newline at end of file diff --git a/src/main/webapp/html/images/logo2.png b/src/main/webapp/html/images/logo2.png new file mode 100644 index 0000000000000000000000000000000000000000..68d937bb3350743f4965808167aec7bfabfacad8 Binary files /dev/null and b/src/main/webapp/html/images/logo2.png differ diff --git a/src/main/webapp/html/images/logo2small.png b/src/main/webapp/html/images/logo2small.png new file mode 100644 index 0000000000000000000000000000000000000000..71d0b3333d5ee05fcd8aeddde743b4cac62be98e Binary files /dev/null and b/src/main/webapp/html/images/logo2small.png differ
${status.count + accessions.size * accessions.number} "> ">