Author: ogrisel
Date: Thu Mar 31 17:38:53 2011
New Revision: 1087379
URL: http://svn.apache.org/viewvc?rev=1087379&view=rev
Log:
STANBOL-120: fix selected CSS class for menu links
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/templates/imports/common.ftl
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java?rev=1087379&r1=1087378&r2=1087379&view=diff
==============================================================================
---
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
(original)
+++
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
Thu Mar 31 17:38:53 2011
@@ -1,6 +1,7 @@
package org.apache.stanbol.commons.web.base.resource;
import java.net.URI;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -38,17 +39,22 @@ public class BaseStanbolResource {
}
public List<MenuItem> getMainMenuItems() {
- return Arrays.asList(new MenuItem("/engines", getRootUrl() +
"/engines", uriInfo), new MenuItem(
- "/store", getRootUrl() + "/store", uriInfo), new
MenuItem("/sparql",
- getRootUrl() + "/sparql", uriInfo));
+ List<MenuItem> items = new ArrayList<MenuItem>();
+ for (String path: Arrays.asList("/engines", "/store", "/sparql")) {
+ items.add(new MenuItem(path, path, uriInfo));
+ }
+ return items;
}
public static class MenuItem {
public MenuItem(String label, String link, UriInfo uriInfo) {
this.label = label;
+ if (link.startsWith("/")) {
+ link = link.substring(1);
+ }
this.link = link;
- cssClass = uriInfo.getPath().startsWith(link.substring(1)) ?
"selected" : "unselected";
+ cssClass = uriInfo.getPath().startsWith(link) ? "selected" :
"unselected";
}
protected final String label;
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/templates/imports/common.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/templates/imports/common.ftl?rev=1087379&r1=1087378&r2=1087379&view=diff
==============================================================================
---
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/templates/imports/common.ftl
(original)
+++
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/home/src/main/resources/org/apache/stanbol/commons/web/home/templates/imports/common.ftl
Thu Mar 31 17:38:53 2011
@@ -28,7 +28,7 @@
<div class="mainNavigationMenu">
<ul>
<#list it.mainMenuItems as item>
- <li class="${item.cssClass}"><a
href="${item.link}">${item.label}</a></li>
+ <li class="${item.cssClass}"><a
href="${it.publicBaseUri}${item.link}">${item.label}</a></li>
</#list>
</ul>
</div>
