taylor 01/07/02 01:02:32
Modified: webapp/WEB-INF/templates/vm/portlets role-browser.vm
role-form.vm user-browser.vm user-form.vm
Log:
completed role and user browsers and forms
Revision Changes Path
1.2 +4 -4
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/role-browser.vm
Index: role-browser.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/role-browser.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- role-browser.vm 2001/06/11 07:02:20 1.1
+++ role-browser.vm 2001/07/02 08:02:27 1.2
@@ -1,11 +1,11 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: role-browser.vm,v 1.1 2001/06/11 07:02:20 taylor Exp $
+@version $Id: role-browser.vm,v 1.2 2001/07/02 08:02:27 taylor Exp $
*#
-#set ( $headings = ["Role Name"] )
+#set ( $headings = ["Role Name", "Actions"] )
<table>
@@ -22,8 +22,8 @@
<tr>
#entryCell ($role.Name)
<td>
- <a
href="$jlink.setPanel("Role").addPathInfo("rolename",$role.Name)">Permissions</a>
- <a
href="$jlink.setPanel("Role").addPathInfo("rolename",$role.Name).addQueryData("mode","delete")">Remove</a>
+ <a
href="$jlink.setPanel("Role").addPathInfo("entityid",$role.Name)">Permissions</a>
+ <a
href="$jlink.setPanel("Role").addPathInfo("entityid",$role.Name).addQueryData("mode","delete")">Remove</a>
</td>
</tr>
#end
1.2 +8 -8
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/role-form.vm
Index: role-form.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/role-form.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- role-form.vm 2001/06/11 07:02:21 1.1
+++ role-form.vm 2001/07/02 08:02:28 1.2
@@ -3,11 +3,10 @@
Display the details of a role.
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: role-form.vm,v 1.1 2001/06/11 07:02:21 taylor Exp $
+@version $Id: role-form.vm,v 1.2 2001/07/02 08:02:28 taylor Exp $
*#
-
-<form method="post" action="$jlink.setPanel("Role
Browser").setAction("portlets.security.RoleUpdateAction")">
+<form method="post" action="$jlink.setPanel("Security Role
Browser").setAction("portlets.security.RoleUpdateAction")">
<div align="left">
<table bgcolor="#ffffff" cellpadding="5">
@@ -29,25 +28,26 @@
#formCell ("Role Name" "name" $!role.Name)
</tr>
<tr>
- <td align="$ui.buttonAlignment" bgcolor="$ui.buttonColor">
+ <td align="$ui.buttonAlignment" bgcolor="$!{skin.TitleBackgroundColor}">
#*
Check for a mode, the update and delete buttons
shouldn't appear when inserting a new user.
*#
- #if ($mode == "modify")
+ #if ($mode == "update")
<input type="submit" name="eventSubmit_doUpdate" value="Update Role"/>
#elseif ($mode == "delete")
<input type="submit" name="eventSubmit_doDelete" value="Confirm
Deletion"/>
#else
<input type="submit" name="eventSubmit_doInsert" value="Add Role"/>
#end
-
- </font>
+ </td>
+ <td>
+ $!msg
</td>
</tr>
</table>
- <input type="hidden" name="rolename" value="$!role.Name"/>
+ <input type="hidden" name="entityid" value="$!role.Name"/>
</div>
</form>
1.2 +5 -5
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/user-browser.vm
Index: user-browser.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/user-browser.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-browser.vm 2001/06/11 07:02:21 1.1
+++ user-browser.vm 2001/07/02 08:02:29 1.2
@@ -1,11 +1,11 @@
#**
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: user-browser.vm,v 1.1 2001/06/11 07:02:21 taylor Exp $
+@version $Id: user-browser.vm,v 1.2 2001/07/02 08:02:29 taylor Exp $
*#
-#set ( $headings = ["Username","Password","First Name", "Last Name", "Email"] )
+#set ( $headings = ["Username","Password","First Name", "Last Name", "Email",
"Actions"] )
<table>
@@ -26,9 +26,9 @@
#entryCell ($!user.LastName)
#entryCell ("<a href=mailto:$!user.Email>$!user.Email</a>")
<td>
- <a
href="$jlink.setPanel("User").addPathInfo("username",$user.UserName).addQueryData("mode","modify")">Edit</a>
- <a
href="$jlink.setPanel("User").addPathInfo("username",$user.UserName).addQueryData("mode","modify")">Roles</a>
- <a
href="$jlink.setPanel("User").addPathInfo("username",$user.UserName).addQueryData("mode","delete")">Remove</a>
+ <a
href="$jlink.setPanel("User").addPathInfo("entityid",$user.UserName).addQueryData("mode","update")">Edit</a>
+ <a
href="$jlink.setPanel("User").addPathInfo("entityid",$user.UserName).addQueryData("mode","user-role")">Roles</a>
+ <a
href="$jlink.setPanel("User").addPathInfo("entityid",$user.UserName).addQueryData("mode","delete")">Remove</a>
</td>
</tr>
#end
1.2 +7 -7
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/user-form.vm
Index: user-form.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/user-form.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-form.vm 2001/06/11 07:02:22 1.1
+++ user-form.vm 2001/07/02 08:02:29 1.2
@@ -3,8 +3,7 @@
Display the details of a user.
@author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
-@version $Id: user-form.vm,v 1.1 2001/06/11 07:02:22 taylor Exp $
-<form method="post"
action="$jlink.setPage("portlets,user-browser.vm").setAction("portlets.security.UserUpdateAction")">
+@version $Id: user-form.vm,v 1.2 2001/07/02 08:02:29 taylor Exp $
*#
<form method="post" action="$jlink.setPanel("User
Browser").setAction("portlets.security.UserUpdateAction")">
@@ -42,25 +41,26 @@
</tr>
<tr>
- <td align="$ui.buttonAlignment" bgcolor="$ui.buttonColor">
+ <td align="$ui.buttonAlignment" bgcolor="$!{skin.TitleBackgroundColor}">
#*
Check for a mode, the update and delete buttons
shouldn't appear when inserting a new user.
*#
- #if ($mode == "modify")
+ #if ($mode == "update")
<input type="submit" name="eventSubmit_doUpdate" value="Update User"/>
#elseif ($mode == "delete")
<input type="submit" name="eventSubmit_doDelete" value="Confirm
Deletion"/>
#else
<input type="submit" name="eventSubmit_doInsert" value="Add User"/>
#end
-
- </font>
+ </td>
+ <td>
+ $!msg
</td>
</tr>
</table>
- <input type="hidden" name="userid" value="$!user.UserId"/>
+ <input type="hidden" name="entityid" value="$!user.UserName"/>
</div>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
