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/07/14 18:35:46 UTC
svn commit: r964094 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main:
java/org/apache/clerezza/platform/usermanager/webinterface/
resources/org/apache/clerezza/platform/usermanager...
Author: ito
Date: Wed Jul 14 16:35:45 2010
New Revision: 964094
URL: http://svn.apache.org/viewvc?rev=964094&view=rev
Log:
usermanager webinterface customproperties and create user updated
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-custom-property.js
Modified:
incubator/clerezza/trunk/org.apache.clerezza.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.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.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.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.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-user-infos-template.xhtml
incubator/clerezza/trunk/org.apache.clerezza.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.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js
incubator/clerezza/trunk/org.apache.clerezza.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.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.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.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Wed Jul 14 16:35:45 2010
@@ -68,6 +68,7 @@ import org.apache.clerezza.platform.user
import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.usermanager.webinterface.ontology.USERMANAGER;
import org.apache.clerezza.rdf.core.BNode;
+import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
@@ -81,6 +82,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.sparql.ParseException;
+import org.apache.clerezza.rdf.ontologies.DC;
import org.apache.clerezza.rdf.ontologies.DCTERMS;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.LIST;
@@ -155,8 +157,8 @@ public class UserManagerWeb implements G
MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource("add-user-template.xhtml")
- .toURI().toString()), USERMANAGER.AddUserPage, "naked",
- MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ .toURI().toString()),
+ USERMANAGER.AddUserPage, "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"user-permission-template.xhtml").toURI().toString()),
@@ -164,8 +166,8 @@ public class UserManagerWeb implements G
MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
- "update-user-template.xhtml").toURI().toString()), USERMANAGER.UpdateUserPage, "naked",
- MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ "update-user-template.xhtml").toURI().toString()),
+ USERMANAGER.UpdateUserPage, "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
"custom-property-template.xhtml").toURI().toString()),
@@ -183,19 +185,18 @@ public class UserManagerWeb implements G
MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(getClass().getResource(
- "add-single-property-template.xhtml").toURI()
- .toString()), USERMANAGER.SingleCustomPropertyPage,
- "naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
+ "add-single-property-template.xhtml").toURI().toString()),
+ USERMANAGER.SingleCustomPropertyPage,"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,
+ "add-multiple-property-template.xhtml").toURI().toString()),
+ USERMANAGER.MultipleCustomPropertyPage,
"naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
renderletManager
.registerRenderlet(SeedsnipeRenderlet.class.getName(),
new UriRef(getClass().getResource(
- "custom-user-infos-template.xhtml").toURI()
- .toString()),
+ "custom-user-infos-template.xhtml").toURI().toString()),
USERMANAGER.CustomUserInformationPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
@@ -747,9 +748,12 @@ public class UserManagerWeb implements G
PLATFORM.HeadedPage));
GraphNode result = new GraphNode(roleOverviewPage,
- new UnionMGraph(resultGraph, systemGraph));
+ new UnionMGraph(resultGraph, systemGraph, cgProvider.getContentGraph()));
addAvailableRoles(result);
addBaseRoles(result);
+
+
+
return result;
}
@@ -963,7 +967,7 @@ public class UserManagerWeb implements G
@Path("add-multiple-property")
@Produces("text/plain")
public Response addMultipleCustomField(
- @FormParam(value = "mediaType") String title,
+ @FormParam(value = "title") String title,
@FormParam(value = "label") String label,
@FormParam(value = "property") String property,
@FormParam(value = "multiselect") String multiselect,
@@ -1028,7 +1032,7 @@ public class UserManagerWeb implements G
@Path("{path:.+}")
public PathNode getStaticFile(@PathParam("path") String path) {
final PathNode node = fileServer.getNode(path);
- return node;
+ return node;
}
@Override
@@ -1048,7 +1052,9 @@ public class UserManagerWeb implements G
private void addAvailableRoles(GraphNode result) {
Iterator<NonLiteral> roles = userManager.getRoles();
while (roles.hasNext()) {
- result.addProperty(USERMANAGER.role, roles.next());
+ GraphNode role = new GraphNode(roles.next(), systemGraph);
+ result.addProperty(USERMANAGER.role, role.getNode());
+ addCustomPropertiesOfRole(role, result);
}
}
@@ -1058,10 +1064,24 @@ public class UserManagerWeb implements G
try {
Iterator<Triple> baseRoles = systemGraph.filter(null, RDF.type, PERMISSION.BaseRole);
if (baseRoles.hasNext()) {
- result.addProperty(USERMANAGER.role, baseRoles.next().getSubject());
+ GraphNode baseRole = new GraphNode(baseRoles.next().getSubject(), systemGraph);
+ result.addProperty(USERMANAGER.role, baseRole.getNode());
+ addCustomPropertiesOfRole(baseRole, result);
}
} finally {
readLock.unlock();
}
}
+ private void addCustomPropertiesOfRole(GraphNode role, GraphNode result) {
+ Iterator<Literal> titles = role.getLiterals(DC.title);
+ String title = "";
+ if(titles.hasNext()) {
+ title = titles.next().getLexicalForm();
+ }
+ NonLiteral customFieldCollection = customPropertyManager.getCustomPropertyCollection(PERMISSION.Role, title);
+ result.getGraph().add(new TripleImpl((NonLiteral) role.getNode(), USERMANAGER.custominformation,
+ customFieldCollection));
+
+
+ }
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-multiple-property-template.xhtml Wed Jul 14 16:35:45 2010
@@ -6,7 +6,7 @@ resultDocModifier.addNodes2Elem("tx-modu
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 to Overview</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-generic" href={"manage-custom-properties?role=" + (res/umr("role")*)}>Back to Custom Fields</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
<div id="tx-content">
@@ -17,17 +17,46 @@ resultDocModifier.addNodes2Elem("tx-cont
}});
}});
</script>
- <div class="tx-list">
- <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 />
- </fieldset></form>
+ <div class="tx-tree">
+ <div class="tx-edit">
+ <h3 class="tx-edit-header">{"Add Single Value Property to " + (res/umr("role")*)}</h3>
+ <br/>
+ <form action="add-multiple-property" id="add-custom-field-form" method="post"><fieldset>
+ <input type="hidden" name="title" value={res/umr("role")*} />
+ <ol style="display: block;">
- </div>
+
+ <li class="tx-line" id="multiselect" style="background-image: none">
+ <label >Select Option:</label>
+ <span class="tx-item">
+ <select name="multiselect" size="1">
+ <option>single</option>
+ <option>multiple</option>
+ </select>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Property:</label>
+ <span class="tx-item">
+ <input id="property" name="property" size="30" type="text" value="" /> (e.g. http://foo.bar)
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Label:</label>
+ <span class="tx-item">
+ <input id="label" name="label" type="text" value="" />
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none; height: 6em;">
+ <label >Selectable Values:</label>
+ <span class="tx-item">
+ <textarea cols="20" rows="3" name="selectablevalues"></textarea> Separate values with a comma (,)
+ </span>
+ </li>
+ </ol>
+ </fieldset></form>
+
+ </div>
+ </div>
</div>
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-single-property-template.xhtml Wed Jul 14 16:35:45 2010
@@ -6,7 +6,7 @@ resultDocModifier.addNodes2Elem("tx-modu
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 to Overview</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-generic" href={"manage-custom-properties?role=" + (res/umr("role")*)}>Back to Custom Fields</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addButton" class="tx-button tx-button-create" href="#">Save</a></li>);
@@ -18,12 +18,35 @@ resultDocModifier.addNodes2Elem("tx-cont
}});
}});
</script>
- <div class="tx-list">
- <form action="add-single-property" id="add-custom-field-form" method="post"><fieldset>
- <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 />
- </div></fieldset></form>
+
+ <div class="tx-tree">
+ <div class="tx-edit">
+ <h3 class="tx-edit-header">{"Add Single Value Property to " + (res/umr("role")*)}</h3>
+ <br/>
+ <form action="add-single-property" id="add-custom-field-form" method="post"><fieldset>
+ <input type="hidden" name="title" value={res/umr("role")*} />
+ <ol style="display: block;">
+ <li class="tx-line" style="background-image: none">
+ <label >Property:</label>
+ <span class="tx-item">
+ <input type="text" id="property" name="property" size="30" value=""/> (e.g. http://foo.bar)
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Label:</label>
+ <span class="tx-item">
+ <input id="label" name="label" type="text" value="" />
+ </span>
+
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Length:</label>
+ <span class="tx-item">
+ <input id="length" name="length" type="text" value="" /> (e.g. 20)
+ </span>
+ </li>
+ </ol>
+ </fieldset></form>
+ </div>
</div>
</div>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/add-user-template.xhtml Wed Jul 14 16:35:45 2010
@@ -12,35 +12,60 @@ resultDocModifier.addNodes2Elem("tx-modu
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="editButton" class="tx-button tx-button-generic" href="list-users">Back to Overview</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-tree" id="tx-tree">
+ <div class="tx-edit">
+ <h3 class="tx-edit-header">Add new User</h3>
+ <br/>
+ <form id="userform" name="userform" action="add-user" method="post" enctype="multipart/form-data">
+ <fieldset>
+ <ol style="display: block;">
-
+ <li class="tx-line" style="background-image: none">
+ <label >Username:</label>
+ <span class="tx-item">
+ <input name="userName" type="text"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Email:</label>
+ <span class="tx-item">
+ <input name="email" type="text"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Path Prefix:</label>
+ <span class="tx-item">
+ <input name="pathPrefix" type="text"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Password:</label>
+ <span class="tx-item">
+ <input name="psw" type="password"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none; height: 6em;">
+ <label >User Roles:</label>
+ <span class="tx-item">
+ <select name="userRoles" id="userRoles" size="3" multiple="multiple">
+ {for (role <- (res/umr("role"))) yield {
+ <option>{role/dc("title")*}</option>
+ }
+ }
+ </select>
+ </span>
+ </li>
+
- <div id="tx-content">
- <div class="tx-panel">
- </div>
-
- <div class="tx-list" id="tx-list">
- <form id="userform" name="userform" action="add-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"/></label><br />
- <label>Email: <input name="email" type="text"/></label><br />
- <label>Path Prefix: <input name="pathPrefix" type="text"/></label><br />
- <label>Password: <input name="psw" type="password"/></label><br />
- <label>User Roles:
- <select name="userRoles" id="userRoles" size="3" multiple="multiple">
- {for (role <- (res/umr("role"))) yield {
- <option>{role/dc("title")*}</option>
- }
- }
- </select>
- </label><br />
- <a href="javascript:refreshCustomInformation(null)">add custom information</a>
+ </ol>
+ <br/>
+ <br/>
+ <br/>
</fieldset>
- </div>
- <div id="custominfos" style="float:right; width:250px;"></div>
</form>
+ </div>
</div>
</div>
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-property-template.xhtml Wed Jul 14 16:35:45 2010
@@ -1,7 +1,21 @@
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)
+def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
-resultDocModifier.addScriptReference("js/usermanager.js");
+resultDocModifier.addStyleSheet("/yui/2/container/assets/container-core.css");
+
+resultDocModifier.addScriptReference("/yui/2/yahoo-dom-event/yahoo-dom-event.js");
+resultDocModifier.addScriptReference("/yui/2/animation/animation-min.js");
+resultDocModifier.addScriptReference("/yui/2/dragdrop/dragdrop-min.js");
+resultDocModifier.addScriptReference("/yui/2/logger/logger-min.js");
+resultDocModifier.addScriptReference("/yui/2/element/element-min.js");
+resultDocModifier.addScriptReference("/yui/2/container/container-min.js");
+resultDocModifier.addScriptReference("/yui/2/resize/resize-min.js")
+
+resultDocModifier.addScriptReference("/scripts/alert-message.js");
+resultDocModifier.addScriptReference("/scripts/ajax-options.js");
+resultDocModifier.addScriptReference("/scripts/overlay.js");
+resultDocModifier.addScriptReference("js/usermanager-custom-property.js");
resultDocModifier.setTitle("User Manager");
resultDocModifier.addNodes2Elem("tx-module", <h1>User Manager</h1>);
@@ -9,45 +23,45 @@ resultDocModifier.addNodes2Elem("tx-modu
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 to Overview</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="backButton" class="tx-button tx-button-generic" href="list-roles">Back to Overview</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove" href="#">Delete</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addSingleButton" class="tx-button tx-button-create" href="#">Create Single Value Property</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="addMultipleButton" class="tx-button tx-button-create" href="#">Create Multiple Value Property</a></li>);
<div id="tx-content">
- <script type="text/javascript">
- $(document).ready(function() {{
- $("#deleteButton").bind("click", function() {{
- $("form").submit();
- }});
- }});
- </script>
- <div class="list">
- <table>
+ <div class="tx-tree">
+ <div class="tx-edit">
+ <h3>{"Custom Fields of " + (res/umr("role")*)}</h3>
+ <table id={(res/umr("role")*)}>
+ <colgroup>
+ <col width="10" />
+ <col />
+ <col width="200" />
+ <col width="150" />
+ <col width="150" />
+ </colgroup>
<tr align="center">
+ <th></th>
<th>Label</th>
- <th>URI</th>
- <th></th>
+ <th>Uri</th>
+ <th>Max. Characters</th>
+ <th>Select Multiple Values</th>
</tr>
{ for (customfield <- (res/cp("customfield"))) yield {
- <tr>
+ <tr id={customfield/cp("presentationlabel")*}>
+ <td>
+ <input type="checkbox" value={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={customfield/cp("property")*} />
- <input name="role" type="hidden" value={customfield/umr("role")*} />
- <input type="submit" value="delete"/>
- </div>
- </form>
- </td>
+ <td>{customfield/cp("length")*}</td>
+ <td>{if((customfield/cp("multiselectable")*).equals("multiple")){ "true" } else {"false"}}</td>
</tr>
}
}
</table>
- <div>
- <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>
</div>
+ </div>
</div>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-user-infos-template.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-user-infos-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-user-infos-template.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/custom-user-infos-template.xhtml Wed Jul 14 16:35:45 2010
@@ -1,10 +1,11 @@
${ns:umr=http://clerezza.org/2009/05/usermanager#}
${ns:cp=http://clerezza.org/2009/06/custompropery#}
- <fieldset>
- <legend>Custom User Information</legend>
+
${loop}
- <label>${cp:customfield/cp:presentationlabel}
+ <li class="tx-line" style="background-image: none">
+ <label >${cp:customfield/cp:presentationlabel}:</label>
+ <span class="tx-item">
${if cp:customfield/cp:value}
${if cp:customfield/cp:multiselectable = "multiple"}
<select id="${cp:customfield/cp:property}" name="${cp:customfield/cp:property}" size="3" multiple="multiple">
@@ -22,6 +23,7 @@
${else}
<input name="${cp:customfield/cp:property}" type="text" maxlength="${cp:customfield/cp:length}" value="${if cp:customfield/cp:actualvalues}${cp:customfield/cp:actualvalues}${/if}" />
${/if}
- </label><br />
+ </span>
+ </li>
${/loop}
- </fieldset>
+
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-overview-template.xhtml Wed Jul 14 16:35:45 2010
@@ -3,6 +3,7 @@ def umr(s: Any) = new UriRef("http://cle
def dc(s: Any) = new UriRef("http://purl.org/dc/elements/1.1/" + s)
def rdf(s: Any) = new UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#" + s)
def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#" + s)
+def cstm(s: Any) = new UriRef("http://clerezza.org/2009/06/custompropery#" + s)
resultDocModifier.addStyleSheet("/yui/2/container/assets/container-core.css");
@@ -27,6 +28,7 @@ resultDocModifier.addNodes2Elem("tx-modu
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="deleteButton" class="tx-button tx-button-remove tx-inactive" href="#">Delete</a></li>);
resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="showPermissionsButton" class="tx-button tx-button-modify tx-inactive" href="#">Show Permission</a></li>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a id="manageCustomFieldsButton" class="tx-button tx-button-modify tx-inactive" href="#">Manage Custom Fields</a></li>);
<div id="tx-content">
@@ -44,7 +46,7 @@ resultDocModifier.addNodes2Elem("tx-cont
<th></th>
<th><a href="">Name</a></th>
<th><a href="">Description</a></th>
- <th><a href="">Special Properties</a></th>
+ <th><a href="">Custom Fields</a></th>
</tr>
</thead>
<tbody>
@@ -59,10 +61,11 @@ resultDocModifier.addNodes2Elem("tx-cont
</td>
<td>{role/dc("title")*}</td>
<td style="line-height: 1.5em;">{role/rdfs("comment")*}</td>
- <td>
- <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>{
+ for(customProp <- (role/umr("custominformation")/cstm("customfield"))) yield {
+ <span>{(customProp/cstm("presentationlabel")*)}, </span>
+ }
+ }
</td>
</tr>
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/role-permission-template.xhtml Wed Jul 14 16:35:45 2010
@@ -23,8 +23,8 @@ for (perm <- (res/umr("role")/permission
<div id="tx-content">
<div class="tx-tree">
-
- <h2>List of Permissions for role {res/umr("role")/dc("title")*}</h2>
+ <div class="tx-edit">
+ <h3>List of Permissions for role {res/umr("role")/dc("title")*}</h3>
<br/>
<form id="form1">
<input type="hidden" name="roleTitle" value={res/umr("role")/dc("title")*} />
@@ -86,5 +86,6 @@ for (perm <- (res/umr("role")/permission
</form>
<br/>
<br/>
+ </div>
</div>
</div>
\ No newline at end of file
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-custom-property.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-custom-property.js?rev=964094&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-custom-property.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-custom-property.js Wed Jul 14 16:35:45 2010
@@ -0,0 +1,51 @@
+$(document).ready(function() {
+ CustomProperty.initButtons();
+ buttonVisibilty();
+});
+CustomProperty = function(){};
+
+CustomProperty.initButtons = function() {
+
+ $("#deleteButton").bind("click", function() {
+ if(!$(this).hasClass("tx-inactive")){
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked")
+ var counter = 1;
+ activatedCheckBoxes.each(function() {
+ var prop = $(this).val();
+ var tr = $(this).parent().parent();
+ var options = new AjaxOptions("delete-custom-" + counter, "deleting custom property ", function(data) {
+ tr.remove();
+ });
+ options.type = "POST";
+ options.url = "./delete-custom-field";
+ options.data = {"role": $("table").attr("id"), "property": prop};
+ $.ajax(options);
+ counter++;
+
+ });
+ }
+ });
+
+ $("#addSingleButton").bind("click", function() {
+ document.location = "add-single-property?roleTitle=" + $("table").attr("id");
+ });
+ $("#addMultipleButton").bind("click", function() {
+ document.location = "add-multiple-property?roleTitle=" + $("table").attr("id");
+ });
+
+
+ $("input[type=checkbox]").bind("click", function() {
+ buttonVisibilty();
+ });
+}
+
+function buttonVisibilty() {
+ var activatedCheckBoxes = $(".tx-tree input[type=checkbox]:checked").length
+ if (activatedCheckBoxes == 1) {
+ $("#deleteButton").removeClass("tx-inactive");
+ } else if (activatedCheckBoxes > 1) {
+ $("#deleteButton").removeClass("tx-inactive");
+ } else {
+ $("#deleteButton").addClass("tx-inactive");
+ }
+}
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/usermanager-role-overview.js Wed Jul 14 16:35:45 2010
@@ -35,6 +35,15 @@ RoleManager.initButtons = function() {
}
});
+
+ $("#manageCustomFieldsButton").bind("click", function() {
+ if(!$(this).hasClass("tx-inactive")){
+ var activatedCheckBox = $(".tx-tree input[type=checkbox]:checked")
+ document.location = "manage-custom-properties?role=" + activatedCheckBox.val();
+
+ }
+
+ });
$("#saveButton").bind("click", function() {
$("#form1")[0].submit();
});
@@ -50,11 +59,14 @@ function buttonVisibilty() {
if (activatedCheckBoxes == 1) {
$("#deleteButton").removeClass("tx-inactive");
$("#showPermissionsButton").removeClass("tx-inactive");
+ $("#manageCustomFieldsButton").removeClass("tx-inactive");
} else if (activatedCheckBoxes > 1) {
$("#deleteButton").removeClass("tx-inactive");
$("#showPermissionsButton").addClass("tx-inactive");
+ $("#manageCustomFieldsButton").addClass("tx-inactive");
} else {
$("#deleteButton").addClass("tx-inactive");
$("#showPermissionsButton").addClass("tx-inactive");
+ $("#manageCustomFieldsButton").addClass("tx-inactive");
}
}
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/update-user-template.xhtml Wed Jul 14 16:35:45 2010
@@ -42,27 +42,49 @@ resultDocModifier.addNodes2Elem("tx-cont
}});
var multiplefield = new Array();
- </script>
-
- <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={res/umr("user")/platform("userName")*}/></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">
- {for (role <- (res/umr("role"))) yield {
- <option value={role/dc("title")*}>{role/dc("title")*}</option>
- }
- }
- </select>
- </label><br /><br />
- </fieldset>
- </div>
- <div id="custominfos" style="float:right; width:250px;"></div>
+ </script>
+
+
+ <div class="tx-tree" id="tx-tree">
+ <div class="tx-edit">
+ <h3 class="tx-edit-header">Edit User</h3>
+ <br/>
+ <form id="userform" name="userform" action="update-user" method="post" enctype="multipart/form-data">
+ <fieldset>
+ <ol style="display: block;" id="list">
+ <li class="tx-line" style="background-image: none">
+ <label >Username:</label>
+ <span class="tx-item">
+ <input name="userName" type="text" value={res/umr("user")/platform("userName")*}/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Email:</label>
+ <span class="tx-item">
+ <input name="email" type="text" value={(if((res/umr("user")/foaf("mbox")).length > 0) {(res/umr("user")/foaf("mbox")*).substring(7)} else {""})}/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none">
+ <label >Path Prefix:</label>
+ <span class="tx-item">
+ <input name="pathPrefix" type="text" value={res/umr("user")/osgi("agent_path_prefix")*}/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none; height: 6em;">
+ <label >User Roles:</label>
+ <span class="tx-item">
+ <select name="userRoles" id="userRoles" size="3" multiple="multiple">
+ {for (role <- (res/umr("role"))) yield {
+ <option value={role/dc("title")*}>{role/dc("title")*}</option>
+ }
+ }
+ </select>
+ </span>
+ </li>
+ <div id="custominfos"></div>
+ </ol>
+ </fieldset>
</form>
</div>
</div>
+ </div>
Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml?rev=964094&r1=964093&r2=964094&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/user-permission-template.xhtml Wed Jul 14 16:35:45 2010
@@ -32,8 +32,8 @@ for (role <- (res/umr("user")/sioc("has_
<div id="tx-content">
<div class="tx-tree">
-
- <h2>List of Permissions for user {res/umr("user")/platform("userName")*}</h2>
+ <div class="tx-edit">
+ <h3>List of Permissions for user {res/umr("user")/platform("userName")*}</h3>
<br/>
<form id="form1">
<input type="hidden" name="name" value={res/umr("user")/platform("userName")*} />
@@ -113,5 +113,6 @@ for (role <- (res/umr("user")/sioc("has_
</form>
<br/>
<br/>
+ </div>
</div>
</div>