add active status to module menu items
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d134dfee Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d134dfee Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d134dfee Branch: refs/heads/develop Commit: d134dfee3f4f58d2ce5d154f99f40854dabf6f93 Parents: 8fbf37d Author: tkurz <[email protected]> Authored: Mon Apr 8 12:49:20 2013 +0200 Committer: tkurz <[email protected]> Committed: Mon Apr 8 12:49:20 2013 +0200 ---------------------------------------------------------------------- .../services/templating/TemplatingServiceImpl.java | 3 +++ .../src/main/resources/templates/admin.ftl | 10 ++++++++-- .../main/resources/web/public/style/blue/style.css | 7 ++++++- .../resources/web/public/style/white/style.css | 6 ++++++ 4 files changed, 23 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java index d7ba882..5e4fcb5 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java @@ -254,9 +254,11 @@ public class TemplatingServiceImpl implements TemplatingService { if(path.startsWith((String)menuItem.getProperties().get("baseurl"))) { module = (String)menuItem.getProperties().get("title"); } + menuItem.getProperties().put("active",false); for(MenuItem submenu : menuItem.getSubmenu()) { if(submenu.getProperties().get("path").equals(path)) { submenu.getProperties().put("active",true); + menuItem.getProperties().put("active",true); module = (String)menuItem.getProperties().get("title"); active = true; } else { @@ -271,6 +273,7 @@ public class TemplatingServiceImpl implements TemplatingService { for(MenuItem submenu : menuItem.getSubmenu()) { if(submenu.getProperties().get("title").equals(DEFAULT_TITLE_FOR_WEBSERVICES)) { submenu.getProperties().put("active",true); + menuItem.getProperties().put("active",true); } } } http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/templates/admin.ftl ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl index 6b8e84f..7d8d7a1 100644 --- a/platform/marmotta-core/src/main/resources/templates/admin.ftl +++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl @@ -66,8 +66,14 @@ <div id="left"> <ul id="menu"> <#list MODULE_MENU as menu> - <li class="menu_item"> - <div class="menu_heading">${menu.properties["title"]}</div> + <li + <#if menu.properties["active"]> + class="menu_item active" + <#else> + class="menu_item" + </#if> + > + <div class="menu_heading"><a href="${menu.submenu[0].properties["path"]}">${menu.properties["title"]}</a></div> <ul class="submenu"> <#list menu.submenu as submenu> <li http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css index f5b5724..5918683 100644 --- a/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css +++ b/platform/marmotta-core/src/main/resources/web/public/style/blue/style.css @@ -179,9 +179,14 @@ ul#menu li.menu_item { ul#menu div.menu_heading { padding: 5px 4px 5px 10px; - font-weight: bold; background-color: #0B61A4; + +} + +ul#menu div.menu_heading a { color: white; + font-weight: bold; + text-decoration: none; } ul.submenu { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d134dfee/platform/marmotta-core/src/main/resources/web/public/style/white/style.css ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/resources/web/public/style/white/style.css b/platform/marmotta-core/src/main/resources/web/public/style/white/style.css index d787917..11d4781 100644 --- a/platform/marmotta-core/src/main/resources/web/public/style/white/style.css +++ b/platform/marmotta-core/src/main/resources/web/public/style/white/style.css @@ -158,6 +158,12 @@ ul#menu div.menu_heading { font-weight: bold; } +ul#menu div.menu_heading a { + color: black; + font-weight: bold; + text-decoration: none; +} + ul.submenu { margin: 0; padding: 2px 0 10px 0;
