[Yanel-commits] rev 57442 - public/yanel/trunk/src/realms/from-scratch-realm-template/src/java/org/wyona/yanel/servlet/toolbar/impl
michi at wyona.com
michi at wyona.com
Tue Mar 22 23:27:15 CET 2011
Author: michi
Date: 2011-03-22 23:27:15 +0100 (Tue, 22 Mar 2011)
New Revision: 57442
Modified:
public/yanel/trunk/src/realms/from-scratch-realm-template/src/java/org/wyona/yanel/servlet/toolbar/impl/FromScratchRealmToolbar.java
Log:
workflow added to toolbar
Modified: public/yanel/trunk/src/realms/from-scratch-realm-template/src/java/org/wyona/yanel/servlet/toolbar/impl/FromScratchRealmToolbar.java
===================================================================
--- public/yanel/trunk/src/realms/from-scratch-realm-template/src/java/org/wyona/yanel/servlet/toolbar/impl/FromScratchRealmToolbar.java 2011-03-22 22:02:25 UTC (rev 57441)
+++ public/yanel/trunk/src/realms/from-scratch-realm-template/src/java/org/wyona/yanel/servlet/toolbar/impl/FromScratchRealmToolbar.java 2011-03-22 22:27:15 UTC (rev 57442)
@@ -28,6 +28,9 @@
this.menu = new org.wyona.yanel.servlet.menu.impl.DefaultMenuV2();
}
+ /**
+ * @see org.wyona.yanel.servlet.toolbar.YanelToolbar#getToolbarBodyStart(Resource, HttpServletRequest, Map, String)
+ */
public String getToolbarBodyStart(Resource resource, HttpServletRequest request, Map map, String reservedPrefix) {
try {
String backToRealm = PathUtil.backToRealm(resource.getPath());
@@ -37,7 +40,7 @@
buf.append(getToolbarMenus(resource, request, map, reservedPrefix));
buf.append("</div>");
- buf.append(getInfo(resource, request, map));
+ buf.append(getInfo(resource, request, map, backToRealm, reservedPrefix));
buf.append("<span id=\"yaneltoolbar_logo\">");
buf.append("<a href=\"http://www.wyona.com\"><img src=\"" + backToRealm + reservedPrefix
@@ -114,7 +117,7 @@
/**
* Gets information such as realm name, user name, etc.
*/
- private String getInfo(Resource resource, HttpServletRequest request, Map map) throws Exception {
+ private String getInfo(Resource resource, HttpServletRequest request, Map map, String backToRealm, String reservedPrefix) throws Exception {
String userLanguage = getUserLanguage(resource);
StringBuilder buf = new StringBuilder();
buf.append("<span id=\"yaneltoolbar_info\">");
@@ -128,11 +131,16 @@
+ "\">unlock</a>) ");
}
}
+
+ org.wyona.yarep.core.Node[] nodes = resource.getRealm().getRepository().getSearcher().searchProperty("workflow-state", "review", "/");
+ if (nodes != null && nodes.length > 0) {
+ buf.append("Workflow: <a href=\"" + backToRealm + reservedPrefix + "/workflow-dashboard.html?workflow-state=review\">" + nodes.length + " pages to be reviewed</a> ");
+ }
+
Identity identity = resource.getEnvironment().getIdentity();
if (identity != null && !identity.isWorld()) {
- String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
- buf.append(getLabel("user", userLanguage) + ": <b><a href=\"" + backToRealm + "yanel/users/" + identity.getUsername()
- + ".html\" style=\"font-size: 13px; text-decoration: none;\">" + identity.getAlias() + "</a></b>"); // TODO: yanel/users should be replaced by reservedPrefix, also see src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
+ buf.append(getLabel("user", userLanguage) + ": <b><a href=\"" + backToRealm + reservedPrefix + "/users/" + identity.getUsername()
+ + ".html\" style=\"font-size: 13px; text-decoration: none;\">" + identity.getAlias() + "</a></b>");
} else {
buf.append(getLabel("user", userLanguage) + ": <b>Not signed in!</b>");
}
More information about the Yanel-commits
mailing list