[Yanel-commits] rev 43924 -
public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager
guillaume at wyona.com
guillaume at wyona.com
Thu Jul 30 17:09:25 CEST 2009
Author: guillaume
Date: 2009-07-30 17:09:24 +0200 (Thu, 30 Jul 2009)
New Revision: 43924
Modified:
public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
Log:
UI cleanup (labels, headings) according to Simone's remarks and dead-tree spec.
Issue: 7165
Modified: public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java 2009-07-30 15:03:52 UTC (rev 43923)
+++ public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java 2009-07-30 15:09:24 UTC (rev 43924)
@@ -129,7 +129,7 @@
sb.append("<?xml version=\"1.0\"?>");
sb.append("<html xmlns=\"http://www.w3.org/1999/xhtml\">");
sb.append("<head>");
- sb.append("<title>Update Access Policy</title>");
+ sb.append("<title>Edit Access Policy</title>");
sb.append("<meta name=\"generator\" content=\"" + this.getClass().getName() + "\"/>");
sb.append("<link rel=\"stylesheet\" href=\"" + PathUtil.getResourcesHtdocsPathURLencoded(this) + "js/accesspolicyeditor/style.css\" type=\"text/css\"/>");
@@ -137,7 +137,7 @@
sb.append("<script language=\"javascript\">var getURLs = {\"identities-url\": \"" + identitiesURL + "\", \"policy-url\": \"" + policyURL + "\", \"cancel-url\": \"" + cancelURL + "\", \"save-url\": \"" + saveURL + "\"};</script><script language=\"javascript\" src=\"" + PathUtil.getResourcesHtdocsPathURLencoded(this) + "js/accesspolicyeditor/org.wyona.security.gwt.accesspolicyeditor.AccessPolicyEditor.nocache.js\"></script>");
sb.append("</head>");
- sb.append("<body><h1>Update Access Policy</h1><p><div id=\"access-policy-editor-hook\"></div></p></body></html>");
+ sb.append("<body><h1>Edit Access Policy</h1><p><div id=\"access-policy-editor-hook\"></div></p></body></html>");
}
} else {
//response.setContentType("text/html; charset=" + DEFAULT_ENCODING);
Modified: public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java 2009-07-30 15:03:52 UTC (rev 43923)
+++ public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyViewer.java 2009-07-30 15:09:24 UTC (rev 43924)
@@ -42,16 +42,16 @@
sb.append("<link type=\"text/css\" href=\"" + backToRootPath(path) + "yanel/yanel-css/view-access-policy.css\" rel=\"stylesheet\"/>");
sb.append("</head>");
sb.append("<body>");
- if(showParents) {
+ if(showParents) {
+ sb.append("<h1>Access Policies for Path (and its parents) <i>" + path);
+ if (contentItemId != null) sb.append("#" + contentItemId);
+ sb.append("</i>:</h1>");
+
// Show also all parent policies
if (showTabs) {
sb.append("<p><a href=\"?yanel.policy=read&orderedBy=" + orderedBy + "&showParents=false\">Node Policy</a> | Parent Policies</p>");
}
- sb.append("<p>Access Policies for Path (and its parents) <i>" + path);
- if (contentItemId != null) sb.append("#" + contentItemId);
- sb.append("</i>:</p>");
-
sb.append(getOrderByLink(orderedBy, showParents, showTabs));
sb.append("<p><table border=\"1\">");
sb.append("<tr><td>Path</td>" + getSplittedPath(pm, path, contentItemId) + "</tr>");
@@ -63,15 +63,15 @@
sb.append("<tr valign=\"top\"><td>Aggregated Policy</td>" + getPoliciesAsXHTML(pm, gm, path, contentItemId, aggregate, orderedBy, showAbbreviatedLabels) + "</tr>");
sb.append("</table></p>");
} else {
+ sb.append("<div id=\"path-sentence\"><h1>Aggregated Access Policy for Path <i>" + path);
+ if (contentItemId != null) sb.append("#" + contentItemId);
+ sb.append("</i>:</h1></div>");
+
// Show policy of this node only
if (showTabs) {
sb.append("<p>Node Policy | <a href=\"?yanel.policy=read&orderedBy=" + orderedBy + "&showParents=true\">Parent Policies</a></p>");
}
- sb.append("<div id=\"path-sentence\"><p>Aggregated Access Policy for Path <i>" + path);
- if (contentItemId != null) sb.append("#" + contentItemId);
- sb.append("</i>:</p></div>");
-
sb.append(getOrderByLink(orderedBy, showParents, showTabs));
boolean aggregate = true;
Policy p = pm.getPolicy(path, aggregate);
More information about the Yanel-commits
mailing list