Author: tmortagne
Date: 2007-11-07 14:32:09 +0100 (Wed, 07 Nov 2007)
New Revision: 5692
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/registeruser.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/uorgsuggest.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
Log:
XWIKI-1780: Improve rights management
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
2007-11-07 12:19:07 UTC (rev 5691)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
2007-11-07 13:32:09 UTC (rev 5692)
@@ -43,8 +43,7 @@
</td>
<td id="buff"></td>
</tr>
-<tr><td colspan="2">
-<br />
+<tr><td colspan="2" id="tdAddNewUserOrGroup">
<a href="#" id="addNewGroup">$msg.get("rightsmanager.addnewgroup")</a>
</td></tr>
</table>
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
2007-11-07 12:19:07 UTC (rev 5691)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
2007-11-07 13:32:09 UTC (rev 5692)
@@ -5,18 +5,7 @@
#set($interface = $xwiki.rightsmanager.defaultUi)
<div id="xwikieditcontent">
-############## display the new interface
-#if($interface == "new")
-## url to get the groups for displaying them in the ajax-based table
-#set($url = "?xpage=getusers")
-<div id="ajax-loader">Loading...<br />#set($formname = "update")
-#set($saveaction = "save")
-
-## set the interface to use from xwiki.cfg
-#set($interface = $xwiki.rightsmanager.defaultUi)
-
-<div id="xwikieditcontent">
############## display the new interface
#if($interface == "new")
## url to get the groups for displaying them in the ajax-based table
@@ -54,71 +43,22 @@
</td>
<td id="buff"></td>
</tr>
- <tr><td colspan="2" id="addNewUser">
- <br/>
-<a href="$xwiki.getURL('XWiki.Register',
'register')">$msg.get("rightsmanager.addnewuser")</a>
-</td></tr>
+ <tr><td colspan="2" id="tdAddNewUserOrGroup">
+ <a href="#" id="addNewUser"
class="addNewUserOrGroup">$msg.get("rightsmanager.addnewuser")</a>
+ </td></tr>
</table>
-
-## #set($registerurl = $xwiki.getURL("XWiki.Register", "register",
"xpage=registeruser"))
-## #set($saveurl = $xwiki.getURL("XWiki.Register", "register"))
-## #set($redirecturl = $doc.getURL("admin", "editor=users&space=XWiki"))
-
- <script type="text/javascript">
- var ta = new ASSTable("$url", 15, "display1", "scrollbar1", "userstable",
displayUsers, true);
- ##// Event.observe($('addNewUser'), "click",
makeAddHandler("$registerurl", "$saveurl", "$redirecturl"));
- </script>
-
-########### display the stable interface
-#else
-<p>$xwiki.parseMessage("editusersredirect")</p>
-<p>$xwiki.parseMessage("editgroupsredirect")</p>
-#end
-</div> ## end of xwikieditcontent
- <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..."
title="Loading..." />
-</div>
-
-<table id="userstable">
-<tr><td colspan="2" id="showLimits"></td></tr>
-<tr>
- <td style="width:100%;"><table class="display">
- <thead class="theader">
- <tr><td>User Name</td><td>First Name</td><td>Last
Name</td><td>Manage</td></tr>
- <tr id="table-filters">
- <td><input name="name" type="text" class="filter"/></td>
- <td><input name="first_name" type="text" class="filter"/></td>
- <td><input name="last_name" type="text" class="filter"/></td>
- <td>#if($context.database != "xwiki") #set($mainwk = false)
#else #set($mainwk = true) #end
- #if(!$mainwk) ## display the combobox only in a local wiki
- <select name="wiki" class="filter">
- <option value="local" selected="selected">Local</option>
- <option value="global">Global</option>
- <option value="both">Both</option>
- </select>
- #else <input name="wiki" type="hidden" value="local" /> #end
- </td>
- </tr>
- </thead>
- <tbody id="display1"><tr><td colspan="4"> </td></tr></tbody>
- </table></td>
- <td valign="top">
- <div id="scrollbar1" class="scrollbar"><div
class="inscrollbar"> </div></div>
- </td>
- <td id="buff"></td>
- </tr>
- <tr><td colspan="2" id="addNewUser">
-<a href="$xwiki.getURL('XWiki.Register',
'register')">$msg.get("rightsmanager.addnewuser")</a>
-</td></tr>
- </table>
-
-## #set($registerurl = $xwiki.getURL("XWiki.Register", "register",
"xpage=registeruser"))
-## #set($saveurl = $xwiki.getURL("XWiki.Register", "register"))
-## #set($redirecturl = $doc.getURL("admin", "editor=users&space=XWiki"))
-
<script type="text/javascript">
var ta = new ASSTable("$url", 15, "display1", "scrollbar1", "userstable",
displayUsers, true);
- ##// Event.observe($('addNewUser'), "click",
makeAddHandler("$registerurl", "$saveurl", "$redirecturl"));
+
#if(!$xwiki.hasAccessLevel("view","XWiki.Registration")||$xwiki.getDocument("XWiki.Registration").isNew())
+ #set($registerurl = $doc.getURL("view", "xpage=registeruser"))
+ #set($saveurl = $doc.getURL("register", "xpage=registeruser"))
+ #set($redirecturl = $doc.getURL("admin",
"editor=users&space=XWiki"))
+ Event.observe($('addNewUser'), "click", makeAddHandler("$registerurl",
"$saveurl", "$redirecturl"));
+ #else
+ ## go to custom registration page
+ $('addNewUser').href = "$xwiki.getURL('XWiki.Registration')";
+ #end
</script>
########### display the stable interface
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/registeruser.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/registeruser.vm
2007-11-07 12:19:07 UTC (rev 5691)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/registeruser.vm
2007-11-07 13:32:09 UTC (rev 5692)
@@ -1,8 +1,7 @@
<div class = "lbcontent">
-#if(!$xwiki.hasAccessLevel("view","XWiki.Registration")||$xwiki.getDocument("XWiki.Registration").isNew())
<h1>$msg.get("Registration")</h1>
#if(!$reg||$reg<0 )
- <p>$msg.get("registerwelcome")</p>
+ <p>$msg.get("registerwelcome")</p>
#end
#if($reg && $reg<=0)
#if($reg==-2)
@@ -61,7 +60,4 @@
</div>
</form>
#end
-#else
-
$xwiki.getDocument("XWiki.Registration").getTranslatedDocument().getRenderedContent()
-#end
</div>
\ No newline at end of file
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/uorgsuggest.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/uorgsuggest.vm
2007-11-07 12:19:07 UTC (rev 5691)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/uorgsuggest.vm
2007-11-07 13:32:09 UTC (rev 5692)
@@ -16,9 +16,9 @@
#if($uorg == "user")
#if($wiki == "local")
- #set($allUsers =
$xwiki.rightsmanager.getAllMatchedLocalUsersNames($filterMap))
+ #set($allUsers =
$xwiki.rightsmanager.usersApi.getAllMatchedLocalUsersNames($filterMap))
#else
- #set($allUsers =
$xwiki.rightsmanager.getAllMatchedGlobalUsersNames($filterMap))
+ #set($allUsers =
$xwiki.rightsmanager.usersApi.getAllMatchedGlobalUsersNames($filterMap))
#end
#if($allUsers.size() > 0)
#foreach($user in $allUsers)
@@ -27,9 +27,9 @@
#end
#else ## groups
#if($wiki == "local")
- #set($allUsers =
$xwiki.rightsmanager.getAllMatchedLocalGroupsNames($filterMap))
+ #set($allUsers =
$xwiki.rightsmanager.groupsApi.getAllMatchedLocalGroupsNames($filterMap))
#else
- #set($allUsers =
$xwiki.rightsmanager.getAllMatchedGlobalGroupsNames($filterMap))
+ #set($allUsers =
$xwiki.rightsmanager.groupsApi.getAllMatchedGlobalGroupsNames($filterMap))
#end
#if($allUsers.size() > 0)
#foreach($user in $allUsers)
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-07 12:19:07 UTC (rev 5691)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-07 13:32:09 UTC (rev 5692)
@@ -102,3 +102,28 @@
margin-left: 13px;
margin-top: 5px;
}
+
+#tdAddNewUserOrGroup {
+ padding-top: 10px;
+}
+
+
+#tdAddNewUserOrGroup a {
+ color: #fff;
+ font-weight: bold;
+ font-size: 12px;
+ text-decoration: none;
+ background-image:
url("$xwiki.getSkinFile('icons/rights-manager/but1.png')");
+ background-repeat: no-repeat !important;
+ display: block;
+ text-align: center;
+ padding-top: 3px;
+ width: 130px;
+ height: 24px;
+}
+
+#errMsg {
+ color: #DD7700;
+ font-size: 12px;
+ font-weight: bold;
+}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
