You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/01/10 22:04:41 UTC
svn commit: r897704 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface:
./ src/main/java/org/apache/clerezza/platform/usermanager/webinterface/
src/main/reso...
Author: ito
Date: Sun Jan 10 21:04:40 2010
New Revision: 897704
URL: http://svn.apache.org/viewvc?rev=897704&view=rev
Log:
usermanager.webinterface: using globalmenuitemprovider and ssp
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-overview.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-overview-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/pom.xml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/pom.xml Sun Jan 10 21:04:40 2010
@@ -58,6 +58,10 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.typerendering.scalaserverpages</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.utils.customproperty</artifactId>
</dependency>
<dependency>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Sun Jan 10 21:04:40 2010
@@ -25,8 +25,10 @@
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -46,6 +48,7 @@
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItem;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -59,9 +62,10 @@
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.platform.config.SystemConfig;
-import org.apache.clerezza.platform.dashboard.DashBoard;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.typerendering.RenderletManager;
+import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.usermanager.UserComparator;
@@ -81,6 +85,7 @@
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.LIST;
import org.apache.clerezza.rdf.ontologies.PERMISSION;
+import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.utils.RdfList;
@@ -89,20 +94,20 @@
import org.apache.clerezza.utils.customproperty.ontology.CUSTOMPROPERTY;
import org.apache.clerezza.web.fileserver.BundlePathNode;
import org.apache.clerezza.web.fileserver.FileServer;
+import org.apache.felix.scr.annotations.Services;
import org.wymiwyg.commons.util.dirbrowser.PathNode;
/**
- * @author koersgen, hasan
+ * @author koersgen, hasan, tio
*/
@Component(metatype=true)
-@Service(value=Object.class)
-@Properties({@Property(name="javax.ws.rs", boolValue=true),
- @Property(name="org.apache.clerezza.platform.dashboard.visible", boolValue=true)})
+@Services({
+ @Service(value=Object.class),
+ @Service(value=GlobalMenuItemsProvider.class)
+})
+@Property(name="javax.ws.rs", boolValue=true)
@Path("/admin/user-manager")
-public class UserManagerWeb {
-
- @Reference
- private DashBoard dashBoard;
+public class UserManagerWeb implements GlobalMenuItemsProvider {
@Reference(target=SystemConfig.SYSTEM_GRAPH_FILTER)
private MGraph systemGraph;
@@ -119,24 +124,6 @@
@Reference
private CustomProperty customPropertyManager;
- /**
- * Service property
- */
- @Property(value="User Manager", description="Specifies the label of the button.")
- private static final String DASHBOARD_LABEL = "dashboardLabel";
-
- /**
- * Service property
- */
- @Property(intValue=3, description="Specifies the order")
- private static final String DASHBOARD_MENU_ORDER = "dashBoardMenuOrder";
-
- /**
- * Service property
- */
- @Property(value="Main-Modules", description="Specifies the the group label")
- private static final String DASHBOARD_GROUP_LABEL = "dashBoardGroupLabel";
-
private final Logger logger = LoggerFactory.getLogger(getClass());
private FileServer fileServer;
@@ -150,49 +137,49 @@
fileServer = new FileServer(pathNode);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"user-overview-template.xhtml").toURI().toString()),
- USERMANAGER.UserOverviewPage, null,
+ USERMANAGER.UserOverviewPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource("add-user-template.xhtml")
- .toURI().toString()), USERMANAGER.AddUserPage, null,
+ .toURI().toString()), USERMANAGER.AddUserPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"user-permission-template.xhtml").toURI().toString()),
- USERMANAGER.UserPermissionPage, null,
+ USERMANAGER.UserPermissionPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource("update-user-template.xhtml")
- .toURI().toString()), USERMANAGER.UpdateUserPage, null,
+ .toURI().toString()), USERMANAGER.UpdateUserPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"custom-property-template.xhtml").toURI().toString()),
- USERMANAGER.CustomFieldPage, null,
+ USERMANAGER.CustomFieldPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"role-overview-template.xhtml").toURI().toString()),
- USERMANAGER.RoleOverviewPage, null,
+ USERMANAGER.RoleOverviewPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"role-permission-template.xhtml").toURI().toString()),
- USERMANAGER.RolePermissionPage, null,
+ USERMANAGER.RolePermissionPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"add-single-property-template.xhtml").toURI()
.toString()), USERMANAGER.SingleCustomPropertyPage,
- null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"add-multiple-property-template.xhtml").toURI()
.toString()), USERMANAGER.MultipleCustomPropertyPage,
- null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager
.registerRenderlet(SeedsnipeRenderlet.class.getName(),
new UriRef(getClass().getResource(
@@ -261,6 +248,7 @@
GraphNode result = new GraphNode(userOverviewPage, unionGraph);
result.addProperty(RDF.type, USERMANAGER.UserOverviewPage);
+ result.addProperty(RDF.type, PLATFORM.HeadedPage);
result.addProperty(LIST.predecessor, new UriRef(uriInfo
.getAbsolutePath().toString()
+ "?from=" + prevFrom + "&to=" + from));
@@ -273,7 +261,8 @@
.createTypedLiteral(to));
result.addProperty(LIST.length, LiteralFactory.getInstance()
.createTypedLiteral(sortedSet.size()));
- return dashBoard.createGraphNodeWithDashBoardMenu(userOverviewPage, unionGraph);
+
+ return result;
}
@GET
@@ -287,6 +276,8 @@
resultGraph.add(new TripleImpl(addUserPage, RDF.type,
USERMANAGER.AddUserPage));
+ resultGraph.add(new TripleImpl(addUserPage, RDF.type,
+ PLATFORM.HeadedPage));
Iterator<NonLiteral> roles = userManager.getRoles();
while (roles.hasNext()) {
@@ -302,8 +293,9 @@
CUSTOMPROPERTY.customfield, formFields.next()
.getSubject()));
}
-
- return dashBoard.createGraphNodeWithDashBoardMenu(addUserPage, new UnionMGraph(
+
+
+ return new GraphNode(addUserPage, new UnionMGraph(
resultGraph, systemGraph, contentGraph));
}
@@ -507,7 +499,6 @@
* show page to manage user permissionEntries
*/
@GET
- @Produces("text/html")
@Path("manage-user-permissions")
public GraphNode manageUserPermissions(
@QueryParam(value = "userName") String userName,
@@ -518,6 +509,8 @@
MGraph resultGraph = new SimpleMGraph();
NonLiteral userPermissionPage = new BNode();
resultGraph.add(new TripleImpl(userPermissionPage, RDF.type,
+ PLATFORM.HeadedPage));
+ resultGraph.add(new TripleImpl(userPermissionPage, RDF.type,
USERMANAGER.UserPermissionPage));
NonLiteral user = userManager.getUserByName(userName);
@@ -592,7 +585,8 @@
NonLiteral updateUserPage = new BNode();
resultGraph.add(new TripleImpl(updateUserPage, RDF.type,
USERMANAGER.UpdateUserPage));
-
+ resultGraph.add(new TripleImpl(updateUserPage, RDF.type,
+ PLATFORM.HeadedPage));
Iterator<NonLiteral> roles = userManager.getRoles();
while (roles.hasNext()) {
resultGraph.add(new TripleImpl(updateUserPage,
@@ -629,7 +623,7 @@
CUSTOMPROPERTY.actualvalues, value));
}
}
- return dashBoard.createGraphNodeWithDashBoardMenu(updateUserPage,
+ return new GraphNode(updateUserPage,
new UnionMGraph(resultGraph, systemGraph, contentGraph));
}
throw new WebApplicationException(Response.status(Status.NOT_FOUND)
@@ -679,6 +673,8 @@
NonLiteral roleOverviewPage = new BNode();
resultGraph.add(new TripleImpl(roleOverviewPage, RDF.type,
USERMANAGER.RoleOverviewPage));
+ resultGraph.add(new TripleImpl(roleOverviewPage, RDF.type,
+ PLATFORM.HeadedPage));
Iterator<NonLiteral> roles = userManager.getRoles();
@@ -687,7 +683,7 @@
roles.next()));
}
- return dashBoard.createGraphNodeWithDashBoardMenu(roleOverviewPage,
+ return new GraphNode(roleOverviewPage,
new UnionMGraph(resultGraph, systemGraph));
}
@@ -758,6 +754,8 @@
MGraph resultGraph = new SimpleMGraph();
NonLiteral rolePermissionPage = new BNode();
resultGraph.add(new TripleImpl(rolePermissionPage, RDF.type,
+ PLATFORM.HeadedPage));
+ resultGraph.add(new TripleImpl(rolePermissionPage, RDF.type,
USERMANAGER.RolePermissionPage));
NonLiteral role = userManager.getRoleByTitle(title);
@@ -825,9 +823,12 @@
NonLiteral node = new BNode();
resultGraph.add(new TripleImpl(node, RDF.type,
USERMANAGER.SingleCustomPropertyPage));
+ resultGraph.add(new TripleImpl(node, RDF.type,
+ PLATFORM.HeadedPage));
+
resultGraph.add(new TripleImpl(node, USERMANAGER.role,
new PlainLiteralImpl(role)));
- return dashBoard.createGraphNodeWithDashBoardMenu(node, resultGraph);
+ return new GraphNode(node, resultGraph);
}
@GET
@@ -838,9 +839,12 @@
NonLiteral node = new BNode();
resultGraph.add(new TripleImpl(node, RDF.type,
USERMANAGER.MultipleCustomPropertyPage));
+ resultGraph.add(new TripleImpl(node, RDF.type,
+ PLATFORM.HeadedPage));
+
resultGraph.add(new TripleImpl(node, USERMANAGER.role,
new PlainLiteralImpl(role)));
- return dashBoard.createGraphNodeWithDashBoardMenu(node, resultGraph);
+ return new GraphNode(node, resultGraph);
}
@POST
@@ -902,6 +906,8 @@
USERMANAGER.role, new PlainLiteralImpl(role)));
resultGraph.add(new TripleImpl(propertyManagementPage, RDF.type,
USERMANAGER.CustomFieldPage));
+ resultGraph.add(new TripleImpl(propertyManagementPage, RDF.type,
+ PLATFORM.HeadedPage));
ArrayList<NonLiteral> customfields = customPropertyManager
.getCustomfieldsOfCollection(customPropertyManager
.getCustomPropertyCollection(PERMISSION.Role, role));
@@ -911,7 +917,7 @@
resultGraph.add(new TripleImpl(propertyManagementPage,
CUSTOMPROPERTY.customfield, customfield));
}
- return dashBoard.createGraphNodeWithDashBoardMenu(propertyManagementPage, new UnionMGraph(
+ return new GraphNode(propertyManagementPage, new UnionMGraph(
resultGraph, contentGraph));
}
@@ -924,12 +930,16 @@
@Path("{path:.+}")
public PathNode getStaticFile(@PathParam("path") String path) {
final PathNode node = fileServer.getNode(path);
- logger.info("Serving static {}", node);
- try {
- logger.info("Inputstream {}", node.getInputStream());
- } catch (IOException ex) {
- logger.error("Reading static file {}", ex);
- }
return node;
+
+ }
+
+ @Override
+ public Set<GlobalMenuItem> getMenuItems() {
+ Set<GlobalMenuItem> items = new HashSet<GlobalMenuItem>();
+
+ items.add(new GlobalMenuItem("/admin/user-manager/", "UMR", "User Manager", 2,
+ "Main-Modules"));
+ return items;
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,44 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en" id="tx-html">
- <head>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-generic" href="list-roles">Back</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
- <title>Add multiple custom property</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
-
- </head>
- <body id="tx-body">
- <div id="tx-header">
-
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>Add multiple custom property</h1>
- </div>
- </div>
<div id="tx-content">
+ <script type="text/javascript">
+ $(document).ready(function() {{
+ $("#addButton").bind("click", function() {{
+ $("form").submit();
+ }});
+ }});
+ </script>
<div class="tx-list">
- <form action="add-multiple-property" id="add-custom-field-form" method="post"><fieldset>
- <input type="hidden" name="mediaType" value="${umr:role}" />
+ <form action="add-multiple-property" id="add-custom-field-form" method="post"><fieldset>
+ <input type="hidden" name="mediaType" value={res/umr("role")*} />
<label for="multiselect">Select Option</label><br />
<select name="multiselect" size="1">
<option>single</option><option>multiple</option></select><br />
<label for="property">Property</label><br /><input id="property" name="property" size="30" type="text" value="" /> <br />
<label for="label">Label</label><br /><input id="label" name="label" type="text" value="" /><br />
<label for="selectablevalues">Selectable Values</label><br /><textarea cols="20" rows="3" name="selectablevalues"></textarea> Separate values with a comma (,)<br />
- <input type="submit" value="add property"/></fieldset></form>
- <br/>
- <br/>
- <a href="list-roles">back to list roles</a>
+ </fieldset></form>
+
</div>
</div>
-
- </body>
-</html>
+
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,43 +1,29 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-generic" href="list-roles">Back</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
+
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en" id="tx-html">
- <head>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
-
- <title>Add single custom property</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
-
- </head>
- <body id="tx-body">
- <div id="tx-header">
-
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>Add multiple custom property</h1>
- </div>
-
- </div>
<div id="tx-content">
+ <script type="text/javascript">
+ $(document).ready(function() {{
+ $("#addButton").bind("click", function() {{
+ $("form").submit();
+ }});
+ }});
+ </script>
<div class="tx-list">
<form action="add-single-property" id="add-custom-field-form" method="post"><fieldset>
- <input type="hidden" name="title" value="${umr:role}" /><div style="list-style:none;" align="left">
+ <input type="hidden" name="title" value={res/umr("role")*} /><div style="list-style:none;" align="left">
<label for="property">Property</label><br /><input id="property" name="property" size="30" type="text" value="" /><br />
<label for="label">Label</label><br /><input id="label" name="label" type="text" value="" /><br />
<label for="length">Length</label><br /><input id="length" name="length" type="text" value="" /><br />
- <input type="submit" value="add field" />
</div></fieldset></form>
- <br/>
- <br/>
- <a href="list-roles">back to list roles</a>
</div>
- </div>
-
- </body>
-</html>
+ </div>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,45 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- <title>User Management</title>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
-
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script src="./js/usermanager.js" type="text/javascript"></script>
- <script type="text/javascript">
-
- </script>
- </head>
- <body id="tx-body">
- <div id="tx-header">
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>User Manager</h1>
- </div>
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
+
+resultDocModifier.addScriptReference("js/usermanager.js");
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-modify" href="list-users">Cancel</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="javascript:saveUser()">Save</a></li>);
+
+
+
- <div id="tx-module-tabs" class="clearfix">
- <ol id="tx-tabs">
- <li class="tx-active"><a href="#">Users</a></li>
- <li><a href="list-roles">Roles</a></li>
- </ol>
-
- <div id="tx-contextual-buttons">
- <ol>
- <li><a href="list-users" class="tx-button tx-button-remove">Cancel</a></li>
- <li><a href="javascript:saveUser()" class="tx-button tx-button-modify">Save</a></li>
- </ol>
- </div>
- </div >
- </div>
<div id="tx-content">
<div class="tx-panel">
</div>
@@ -55,17 +31,16 @@
<label>Password: <input name="psw" type="password"/></label><br />
<label>User Roles:
<select name="userRoles" id="userRoles" size="3" multiple="multiple">
- ${loop}
- <option>${umr:role/dc:title}</option>
- ${/loop}
+ {for (role <- (res/umr("role"))) yield {
+ <option>{role/dc("title")*}</option>
+ }
+ }
</select>
</label><br />
- <a href="javascript:refreshCustomInformation(null)">add custom information <img src="/style/img/icons/arr-right-dark.png" /></a>
+ <a href="javascript:refreshCustomInformation(null)">add custom information</a>
</fieldset>
</div>
<div id="custominfos" style="float:right; width:250px;"></div>
</form>
</div>
</div>
- </body>
-</html>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-field-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,28 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:cf=http://clerezza.org/2009/05/customfield#}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
-
- <title>User Management</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script src="./js/usermanager.js" type="text/javascript"></script>
- </head>
- <body id="tx-body">
- <div id="tx-header">
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>Custom Field</h1>
- </div>
- </div>
-
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+def cf(s: Any) = new UriRef("http://clerezza.org/2009/05/customfield#" + s)
+
+resultDocModifier.addScriptReference("js/usermanager.js");
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-generic" href="list-roles">Cancel</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="javascript:saveUser()">Save</a></li>);
+
<div id="tx-content">
<div class="tx-list" id="tx-list">
<table>
@@ -31,21 +20,22 @@
<th>URI</th>
<th colspan="2"></th>
</tr>
- ${loop}
+ { for (cstmField <- (res/umr("customField"))) yield {
<tr>
- <td>${umr:customField/cf:presentationLabel}</td>
- <td>${umr:customField/cf:property}</td>
+ <td>{cstmField/cf("presentationLabel")*}</td>
+ <td>{cstmField/cf("property")*}</td>
<td>
<form action="delete-custom-field" method="post">
<div>
- <input name="property" type="hidden" value="${umr:customField/cf:property}" />
- <input name="label" type="hidden" value="${umr:customField/cf:presentationLabel}" />
+ <input name="property" type="hidden" value={cstmField/cf("property")*} />
+ <input name="label" type="hidden" value={cstmField/cf("presentationLabel")*} />
<input type="submit" value="delete"/>
</div>
</form>
</td>
</tr>
- ${/loop}
+ }
+ }
</table>
<div>
<input id="addsinglevaluedfieldbutton" type="button" value="add single-valued field" onclick="showAddSingleValuedFieldForm();" />
@@ -104,11 +94,5 @@
</tr>
</table>
</form>
-
- <br/>
- <br/>
- <a href="list-roles">back to list roles</a>
</div>
</div>
- </body>
-</html>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,28 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:cp=http://clerezza.org/2009/06/custompropery#}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
- <title>User Management</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script src="./js/usermanager.js" type="text/javascript"></script>
- </head>
- <body id="tx-body">
- <div id="tx-header">
-
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>Custom Properties for ${umr:role}</h1>
- </div>
- </div>
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+def cp(s: Any) = new UriRef("http://clerezza.org/2009/06/custompropery#" + s)
+
+resultDocModifier.addScriptReference("js/usermanager.js");
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-generic" href="list-roles">Back</a></li>);
+
+
+
<div id="tx-content">
+ <script type="text/javascript">
+ $(document).ready(function() {{
+ $("#deleteButton").bind("click", function() {{
+ $("form").submit();
+ }});
+ }});
+ </script>
<div class="list">
<table>
<tr align="center">
@@ -30,31 +28,26 @@
<th>URI</th>
<th></th>
</tr>
- ${loop}
+ { for (customfield <- (res/cp("customfield"))) yield {
<tr>
- <td>${cp:customfield/cp:presentationlabel}</td>
- <td>${cp:customfield/cp:property}</td>
+ <td>{customfield/cp("presentationlabel")*}</td>
+ <td>{customfield/cp("property")*}</td>
<td>
<form action="delete-custom-field" method="post">
<div>
- <input name="property" type="hidden" value="${cp:customfield/cp:property}" />
- <input name="role" type="hidden" value="${cp:customfield/umr:role}" />
- <input type="submit" value="delete"/>
+ <input name="property" type="hidden" value={customfield/cp("property")*} />
+ <input name="role" type="hidden" value={customfield/umr("role")*} />
+ <input type="submit" value="delete"/>
</div>
</form>
</td>
</tr>
- ${/loop}
+ }
+ }
</table>
<div>
- <a href="add-single-property?roleTitle=${umr:role}">add single-valued property</a> /
- <a href="add-multiple-property?roleTitle=${umr:role}">add multiple-valued property</a>
+ <a href={"add-single-property?roleTitle="+ (res/umr("role")*)}>add single-valued property</a>/
+ <a href={"add-multiple-property?roleTitle="+ (res/umr("role")*)}>add multiple-valued property</a>
</div>
- <br/>
- <br/>
- <a href="list-roles">back to list roles</a>
</div>
</div>
-
- </body>
-</html>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,82 +1,23 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- <title>User Management</title>
- ${ns:permission=http://clerezza.org/2008/10/permission#}
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
-
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <link rel="stylesheet" type="text/css" href="js/fancybox/jquery.fancybox.css" media="screen" />
-
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script type="text/javascript" src="js/fancybox/jquery.fancybox-1.2.1.pack.js"></script>
- <script type="text/javascript" src="js/customfield.js"></script>
-
- <script type="text/javascript">
- $(document).ready(function() {
- $("a#include").fancybox();
- $("#deleteButton").hide();
- $("#deleteButton").bind("click", function() {
- $(":checkbox:checked").each(function() {
- var title = $(this).val();
- $.ajax({
- type: "POST",
- url: "./delete-role",
- data: "roleTitle="+title,
- success: function(msg) {
- $("#" + title).remove();
- }
- });
-
- });
- });
- $(":checkbox").bind("click", function() {
- buttonVisibilty();
- });
- });
- function buttonVisibilty() {
- if ($(":checkbox:checked").length >= 1) {
- $("#deleteButton").show();
-
- } else if ($(":checkbox:checked").length == 0) {
- $("#deleteButton").hide();
- }
- }
-
-
- </script>
-
- </head>
- <body id="tx-body">
- <div id="tx-header">
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>User Manager</h1>
- </div>
-
-
- <div id="tx-module-tabs" class="clearfix">
- <ol id="tx-tabs">
- <li><a href="list-users">Users</a></li>
- <li class="tx-active"><a href="list-roles">Roles</a></li>
- </ol>
-
- <div id="tx-contextual-buttons">
- <ol>
- <li><a href="#" id="deleteButton" class="tx-button tx-button-remove">Delete</a></li>
- <li><a href="add-role.xhtml" id="addButton" class="tx-button tx-button-create">Create Role</a></li>
+def permission(s: Any) = new UriRef("http://clerezza.org/2008/10/permission#" + s)
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
+
+resultDocModifier.addStyleSheet("js/fancybox/jquery.fancybox.css");
+resultDocModifier.addScriptReference("js/fancybox/jquery.fancybox-1.2.1.pack.js");
+resultDocModifier.addScriptReference("js/customfield.js");
+resultDocModifier.addScriptReference("js/usermanager-role-overview.js");
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove" href="#">Remove</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="add-role.xhtml">Create</a></li>)
+
- </ol>
- </div>
- </div >
- </div>
<div id="tx-content">
<div class="tx-panel">
@@ -100,24 +41,23 @@
</thead>
<tbody>
- ${loop}
- <tr id="${umr:role/dc:title}">
+ {for (role <- (res/umr("role"))) yield {
+ <tr id={role/dc("title")*}>
<td>
- <input type="checkbox" value="${umr:role/dc:title}" />
+ <input type="checkbox" value={role/dc("title")*} />
</td>
- <td>${umr:role/dc:title}</td>
+ <td>{role/dc("title")*}</td>
<td>
- <a href="add-single-property?roleTitle=${umr:role/dc:title}" >add single-valued property</a> /
- <a href="add-multiple-property?roleTitle=${umr:role/dc:title}" >add multiple-valued property</a> /
- <a href="manage-custom-properties?role=${umr:role/dc:title}" >manage customfields</a>
+ <a href={"add-single-property?roleTitle=" + (role/dc("title")*)} >add single-valued property</a> /
+ <a href={"add-multiple-property?roleTitle=" + (role/dc("title")*)} >add multiple-valued property</a> /
+ <a href={"manage-custom-properties?role=" + (role/dc("title")*)} >manage customfields</a>
</td>
- <td><a href="manage-role-permissions?roleTitle=${umr:role/dc:title}">show permissions</a></td>
+ <td><a href={"manage-role-permissions?roleTitle=" + (role/dc("title")*)}>show permissions</a></td>
</tr>
- ${/loop}
+ }
+ }
</tbody>
</table>
</fieldset>
</div>
</div>
- </body>
-</html>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,62 +1,56 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Role Management</title>
- ${ns:permission=http://clerezza.org/2008/10/permission#}
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
-
- <script type="text/javascript">
- function removePermission(form) {
- form.roleTitle.value = '${umr:role/dc:title}';
- form.submit();
- }
- </script>
- </head>
- <body>
-
- <h2>Add new Permission to ${umr:role/dc:title}</h2>
- <form method="post" action="add-role-permissions">
- <div>
- <input type="hidden" name="roleTitle" value="${umr:role/dc:title}" />
- <label for="permEntries">Permission Entry:</label>
- <input type="text" name="permEntries" />
- <input type="submit" value="Add new permission" />
- </div>
- </form>
- <h2>List of Permissions for ${umr:role/dc:title}</h2>
- <br/>
- <br/>
- <div id="tx-content">
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
+def permission(s: Any) = new UriRef("http://clerezza.org/2008/10/permission#" + s)
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-users">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-generic" href="list-roles">Back</a></li>);
+
+
+ <div id="tx-content">
<div class="tx-list">
- <table>
- <thead>
- <tr align="center">
- <th colspan="2">Permission Entry</th>
- </tr>
- </thead>
- <tbody>
- ${loop}
- <tr>
- <td>${umr:permission/permission:javaPermissionEntry}</td>
- <td>
- <form method="post" action="delete-role-permissions">
- <input type="hidden" name="roleTitle" value="" />
- <input type="hidden" name="permEntries" value='${umr:permission/permission:javaPermissionEntry}' />
- <input type="button" onclick="javascript: removePermission(this.parentNode)" value="delete" />
- </form>
- </td>
- </tr>
- ${/loop}
- </tbody>
- </table>
- <a href="list-roles">back</a>
- </div>
+ <script type="text/javascript">
+ function removePermission(form) {{
+ form.roleTitle.value = {"'" + (res/umr("role")/dc("title")*) + "'"};
+ form.submit();
+ }}
+ </script>
+ <h2>Add new Permission to {res/umr("role")/dc("title")*}</h2>
+ <form method="post" action="add-role-permissions">
+ <div>
+ <input type="hidden" name="roleTitle" value={res/umr("role")/dc("title")*} />
+ <label for="permEntries">Permission Entry:</label>
+ <input type="text" name="permEntries" />
+ <input type="submit" value="Add new permission" />
+ </div>
+ </form>
+ <h2>List of Permissions for {res/umr("role")/dc("title")*}</h2>
+ <br/>
+ <table>
+ <thead>
+ <tr align="center">
+ <th colspan="2">Permission Entry</th>
+ </tr>
+ </thead>
+ <tbody>
+ {for (perm <- (res/umr("permission"))) yield {
+ <tr>
+ <td>{perm/permission("javaPermissionEntry")*}</td>
+ <td>
+ <form method="post" action="delete-role-permissions">
+ <input type="hidden" name="roleTitle" value="" />
+ <input type="hidden" name="permEntries" value={perm/permission("javaPermissionEntry")*} />
+ <input type="button" onclick="javascript: removePermission(this.parentNode)" value="delete" />
+ </form>
+ </td>
+ </tr>
+ }
+ }
+ </tbody>
+ </table>
</div>
-
- </body>
-</html>
\ No newline at end of file
+ </div>
\ No newline at end of file
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-overview.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-overview.js?rev=897704&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-overview.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-overview.js Sun Jan 10 21:04:40 2010
@@ -0,0 +1,41 @@
+$(document).ready(function() {
+ $("a#include").fancybox();
+ $("#deleteButton").hide();
+ $("#editButton").hide();
+ $("#deleteButton").bind("click", function() {
+ $(":checkbox:checked").each(function() {
+ var name = $(this).val();
+ $.ajax({
+ type: "POST",
+ url: "./delete-user",
+ data: "userName="+name,
+ success: function(msg) {
+ $("#" + name).remove();
+ }
+ });
+
+ });
+ });
+ $("#editButton").bind("click", function() {
+ $(":checkbox:checked").each(function() {
+ document.location = "update-user?userName=" + $(this).val();
+ });
+
+ });
+ $(":checkbox").bind("click", function() {
+ buttonVisibilty();
+ });
+});
+function buttonVisibilty() {
+ if ($(":checkbox:checked").length == 1) {
+ $("#deleteButton").show();
+ $("#editButton").show();
+ }
+ if ($(":checkbox:checked").length > 1) {
+ $("#deleteButton").show();
+ $("#editButton").hide();
+ } else if ($(":checkbox:checked").length == 0) {
+ $("#deleteButton").hide();
+ $("#editButton").hide();
+ }
+}
\ No newline at end of file
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js?rev=897704&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js Sun Jan 10 21:04:40 2010
@@ -0,0 +1,29 @@
+$(document).ready(function() {
+ $("a#include").fancybox();
+ $("#deleteButton").hide();
+ $("#deleteButton").bind("click", function() {
+ $(":checkbox:checked").each(function() {
+ var title = $(this).val();
+ $.ajax({
+ type: "POST",
+ url: "./delete-role",
+ data: "roleTitle="+title,
+ success: function(msg) {
+ $("#" + title).remove();
+ }
+ });
+
+ });
+ });
+ $(":checkbox").bind("click", function() {
+ buttonVisibilty();
+ });
+});
+function buttonVisibilty() {
+ if ($(":checkbox:checked").length >= 1) {
+ $("#deleteButton").show();
+
+ } else if ($(":checkbox:checked").length == 0) {
+ $("#deleteButton").hide();
+ }
+}
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,96 +1,66 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- <title>User Management</title>
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- ${ns:foaf=http://xmlns.com/foaf/0.1/}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- ${ns:osgi=http://clerezza.org/2008/11/osgi#}
- ${ns:permission=http://clerezza.org/2008/10/permission#}
- ${ns:sioc=http://rdfs.org/sioc/ns#}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
-
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script src="./js/usermanager.js" type="text/javascript"></script>
- <script type="text/javascript">
- $(document).ready(function() {
- refreshCustomInformation('${if umr:user/foaf:name}${umr:user/foaf:name}${/if}');
-
- $("#userRoles option").each(function() {
- $(this).bind("click", function() {
- refreshCustomInformation('${if umr:user/foaf:name}${umr:user/foaf:name}${/if}');
- });
- });
- });
- var userRoles = new Array();
- ${loop}${loop}
- userRoles.push('${umr:user/sioc:has_function/dc:title}');
- ${/loop}${/loop}
-
- $(document).ready(function () {
- $('#userRoles').val(userRoles);
- });
-
- var multiplefield = new Array();
-
- </script>
- </head>
- <body id="tx-body">
- <div id="tx-header">
-
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
- </div>
- <div id="tx-module">
- <h1>User Manager</h1>
- </div>
-
-
- <div id="tx-module-tabs" class="clearfix">
- <ol id="tx-tabs">
- <li class="tx-active"><a href="#">Users</a></li>
- <li><a href="list-roles">Roles</a></li>
- </ol>
-
- <div id="tx-contextual-buttons">
- <ol>
- <li><a href="list-users" class="tx-button tx-button-remove">Cancel</a></li>
- <li><a href="javascript:saveUser()" class="tx-button tx-button-create">Save</a></li>
- </ol>
- </div>
+def foaf(s: Any) = new UriRef("http://xmlns.com/foaf/0.1/" + s)
+def osgi(s: Any) = new UriRef("http://clerezza.org/2008/11/osgi#" + s)
+def permission(s: Any) = new UriRef("http://clerezza.org/2008/10/permission#" + s)
+def sioc(s: Any) = new UriRef("http://rdfs.org/sioc/ns#" + s)
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+
+resultDocModifier.addScriptReference("js/usermanager.js");
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove" href="list-users">Cancel</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
- </div >
- </div>
<div id="tx-content">
- <div class="tx-panel" id="tx-panel">
- </div>
+ <script type="text/javascript">
+ var userRoles = new Array();
+ {var titles = "";
+ for (user <- (res/umr("user"))) yield {
+ for (funct <- (user/sioc("has_function"))) yield {
+ "userRoles.push('" + {funct/dc("title")*} +"');"
+ }
+ }
+ }
+
+ $(document).ready(function() {{
+ $('#userRoles').val(userRoles);
+
+ refreshCustomInformation({"'" + (res/umr("user")/foaf("name")*) + "'"});
+
+ $("#userRoles option").each(function() {{
+ $(this).bind("click", function() {{
+ refreshCustomInformation({"'" + (res/umr("user")/foaf("name")*) + "'"});
+ }});
+ }});
+ }});
+
+ var multiplefield = new Array();
+ </script>
- <div id="list">
+ <div id="tx-list">
<form id="userform" name="userform" action="update-user" method="post" style="width:600px; float:left; margin-right:50px; text-align:right" enctype="multipart/form-data">
<div style="float:left; width:300px;">
<fieldset border="1px">
<legend>Basic User Information</legend>
- <label>Username: <input name="userName" type="text" value="${if umr:user/foaf:name}${umr:user/foaf:name}${/if}"/></label><br />
- <label>Email: <input name="email" type="text" value="${if umr:user/foaf:mbox}${umr:user/foaf:mbox}${/if}"/></label><br />
- <label>Path Prefix: <input name="pathPrefix" type="text" value="${if umr:user/osgi:agent_path_prefix}${umr:user/osgi:agent_path_prefix}${/if}"/></label><br />
+ <label>Username: <input name="userName" type="text" value={res/umr("user")/foaf("name")*}/></label><br />
+ <label>Email: <input name="email" type="text" value={res/umr("user")/foaf("mbox")*}/></label><br />
+ <label>Path Prefix: <input name="pathPrefix" type="text" value={res/umr("user")/osgi("agent_path_prefix")*} /></label><br />
<label>User Roles:
<select name="userRoles" id="userRoles" size="3" multiple="multiple">
- ${loop}
- <option value="${umr:role/dc:title}">${umr:role/dc:title}</option>
- ${/loop}
+ {for (role <- (res/umr("role"))) yield {
+ <option value={role/dc("title")*}>{role/dc("title")*}</option>
+ }
+ }
</select>
</label><br /><br />
- <div>Custom information can be added via role manager <a href="list-roles">list roles</a> </div>
- <br />
</fieldset>
</div>
<div id="custominfos" style="float:right; width:250px;"></div>
</form>
</div>
</div>
- </body>
-</html>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-overview-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-overview-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-overview-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-overview-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,143 +1,75 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="tx-html">
- <head>
- <title>User Management</title>
- ${ns:foaf=http://xmlns.com/foaf/0.1/}
- ${ns:osgi=http://clerezza.org/2008/11/osgi#}
- ${ns:permission=http://clerezza.org/2008/10/permission#}
- ${ns:list=http://clerezza.org/2009/04/list#}
- ${ns:sioc=http://rdfs.org/sioc/ns#}
- ${ns:dc=http://purl.org/dc/elements/1.1/}
- ${ns:dhb=http://clerezza.org/2009/06/dashboard#}
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
- <link rel="stylesheet" type="text/css" href="js/fancybox/jquery.fancybox.css" media="screen" />
- <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
- <script src="/jquery/jquery.menu.js" type="text/javascript"></script>
- <script type="text/javascript" src="js/fancybox/jquery.fancybox-1.2.1.pack.js"></script>
-
- <script type="text/javascript">
- $(document).ready(function() {
- $("a#include").fancybox();
- $("#deleteButton").hide();
- $("#editButton").hide();
- $("#deleteButton").bind("click", function() {
- $(":checkbox:checked").each(function() {
- var name = $(this).val();
- $.ajax({
- type: "POST",
- url: "./delete-user",
- data: "userName="+name,
- success: function(msg) {
- $("#" + name).remove();
- }
- });
-
- });
- });
- $("#editButton").bind("click", function() {
- $(":checkbox:checked").each(function() {
- document.location = "update-user?userName=" + $(this).val();
- });
-
- });
- $(":checkbox").bind("click", function() {
- buttonVisibilty();
- });
- });
- function buttonVisibilty() {
- if ($(":checkbox:checked").length == 1) {
- $("#deleteButton").show();
- $("#editButton").show();
- }
- if ($(":checkbox:checked").length > 1) {
- $("#deleteButton").show();
- $("#editButton").hide();
- } else if ($(":checkbox:checked").length == 0) {
- $("#deleteButton").hide();
- $("#editButton").hide();
- }
- }
- </script>
- </head>
- <body id="tx-body">
- <div id="tx-header">
- <div id="tx-system">
- ${render(dhb:includeDashBoardMenu, "naked")}
+def foaf(s: Any) = new UriRef("http://xmlns.com/foaf/0.1/" + s)
+def osgi(s: Any) = new UriRef("http://clerezza.org/2008/11/osgi#" + s)
+def permission(s: Any) = new UriRef("http://clerezza.org/2008/10/permission#" + s)
+def list(s: Any) = new UriRef("http://clerezza.org/2009/04/list#" + s)
+def sioc(s: Any) = new UriRef("http://rdfs.org/sioc/ns#" + s)
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
- </div>
- <div id="tx-module">
- <h1>User Manager</h1>
- </div>
- <div id="tx-module-tabs" class="clearfix">
- <ol id="tx-tabs">
- <li class="tx-active"><a href="#">Users</a></li>
- <li><a href="list-roles">Roles</a></li>
- </ol>
- <div id="tx-contextual-buttons">
- <ol>
- <li><a href="#" id="deleteButton" class="tx-button tx-button-remove">Delete</a></li>
- <li><a href="#" id="editButton" class="tx-button tx-button-modify">Edit</a></li>
- <li><a href="add-user" id="addButton" class="tx-button tx-button-create">Create User</a></li>
+resultDocModifier.addStyleSheet("js/fancybox/jquery.fancybox.css");
+resultDocModifier.addScriptReference("js/fancybox/jquery.fancybox-1.2.1.pack.js");
+resultDocModifier.addScriptReference("js/usermanager-overview.js");
- </ol>
- </div>
- </div >
- </div>
- <div id="tx-content">
- <div class="tx-panel">
- </div>
- <div class="tx-list">
- <fieldset>
- <table>
- <colgroup>
- <col width="40" />
- <col width="40" />
- <col width="40" />
- <col width="120" />
- <col width="150" />
- <col width="100" />
- <col width="100" />
- </colgroup>
- <thead>
- <tr>
- <th colspan="2"><a href="">Name</a></th>
- <th><a href="">Email</a></th>
- <th><a href="">Path Prefix</a></th>
- <th><a href="">Password</a></th>
- <th><a href="">Roles</a></th>
- <th><a href="">Permissions</a></th>
- </tr>
- </thead>
- <tbody>
- ${loop}
- <tr id="${contains/foaf:name}">
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove" href="#">Remove</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-modify" href="#">Edit</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="add-user">Create</a></li>);
+
+<div id="tx-content">
+ <div class="tx-list">
+ <fieldset>
+ <table>
+ <colgroup>
+ <col width="40" />
+ <col width="40" />
+ <col width="40" />
+ <col width="120" />
+ <col width="150" />
+ <col width="100" />
+ <col width="100" />
+ </colgroup>
+ <thead>
+ <tr>
+ <th colspan="2"><a href="">Name</a></th>
+ <th><a href="">Email</a></th>
+ <th><a href="">Path Prefix</a></th>
+ <th><a href="">Password</a></th>
+ <th><a href="">Roles</a></th>
+ <th><a href="">Permissions</a></th>
+ </tr>
+ </thead>
+ <tbody>
+ {for (user <- (res!!)) yield {
+ <tr id={user/foaf("name")*}>
<td>
- <input type="checkbox" value="${contains/foaf:name}" />
+ <input type="checkbox" value={user/foaf("name")*} />
</td>
- <td><a href="update-user?userName=${contains/foaf:name}">${contains/foaf:name}</a></td>
- <td>${contains/foaf:mbox}</td>
- <td>${contains/osgi:agent_path_prefix}</td>
- <td>${contains/permission:passwordSha1}</td>
- <td>${loop} ${contains/sioc:has_function/dc:title} ${/loop}</td>
- <td><a href="manage-user-permissions?userName=${contains/foaf:name}">show permissions</a></td>
+ <td><a href={"update-user?userName=" + (user/foaf("name")*)}>{user/foaf("name")*}</a></td>
+ <td>{user/foaf("mbox")*}</td>
+ <td>{user/osgi("agent_path_prefix")*}</td>
+ <td>{user/permission("passwordSha1")*}</td>
+ <td>{for (title <- (user/sioc("has_function"))) yield { title/dc("title")* }}</td>
+ <td><a href={"manage-user-permissions?userName=" + (user/foaf("name")*)}>show permissions</a></td>
</tr>
- ${/loop}
- </tbody>
- </table>
-
- </fieldset>
- </div>
- </div>
- ${if list:indexFrom=""}${else}
- ${if list:indexFrom="0"}${else}<a href="${list:predecessor}">Prev Page</a>
- ${/if}
- ${/if}
- ${if list:indexTo=list:length}${else}<a href="${list:successor}">Next Page</a>
- ${/if}
- </body>
-</html>
-
-
-
-
\ No newline at end of file
+ }}
+ </tbody>
+ </table>
+ </fieldset>
+ </div>
+ {if (!((res/list("indexFrom")*).equals(""))) {
+ if (!((res/list("indexFrom")*).equals("0"))) {
+ <a href={res/list("predecessor")*}>Prev Page</a>
+ } else {
+ <div></div>
+ }
+ } else { <div></div> }
+ if (!((res/list("indexTo")*).equals((res/list("length")*)))) {
+ <a href="${list:successor}">Next Page</a>
+ } else {
+ <div></div>
+ }}
+</div>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml?rev=897704&r1=897703&r2=897704&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml Sun Jan 10 21:04:40 2010
@@ -1,62 +1,60 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>User Management</title>
- ${ns:foaf=http://xmlns.com/foaf/0.1/}
- ${ns:permission=http://clerezza.org/2008/10/permission#}
- ${ns:umr=http://clerezza.org/2009/05/usermanager#}
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+def foaf(s: Any) = new UriRef("http://xmlns.com/foaf/0.1/" + s)
+def permission(s: Any) = new UriRef("http://clerezza.org/2008/10/permission#" + s)
+def umr(s: Any) = new UriRef("http://clerezza.org/2009/05/usermanager#" + s)
+
+resultDocModifier.setTitle("User Manager");
+resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
+
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Users</a></li>);
+resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li><a href="list-roles">Roles</a></li>);
+
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-generic" href="list-users">Back</a></li>);
+
+
- <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
-
- <script type="text/javascript">
- function removePermission(form) {
- form.name.value = '${umr:user/foaf:name}';
- form.submit();
- }
- </script>
- </head>
- <body>
+
- <h2>Add new Permission to ${umr:user/foaf:name}</h2>
- <form method="post" action="add-user-permissions">
- <div>
- <input type="hidden" name="name" value="${umr:user/foaf:name}" />
- <label>Permission Entry:
- <input type="text" name="permEntries" />
- </label>
- <input type="submit" value="Add new permission" />
- </div>
- </form>
- <h2>List of Permissions for ${umr:user/foaf:name}</h2>
- <br/>
- <br/>
<div id="tx-content">
<div class="tx-list">
- <table>
- <thead>
- <tr align="center">
- <th colspan="2">Permission Entry</th>
- </tr>
- </thead>
- <tbody>
- ${loop}
- <tr>
- <td>${umr:permission/permission:javaPermissionEntry}</td>
- <td>
- <form method="post" action="delete-user-permissions">
- <input type="hidden" name="name" value="" />
- <input type="hidden" name="permEntries" value='${umr:permission/permission:javaPermissionEntry}' />
- <input type="button" onclick="javascript: removePermission(this.parentNode)" value="delete" />
- </form>
- </td>
- </tr>
- ${/loop}
- </tbody>
- </table>
- <a href="list-users">back</a>
+ <script type="text/javascript">
+ function removePermission(form) {{
+ form.name.value = {"'" + (res/umr("user")/foaf("name")*) + "'"};
+ form.submit();
+ }}
+ </script>
+ <h2>Add new Permission to {res/umr("user")/foaf("name")*}</h2>
+ <form method="post" action="add-user-permissions">
+ <div>
+ <input type="hidden" name="name" value={res/umr("user")/foaf("name")*} />
+ <label>Permission Entry:
+ <input type="text" name="permEntries" />
+ </label>
+ <input type="submit" value="Add new permission" />
+ </div>
+ </form>
+ <h2>List of Permissions for {res/umr("user")/foaf("name")*}</h2>
+ <br/>
+ <table>
+ <thead>
+ <tr align="center">
+ <th colspan="2">Permission Entry</th>
+ </tr>
+ </thead>
+ <tbody>
+ {for (perm <- (res/umr("permission"))) yield {
+ <tr>
+ <td>{perm/permission("javaPermissionEntry")*}</td>
+ <td>
+ <form method="post" action="delete-user-permissions">
+ <input type="hidden" name="name" value="" />
+ <input type="hidden" name="permEntries" value={perm/permission("javaPermissionEntry")*} />
+ <input type="button" onclick="javascript: removePermission(this.parentNode)" value="delete" />
+ </form>
+ </td>
+ </tr>
+ }
+ }
+ </tbody>
+ </table>
</div>
</div>
- </body>
-</html>
\ No newline at end of file