Author: tmortagne
Date: 2007-11-19 19:05:28 +0100 (Mon, 19 Nov 2007)
New Revision: 6024
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminspacerights.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editgroup.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editrights.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/edituser.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getusers.vm
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.css
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.js
Log:
XWIKI-1862: Rights Manager Interface fixed css and xhtml validation
XWIKI-1863: Rights Manager Interface fixed a javascript bug for scrolling in
the ajax table when adding member in group
XWIKI-1864: Rights Manager Interface changed select box to radio buttons when
chosing to display groups or users
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
2007-11-19 18:05:28 UTC (rev 6024)
@@ -915,3 +915,5 @@
rightsmanager.global=Global
rightsmanager.local=Local
rightsmanager.both=Both
+rightsmanager.edituserprofile=For more options to edit this user, please go to
the user's profile
+rightsmanager.userprofile=User Profile
\ No newline at end of file
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -8,24 +8,24 @@
########## display the new interface
#if($interface == "new")
#if($doc.fullName == "XWiki.XWikiPreferences")
-#if($request.editor == "globalrights")
+#if($request.editor == "globalrights")
#set($clsname = "XWiki.XWikiGlobalRights")
-#else
+#else
#set($clsname = "XWiki.XWikiRights")
#end
-#elseif($doc.name == "WebPreferences")
+#elseif($doc.name == "WebPreferences")
#if($request.editor == "spacerights")
#set($clsname = "XWiki.XWikiGlobalRights")
#else
-#set($clsname = "XWiki.XWikiRights")
+#set($clsname = "XWiki.XWikiRights")
#end #end
## url to take the users and groups to display in the ajax-based table
#set($url = "?xpage=getusersandgroups")
-#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
+#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
## get the rights for XWikiGuest
#set($r1 = 0) #set($r2 = 0) #set($r3 = 0) #set($r4 = 0) #set($r5 = 0) #set($r6
= 0) #set($r7 = 0)
-
+
#set($guest = "XWiki.XWikiGuest")
#foreach($obj in $doc.getObjects($clsname)) ## XWiki.XWikiGlobalRights or
XWiki.XWikiRights
#set($pers = "$!obj.getProperty('users').getValue()")
@@ -35,7 +35,7 @@
#else
#set($denys = "$!obj.getProperty('levels').getValue()")
#end
-
+
#if($allows && $allows.indexOf("view") > -1) #set($r1 = 1) #end
#if($allows && $allows.indexOf("comment") > -1) #set($r2 = 1) #end
#if($allows && $allows.indexOf("edit") > -1) #set($r3 = 1) #end
@@ -51,7 +51,7 @@
#if($denys && $denys.indexOf("register") > -1) #set($r5 = 2) #end
#if($denys && $denys.indexOf("admin") > -1) #set($r6 = 2) #end
#if($denys && $denys.indexOf("programming") > -1) #set($r7 = 2) #end
-
+
#if($denys && $denys == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
#if($allows && $allows == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
#end
@@ -61,12 +61,12 @@
<img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..."
title="Loading..." />
</div>
-<table id="usersandgroupstable">
+<table id="usersandgroupstableg">
<tr>
<td style="width:100%">
<table id="specialusersandgroups">
<tr class="theader">
- <td class="usersorgroupsnames">$msg.get("rightsmanager.specialusers")</td>
+ <td>$msg.get("rightsmanager.specialusers")</td>
<td class="rights">$msg.get("rightsmanager.view")</td>
<td class="rights">$msg.get("rightsmanager.comment")</td>
<td class="rights">$msg.get("rightsmanager.edit")</td>
@@ -91,26 +91,26 @@
</td>
</tr>
<tr>
- <td colspan="2" style="padding-top: 10px; padding-bottom: 10px;">
- <select name="uorg" style="width: 130px;">
- <option value="groups" selected="selected">$msg.get("Groups")</option>
- <option value="users">$msg.get("Users")</option>
- </select> <span id="showLimits"></span>
+ <td colspan="2" style="padding-top:10px;">
+ <span id="showLimits"></span>
</td>
</tr>
<tr><td style="width:100%">
<table class="display">
<thead class="theader">
- <tr><td
class="usersorgroupsnames">$msg.get("rightsmanager.groupsorusers")</td>
- <td class="rights">$msg.get("rightsmanager.view")</td>
- <td class="rights">$msg.get("rightsmanager.comment")</td>
- <td class="rights">$msg.get("rightsmanager.edit")</td>
- <td class="rights">$msg.get("rightsmanager.delete")</td>
- <td class="rights">$msg.get("rightsmanager.register")</td>
- <td class="rights">$msg.get("rightsmanager.admin")</td>
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
- #if($hasPrgr)<td
class="rights">$msg.get("rightsmanager.program")</td> #end
+ <tr><td class="usersorgroupsnames">
+ <input type="radio" name="uorg" value="groups" checked="checked"
/>$msg.get("Groups")
+ <input type="radio" name="uorg" value="users"/>$msg.get("Users")
+ </td>
+ <td class="rights">$msg.get("rightsmanager.view")</td>
+ <td class="rights">$msg.get("rightsmanager.comment")</td>
+ <td class="rights">$msg.get("rightsmanager.edit")</td>
+ <td class="rights">$msg.get("rightsmanager.delete")</td>
+ <td class="rights">$msg.get("rightsmanager.register")</td>
+ <td class="rights">$msg.get("rightsmanager.admin")</td>
+ ## if global rights and main wiki show programming right column
+ #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
+ #if($hasPrgr)<td
class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="table-filters">
<td>
@@ -142,18 +142,20 @@
</tr>
</table>
<script type="text/javascript">
- var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstable", displayUsersAndGroups, true);
- var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
"${saveUrl}", "${r1}");
- var chbx2 = new MSCheckbox(document.getElementById('tdcomment'), "comment",
"${saveUrl}", "${r2}");
- var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
"$saveUrl", "${r3}");
- var chbx4 = new MSCheckbox(document.getElementById('tddelete'), "delete",
"${saveUrl}", "${r4}");
- var chbx5 = new MSCheckbox(document.getElementById('tdregister'),
"register", "${saveUrl}", "${r5}");
- var chbx6 = new MSCheckbox(document.getElementById('tdadmin'), "admin",
"${saveUrl}", "${r6}");
- if(document.getElementById('tdprogr')) var chbx7 = new
MSCheckbox(document.getElementById('tdprogr'), "programming", "${saveUrl}",
"${r7}");
+ var saveUrl = "$saveUrl";
+ saveUrl.replace(/&/g, "&");
+ var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstableg", displayUsersAndGroups, true);
+ var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
saveUrl, "${r1}");
+ var chbx2 = new MSCheckbox(document.getElementById('tdcomment'), "comment",
saveUrl, "${r2}");
+ var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
saveUrl, "${r3}");
+ var chbx4 = new MSCheckbox(document.getElementById('tddelete'), "delete",
saveUrl, "${r4}");
+ var chbx5 = new MSCheckbox(document.getElementById('tdregister'),
"register", saveUrl, "${r5}");
+ var chbx6 = new MSCheckbox(document.getElementById('tdadmin'), "admin",
saveUrl, "${r6}");
+ if(document.getElementById('tdprogr')) var chbx7 = new
MSCheckbox(document.getElementById('tdprogr'), "programming", saveUrl, "${r7}");
</script>
######## display the stable interface
-#else
+#else
#set ($classname = "XWiki.XWikiGlobalRights")
#set( $class = $xwiki.getDocument($classname).xWikiClass)
#set( $redirect = "$xwiki.getRequestURL()&editor=rights")
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminspacerights.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminspacerights.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/adminspacerights.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -6,23 +6,23 @@
<div id="xwikieditcontent">
############ display the new interface
-#if($interface == "new")
+#if($interface == "new")
#if($doc.fullName == "XWiki.XWikiPreferences")
-#if($request.editor == "globalrights")
+#if($request.editor == "globalrights")
#set($clsname = "XWiki.XWikiGlobalRights")
#else #set($clsname = "XWiki.XWikiRights") #end
-#elseif($doc.name == "WebPreferences")
+#elseif($doc.name == "WebPreferences")
#if($request.editor == "spacerights") #set($clsname =
"XWiki.XWikiGlobalRights")
#else #set($clsname = "XWiki.XWikiRights") #end
#end
### url to get the users and groups for the ajax-table
#set($url = "?xpage=getusersandgroups")
-#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
+#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
## get the rights for XWikiGuest
-#set($r1 = 0) #set($r2 = 0) #set($r3 = 0) #set($r4 = 0) #set($r5 = 0) #set($r6
= 0) #set($r7 = 0)
-
+#set($r1 = 0) #set($r2 = 0) #set($r3 = 0) #set($r4 = 0) #set($r5 = 0) #set($r6
= 0)
+
#set($guest = "XWiki.XWikiGuest")
#foreach($obj in $doc.getObjects($clsname)) ## XWiki.XWikiGlobalRights or
XWiki.XWikiRights
#set($pers = "$!obj.getProperty('users').getValue()")
@@ -33,14 +33,13 @@
#else
#set($denys = "$!obj.getProperty('levels').getValue()")
#end
-
+
#if($allows && $allows.indexOf("view") > -1) #set($r1 = 1) #end
#if($allows && $allows.indexOf("comment") > -1) #set($r2 = 1) #end
#if($allows && $allows.indexOf("edit") > -1) #set($r3 = 1) #end
#if($allows && $allows.indexOf("delete") > -1) #set($r4 = 1) #end
#if($allows && $allows.indexOf("register") > -1) #set($r5 = 1) #end
#if($allows && $allows.indexOf("admin") > -1) #set($r6 = 1) #end
- #if($allows && $allows.indexOf("programming") > -1) #set($r7 = 1) #end
#if($denys && $denys.indexOf("view") > -1) #set($r1 = 2) #end
#if($denys && $denys.indexOf("comment") > -1) #set($r2 = 2) #end
@@ -48,10 +47,9 @@
#if($denys && $denys.indexOf("delete") > -1) #set($r4 = 2) #end
#if($denys && $denys.indexOf("register") > -1) #set($r5 = 2) #end
#if($denys && $denys.indexOf("admin") > -1) #set($r6 = 2) #end
- #if($denys && $denys.indexOf("programming") > -1) #set($r7 = 2) #end
-
- #if($denys && $denys == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
- #if($allows && $allows == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
+
+ #if($denys && $denys == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #end
+ #if($allows && $allows == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #end
#end
#end
@@ -61,7 +59,7 @@
<div class="spaceName">$msg.get("editrightsforspace"):
<strong><em>$space</em></strong>
<select name="space" style="width: 130px;" class="filter"
onchange="location='?editor=spacerights&global=1&space='+this.value;">
<option value="" label="">---</option>
- #foreach($spaceitem in $xwiki.spaces)
+ #foreach($spaceitem in $xwiki.spaces)
## display only the spaces where has admin rights
#if($xwiki.hasAccessLevel("admin", $context.user,
"${spaceitem}.WebPreferences"))
<option value="$spaceitem" label="$spaceitem">$spaceitem</option>
@@ -69,7 +67,7 @@
#end
</select>
</div>
-<table id="usersandgroupstable">
+<table id="usersandgroupstables">
<tr>
<td style="width:100%">
<table id="specialusersandgroups">
@@ -80,9 +78,6 @@
<td class="rights">$msg.get("rightsmanager.edit")</td>
<td class="rights">$msg.get("rightsmanager.delete")</td>
<td class="rights">$msg.get("rightsmanager.admin")</td>
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
- #if($hasPrgr)<td class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="XWikiGuestSpecial">
<td class="suorg">$msg.get("rightsmanager.unregisteredusers")</td>
@@ -91,37 +86,32 @@
<td class="rights" id="tdedit"></td>
<td class="rights" id="tddelete"></td>
<td class="rights" id="tdadmin"></td>
- #if($hasPrgr)<td class="rights" id="tdprogr"></td> #end
</tr>
</table>
</td>
</tr>
<tr>
- <td colspan="2" style="padding-top: 10px; padding-bottom: 10px;">
- <select name="uorg" style="width: 130px;">
- <option value="groups" selected="selected">Groups</option>
- <option value="users">Users</option>
- </select> <span id="showLimits"></span>
+ <td colspan="2" style="padding-top:10px;">
+ <span id="showLimits"></span>
</td>
</tr>
<tr><td style="width:100%">
<table class="display">
<thead class="theader">
- <tr><td
class="usersorgroupsnames">$msg.get("rightsmanager.groupsorusers")</td>
+ <tr><td class="usersorgroupsnames">
+ <input type="radio" name="uorg" value="groups" checked="checked"
/>$msg.get("Groups")
+ <input type="radio" name="uorg" value="users"/>$msg.get("Users")</td>
<td class="rights">$msg.get("rightsmanager.view")</td>
<td class="rights">$msg.get("rightsmanager.comment")</td>
<td class="rights">$msg.get("rightsmanager.edit")</td>
<td class="rights">$msg.get("rightsmanager.delete")</td>
- ## does not have register rights at space level <td
class="rights">Register</td>
+ ## does not have register rights at space level
<td class="rights">$msg.get("rightsmanager.admin")</td>
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
- #if($hasPrgr)<td
class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="table-filters">
<td>
<input name="name" type="text" class="filter" />
- <input name="progr" type="hidden" value="#if($hasPrgr) true
#else false #end" />
+ <input name="progr" type="hidden" value="#if($hasPrgr) true
#else false #end" />
<input name="admin" type="hidden" value="true" />
<input name="reg" type="hidden" value="false" />
<input name="clsname" type="hidden" value="$clsname" />
@@ -134,8 +124,8 @@
<option value="local"
selected="selected">$msg.get("rightsmanager.local")</option>
<option
value="global">$msg.get("rightsmanager.global")</option>
<option value="both">$msg.get("rightsmanager.both")</option>
- </select>
- #else <input type="hidden" value="local" name="wiki" /> #end
+ </select>
+ #else <input type="hidden" value="local" name="wiki" />
#end
</td>
</tr>
</thead>
@@ -148,13 +138,14 @@
</tr>
</table>
<script type="text/javascript">
- var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstable", displayUsersAndGroups, true);
- var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
"${saveUrl}", "${r1}");
- var chbx2 = new MSCheckbox(document.getElementById('tdcomment'),
"comment", "${saveUrl}", "${r2}");
- var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
"$saveUrl", "${r3}");
- var chbx4 = new MSCheckbox(document.getElementById('tddelete'),
"delete", "${saveUrl}", "${r4}");
- var chbx6 = new MSCheckbox(document.getElementById('tdadmin'),
"admin", "${saveUrl}", "${r6}");
- if(document.getElementById('tdprogr')) var chbx7 = new
MSCheckbox(document.getElementById('tdprogr'), "programming", "${saveUrl}",
"${r7}");
+ var saveUrl = "$saveUrl";
+ saveUrl.replace(/&/g, "&");
+ var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstables", displayUsersAndGroups, true);
+ var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
saveUrl, "${r1}");
+ var chbx2 = new MSCheckbox(document.getElementById('tdcomment'),
"comment", saveUrl, "${r2}");
+ var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
saveUrl, "${r3}");
+ var chbx4 = new MSCheckbox(document.getElementById('tddelete'),
"delete", saveUrl, "${r4}");
+ var chbx6 = new MSCheckbox(document.getElementById('tdadmin'),
"admin", saveUrl, "${r6}");
</script>
######### display the stable interface
@@ -200,4 +191,4 @@
<div class="bottombuttons">#template("adminactions.vm")</div>
</form>
#end
-</div> ##xwikieditcontent
\ No newline at end of file
+</div> ##xwikieditcontent
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
2007-11-19 18:05:28 UTC (rev 6024)
@@ -8,7 +8,7 @@
background: #EEF3F6 none repeat scroll 0% 50%;
height: 1px;
border-width: 0 1px;
- }
+ }
.roundedlight .b1, .roundedlight .b1b { background: #A9B6C3 none repeat scroll
0% 50%; margin: 0 5px; border-width: 0; }
.roundedlight .b2, .roundedlight .b2b { border-width: 0 2px; margin: 0 3px; }
@@ -137,6 +137,7 @@
text-align: left;
}
+
#close-wrap {
position: relative;
top: 30px;
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editgroup.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editgroup.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editgroup.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -26,11 +26,11 @@
<div id="addNewMember">
<table cellpadding="5" cellspacing="5">
<tr>
- <td><strong>Add a new user </strong></td>
+ <td><strong>Add a new user</strong></td>
<td>
<select name="wiki" onchange="changeWiki(this);">
- <option value="local" selected="selected">Local</option>
- <option value="global">Global</option>
+ <option value="local"
selected="selected">$msg.get("rightsmanager.local")</option>
+ <option value="global">$msg.get("rightsmanager.global")</option>
</select>
</td>
<td>
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editrights.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editrights.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/editrights.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -7,16 +7,16 @@
########## display the new interface
#if($interface == "new")
#if($doc.fullName == "XWiki.XWikiPreferences")
- #if($request.editor == "globalrights")
+ #if($request.editor == "globalrights")
#set($clsname = "XWiki.XWikiGlobalRights")
- #else
+ #else
#set($clsname = "XWiki.XWikiRights")
#end
-#elseif($doc.name == "WebPreferences")
+#elseif($doc.name == "WebPreferences")
#if($request.editor == "spacerights")
#set($clsname = "XWiki.XWikiGlobalRights")
#else
- #set($clsname = "XWiki.XWikiRights")
+ #set($clsname = "XWiki.XWikiRights")
#end
#else
#set($clsname = "XWiki.XWikiRights")
@@ -25,47 +25,41 @@
### url to get the users and groups to display in the ajax-based table
#set($url = "?xpage=getusersandgroups")
-#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
+#set($saveUrl = $doc.getURL("view",
"xpage=saverights&clsname=${clsname}&fullname=XWiki.XWikiGuest&uorg=users"))
## get the rights for XWikiGuest
-#set($r1 = 0) #set($r2 = 0) #set($r3 = 0) #set($r4 = 0) #set($r5 = 0) #set($r6
= 0) #set($r7 = 0)
-
+#set($r1 = 0) #set($r2 = 0) #set($r3 = 0) #set($r4 = 0)
+
#set($guest = "XWiki.XWikiGuest")
#foreach($obj in $doc.getObjects($clsname)) ## XWiki.XWikiGlobalRights or
XWiki.XWikiRights
#set($pers = "$!obj.getProperty('users').getValue()")
-
+
#if($pers != "" && $pers.matches("^(.*,)?${guest}(,.*)?$"))
#if($obj.getProperty('allow').getValue() == 1)
#set($allows = "$!obj.getProperty('levels').getValue()")
#else
#set($denys = "$!obj.getProperty('levels').getValue()")
#end
-
+
#if($allows && $allows.indexOf("view") > -1) #set($r1 = 1) #end
#if($allows && $allows.indexOf("comment") > -1) #set($r2 = 1) #end
#if($allows && $allows.indexOf("edit") > -1) #set($r3 = 1) #end
#if($allows && $allows.indexOf("delete") > -1) #set($r4 = 1) #end
- #if($allows && $allows.indexOf("register") > -1) #set($r5 = 1) #end
- #if($allows && $allows.indexOf("admin") > -1) #set($r6 = 1) #end
- #if($allows && $allows.indexOf("programming") > -1) #set($r7 = 1) #end
#if($denys && $denys.indexOf("view") > -1) #set($r1 = 2) #end
#if($denys && $denys.indexOf("comment") > -1) #set($r2 = 2) #end
#if($denys && $denys.indexOf("edit") > -1) #set($r3 = 2) #end
#if($denys && $denys.indexOf("delete") > -1) #set($r4 = 2) #end
- #if($denys && $denys.indexOf("register") > -1) #set($r5 = 2) #end
- #if($denys && $denys.indexOf("admin") > -1) #set($r6 = 2) #end
- #if($denys && $denys.indexOf("programming") > -1) #set($r7 = 2) #end
-
- #if($denys && $denys == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
- #if($allows && $allows == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #set($r5 = 0) #set($r6 = 0) #set($r7 = 0) #end
+
+ #if($denys && $denys == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #end
+ #if($allows && $allows == "") #set($r1 = 0) #set($r2 = 0) #set($r3 = 0)
#set($r4 = 0) #end
#end
#end
<div id="ajax-loader">Loading...<br />
<img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..."
title="Loading..." />
</div>
-<table id="usersandgroupstable">
+<table id="usersandgroupstabled">
<tr>
<td style="width:100%">
@@ -76,9 +70,6 @@
<td class="rights">$msg.get("rightsmanager.comment")</td>
<td class="rights">$msg.get("rightsmanager.edit")</td>
<td class="rights">$msg.get("rightsmanager.delete")</td>
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
- #if($hasPrgr)<td class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="XWikiGuestSpecial">
<td class="suorg">$msg.get("rightsmanager.unregisteredusers")</td>
@@ -86,30 +77,25 @@
<td class="rights" id="tdcomment"></td>
<td class="rights" id="tdedit"></td>
<td class="rights" id="tddelete"></td>
- #if($hasPrgr)<td class="rights" id="tdprogr"></td> #end
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2" style="padding-top: 10px; padding-bottom: 10px;">
- <select name="uorg" style="width: 130px;">
- <option value="groups" selected="selected">$msg.get("Groups")</option>
- <option value="users">$msg.get("Users")</option>
- </select> <span id="showLimits"></span>
+ <span id="showLimits"></span>
</td>
</tr>
<tr><td style="width:100%">
<table class="display">
<thead class="theader">
- <tr><td
class="usersorgroupsnames">$msg.get("rightsmanager.groupsorusers")</td>
+ <tr><td class="usersorgroupsnames">
+ <input type="radio" name="uorg" value="groups" checked="checked"
/>$msg.get("Groups")
+ <input type="radio" name="uorg" value="users"/>$msg.get("Users")</td>
<td class="rights">$msg.get("rightsmanager.view")</td>
<td class="rights">$msg.get("rightsmanager.comment")</td>
<td class="rights">$msg.get("rightsmanager.edit")</td>
- <td class="rights">$msg.get("rightsmanager.delete")</td>
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' &&
$context.database=='xwiki'))
- #if($hasPrgr)<td>$msg.get("rightsmanager.program")</td> #end
+ <td class="rights">$msg.get("rightsmanager.delete")</td>
</tr>
<tr id="table-filters">
<td>
@@ -141,14 +127,13 @@
</tr>
</table>
<script type="text/javascript">
- var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstable", displayUsersAndGroups, true);
- var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
"${saveUrl}", "${r1}");
- var chbx2 = new MSCheckbox(document.getElementById('tdcomment'),
"comment", "${saveUrl}", "${r2}");
- var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
"$saveUrl", "${r3}");
- var chbx4 = new MSCheckbox(document.getElementById('tddelete'),
"delete", "${saveUrl}", "${r4}");
- ##//var chbx5 = new MSCheckbox(document.getElementById('tdregister'),
"register", "${saveUrl}", "${r5}");
- ##//var chbx6 = new MSCheckbox(document.getElementById('tdadmin'),
"admin", "${saveUrl}", "${r6}");
- if(document.getElementById('tdprogr')) var chbx7 = new
MSCheckbox(document.getElementById('tdprogr'), "programming", "$saveUrl",
"$r7");
+ var saveUrl = "$saveUrl";
+ saveUrl.replace(/&/g, "&");
+ var ta = new ASSTable("$url", 15, "display1", "scrollbar1",
"usersandgroupstabled", displayUsersAndGroups, true);
+ var chbx1 = new MSCheckbox(document.getElementById('tdview'), "view",
saveUrl, "${r1}");
+ var chbx2 = new MSCheckbox(document.getElementById('tdcomment'),
"comment", saveUrl, "${r2}");
+ var chbx3 = new MSCheckbox(document.getElementById('tdedit'), "edit",
saveUrl, "${r3}");
+ var chbx4 = new MSCheckbox(document.getElementById('tddelete'),
"delete", saveUrl, "${r4}");
</script>
############ display the old interface
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/edituser.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/edituser.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/edituser.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -17,6 +17,10 @@
</div>
#end
</form>
+## add link to the complete profile of the currently logged user
+#if($context.user == $doc.getFullName())
+$msg.get("rightsmanager.edituserprofile") <a
href="$doc.getURL()">$msg.get("rightsmanager.userprofile")</a>
+#end
<span class="buttonwrapper"><input class="button" type="submit"
name="formactionsave" value="$msg.get("save")" onclick="
window.lb.lbSaveForm();"/></span>
<span class="buttonwrapper"><input class="button" type="submit"
name="formactioncancel" value="$msg.get("cancel")" onclick="
window.lb.lbHide(); window.lb.lbClearData(); return false;"/></span>
</div>
\ No newline at end of file
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getusers.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getusers.vm
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/getusers.vm
2007-11-19 18:05:28 UTC (rev 6024)
@@ -29,7 +29,7 @@
#set( $discard = $arr.add( "StringProperty" ) ) ## this may be
variable...
#set( $discard = $arr.add( "$value" ) )
#set( $discard = $filterMap.put("$key", $arr ))
- #set( $arr2 = $xwiki.arrayList )
+ #set( $arr2 = $xwiki.arrayList )
#set( $discard = $arr2.add( "$key" ) )
#set( $discard = $arr2.add( "StringProperty" ) )
#set( $discard = $orderList.add( $arr2 ))
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/scripts/lightbox/lightbox.js
2007-11-19 18:05:28 UTC (rev 6024)
@@ -135,11 +135,14 @@
var str = '<div id="lb-bg" class="hidden"></div>' +
'<div id="lb-align" class="hidden">' +
'<div id="lb">' +
- '<div id="lb-top"><span id="lb-close">' +
+ '<div id="lb-top">' +
'<div id="close-wrap">' +
'<div id="lb-close" onclick="window.lb.lbHide();
window.lb.lbClearData(); return false;" title="Cancel and close"> </div>' +
- '</div>' +
- '</span>';
+ '</div>';
+ '<div id="lb-top">' +
+ '<div id="close-wrap">' +
+ '<div id="lb-close" onclick="window.lb.lbHide();
window.lb.lbClearData(); return false;" title="Cancel and close"> </div>' +
+ '</div>';
if(lbtype == "lightrounded") str +=
this.roundedlighttop(lbbgcolor, lbbordercolor);
else if(lbtype == "rounded") str += this.roundedtop(lbbgcolor,
lbbordercolor);
@@ -164,7 +167,7 @@
roundedbottom: function(bgcolor, bordercolor) {
var str = '<div class="rounded">' +
- '<b class="bottom">' +
+ '<b class="bottom" style="padding:0px; margin:0px;">' +
'<b class="b12b" style="background:' + bordercolor +';"></b>' +
'<b class="b11b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
'<b class="b10b" style="background:' + bgcolor + ';
border-color:' + bordercolor + ';"></b>' +
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.css
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-19 18:05:28 UTC (rev 6024)
@@ -79,7 +79,7 @@
padding-left: 10px;
}
-#userstable, #groupstable, #usersandgroupstable, #memberstable {
+#userstable, #groupstable, #usersandgroupstableg, #usersandgroupstables,
#usersandgroupstabled, #memberstable {
width: 100%;
position: relative;
padding: 0px;
@@ -97,10 +97,6 @@
border: 1px solid #d4dee8;
}
-#display1 td {
- padding-left: 11px;
-}
-
.manage {
text-align: center;
width: 15%;
@@ -108,23 +104,33 @@
.hmanage {
width: 15%;
- padding-left: 10px;
+ padding-left: 10px;
}
+
.rights {
text-align: center;
padding-left: 0px !important;
padding-top: 4px;
+ width: 9%;
}
+#usersandgroupstables .rights {
+ width: 12% !important;
+}
+#usersandgroupstabled .rights {
+ width: 15% !important;
+}
+
.spaceName {
margin-left: 13px;
margin-top: 5px;
+ margin-bottom: 5px;
}
#tdAddNewUserOrGroup {
- padding-top: 10px;
+ padding-top: 11px;
}
@@ -153,13 +159,7 @@
color: #000;
}
-.usersorgroupsnames {
- width: 30%;
- padding-top: 4px;
-}
-
.suorg {
- width: 30%;
padding-left: 10px;
padding-top: 4px;
-}
\ No newline at end of file
+}
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.js
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-19 16:41:09 UTC (rev 6023)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-19 18:05:28 UTC (rev 6024)
@@ -30,8 +30,8 @@
if( this.hasFilters )
{
this.filters = this.filter.getFilters();
- if(this.filters != "" && this.filters != undefined)
- url += this.filters;
+ if(this.filters != "" && this.filters != undefined)
+ url += this.filters;
}
var pivot = this;
@@ -48,7 +48,7 @@
onSuccess: function( transport ) {
$('ajax-loader').style.display = "none";
var res = eval( '(' + transport.responseText + ')');
-
+
if(res.totalrows <= res.returnedrows)
pivot.scroller.domNode.style.display = "none";
else
@@ -58,7 +58,7 @@
}
});
},
-
+
updateFetchedRows: function( json )
{
this.json = json;
@@ -66,7 +66,7 @@
for( var i = json.offset; i < json.offset + json.returnedrows; i++)
this.fetchedRows[i] = json.rows[i-json.offset];
},
-
+
clearDisplay: function()
{
var object = this.domNode;
@@ -75,9 +75,9 @@
object.removeChild(object.firstChild);
}
},
-
- displayRows: function( offset, limit ) {
-
+
+ displayRows: function( offset, limit ) {
+
var f = offset + limit - 1;
if(f > this.totalRows) f = this.totalRows;
var off = (this.totalRows > 0 ) ? offset : 0;
@@ -86,19 +86,25 @@
this.clearDisplay();
for( var i = offset; i < (offset + limit); i++)
- {
+ {
var elem = this.getHandler( this.fetchedRows[i], i, this );
this.domNode.appendChild( elem );
}
+ if(this.totalRows < this.limit)
+ {
+ this.scroller.domNode.style.display = "none";
+ }
+ else
+ {
+ this.scroller.domNode.style.display = "block";
var raport = this.totalRows / limit;
- var outheight = this.domNode.parentNode.offsetHeight;
+ var outheight = this.domNode.parentNode.offsetHeight;
// the header?
- var inheight = Math.round(outheight * raport)+10;
+ var inheight = Math.round(outheight * raport) + 10;
this.scroller.domNode.style.height = outheight + "px";
this.scroller.domNode.firstChild.style.height = inheight + "px";
- this.scroller.domNode.style.display = "block";
-
+ }
},
showRows: function( offset, limit )
@@ -113,7 +119,7 @@
buff += 'table is empty so we get all rows';
return buff;
}
-
+
//make a range of required rows
var min = -1;
var max = -1;
@@ -124,28 +130,28 @@
if(min == -1) min = i;
max = i;
}
-
+
//if we don't need any new row
if(min == -1)
{
buff += 'no need to get new rows <br />\n';
this.displayRows( offset, limit );
}
-
+
//we need get new rows
else
{
buff += 'we need to get rows '+min+' to '+ (max+1) +' <br />\n';
this.getRows( min, max - min + 1, offset, limit );
}
- return buff;
+ return buff;
},
deleteAndShiftRows: function(indx)
{
for(i in this.fetchedRows)
{
- if(i >= indx)
+ if(i >= indx)
this.fetchedRows[i] = this.fetchedRows[''+(parseInt(i)+1)];
}
},
@@ -157,11 +163,11 @@
if( this.fetchedRows[i] != undefined )
buf += i+' ';
return buf;
- },
+ },
deleteRow: function( indx )
- {
+ {
this.deleteAndShiftRows(indx);
//compute new refresh offset
@@ -173,85 +179,7 @@
this.totalRows -= 1;
this.showRows(newoffset, this.limit);
this.scroller.refreshScrollbar();
- } /* ,
-
- compareStrings: function( s1, s2 )
- {
-
- s1 = s1.toLowerCase();
- s2 = s2.toLowerCase();
- var l1 = s1.length;
- var l2 = s2.length;
- var lower = (l1 < l2) ? l1 : l2;
-
- for(i = 0; i < lower; i++){
- if(s1.charAt(i) == s2.charAt(i))
- continue;
- else if(s1.charAt(i) < s2.charAt(i))
- return -1;
- else
- return 1;
- }
- return 0;
- },
-
- searchAddPosition: function( start, end, fullname )
- {
- if(start >= end)
- return start;
-
- var pos = Math.floor((start + end) / 2);
- var comp = this.compareStrings(fullname,this.fetchedRows[pos].username);
- if( comp == 0 )
- return pos + 1;
- else if(comp == -1)
- return this.searchAddPosition(start, pos-1, fullname);
- else
- return this.searchAddPosition(pos+1, end, fullname);
- },
-
- getMax: function()
- {
- var max = 0;
- for(i in this.fetchedRows){
- var ii = parseInt(i);
- if(ii > max)
- max = ii;
- }
- return max;
- },
-
- shiftRight: function( poz, max )
- {
- if(max == null)
- max = this.getMax();
- for(i = max; i >= poz; i -= 1)
- this.fetchedRows[i+1] = this.fetchedRows[i];
- },
-
- addRow: function( fullname )
- {
- var max = this.getMax();
- var pos = this.searchAddPosition(0, max, fullname);
- this.shiftRight(pos, max);
- this.fetchedRows[pos] = eval( json );
- var rest = 0;
- var start = pos - Math.round(this.limit / 2);
- if(start < 1 ) {
- start = 1;
- rest = Math.round(this.limit / 2) - pos;
- }
- var end = pos + Math.round(this.limit / 2) + rest;
- if(end > this.totalRows) end = this.totalRows;
- this.showRows(start, end);
- },
-
- createAddHandler: function(pivot)
- {
- return function(){
- //
- }
- } */
+ }
}
////////////////////////////////////////////////////////////////////////
@@ -262,18 +190,18 @@
initialize: function( table, domNode )
{
- this.table = table;
+ this.table = table;
this.domNode = $(domNode);
this.advanceRTG = 1;
- this.timer = null;
+ this.timer = null;
this.linkEvent();
},
-
+
linkEvent: function()
{
Event.observe( this.domNode, 'scroll', this.makeScrollHandler( this ) );
},
-
+
makeScrollHandler: function( pivot )
{
return function()
@@ -281,7 +209,7 @@
pivot.onscroll();
}
},
-
+
computeScroll: function( )
{
var h = $('scrollbar1').scrollHeight - 100;
@@ -291,22 +219,22 @@
if(this.table.totalRows == -1)
var rtg = 1;
else
- var rtg = Math.round(this.table.totalRows * p);
-
+ var rtg = Math.round(this.table.totalRows * p);
+
if( (rtg + this.table.limit) > this.table.totalRows )
rtg = this.table.totalRows - this.table.limit + 1;
-
+
if( rtg < 1 ) rtg = 1;
-
+
return rtg;
},
-
+
applyscroll: function( )
{
this.table.showRows( this.advanceRTG, this.table.limit );
this.timer = null;
},
-
+
//closure
makeTimeoutHandler: function( pivot )
{
@@ -315,11 +243,11 @@
pivot.applyscroll();
}
},
-
+
onscroll: function()
{
- this.advanceRTG = this.computeScroll();
-
+ this.advanceRTG = this.computeScroll();
+
if( this.timer == null )
this.timer = setTimeout( this.makeTimeoutHandler( this ), 800 );
else
@@ -329,16 +257,16 @@
},
refreshScrollbar: function( )
- {
+ {
var raport = this.table.totalRows / this.table.limit;
- var outheight = this.table.domNode.parentNode.offsetHeight;
+ var outheight = this.table.domNode.parentNode.offsetHeight;
//
var inheight = Math.round(outheight * raport);
-
+
this.domNode.style.height = outheight + "px";
this.domNode.firstChild.style.height = inheight + "px";
}
-
+
}
////////////////////////////////////////////////////////////////////////
@@ -352,10 +280,10 @@
this.table = table;
this.filterNode = $(filterNode);
this.filters = new Object();
-
+
this.linkEvents();
},
-
+
makeRefreshHandler: function( pivot )
{
return function()
@@ -363,27 +291,38 @@
pivot.refreshContent();
}
},
-
+
linkEvents : function()
{
var inputs = this.filterNode.getElementsByTagName('input');
var selects = this.filterNode.getElementsByTagName('select');
-
+
for(var i = 0; i < inputs.length; i++)
- Event.observe(inputs[i], 'keyup', this.makeRefreshHandler(this));
-
+ {
+ if(inputs[i].type == "radio")
+ Event.observe(inputs[i], 'click',
this.makeRefreshHandler(this));
+ else
+ Event.observe(inputs[i], 'keyup',
this.makeRefreshHandler(this));
+ }
+
for(var i = 0; i < selects.length; i++)
- Event.observe(selects[i], 'change', this.makeRefreshHandler(this));
+ Event.observe(selects[i], 'change', this.makeRefreshHandler(this));
},
-
-
+
+
getFilters : function()
{
var inputs = this.filterNode.getElementsByTagName('input');
- for(var i = 0; i < inputs.length; i++)
+ for(var i = 0; i < inputs.length; i++)
{
var key = inputs[i].name;
- this.filters[key] = trim(inputs[i].value);
+ if(inputs[i].type == "radio")
+ {
+ if(inputs[i].checked == 1)
+ this.filters[key] = trim(inputs[i].value);
+ }
+ else
+ this.filters[key] = trim(inputs[i].value);
}
var selects = this.filterNode.getElementsByTagName('select');
@@ -391,22 +330,22 @@
{
this.filters[selects[i].name] =
trim(selects[i].options[selects[i].selectedIndex].value);
}
-
+
var filterString = "";
for(key in this.filters)
if(key != "extend" && this.filters[key] != "") filterString += '&' + key +
'=' + this.filters[key];
-
+
return filterString;
},
-
+
refreshContent : function()
{
- this.table.filters = this.getFilters();
+ this.table.filters = this.getFilters();
this.table.totalRows = -1;
this.table.fetchedRows = new Array();
this.table.showRows(1, this.table.limit);
}
-
+
}
/* the class that deals with the filtering in a table */
@@ -435,7 +374,7 @@
draw: function(state)
{
//remove image
- if(this.domNode.childNodes.length > 0)
+ if(this.domNode.childNodes.length > 0)
this.domNode.removeChild( this.domNode.firstChild );
//remove label
if(this.domNode.childNodes.length > 0)
@@ -469,14 +408,14 @@
return function()
{
//put $msg.get() messages!!!!!
-
+
var nxtst = (pivot.state + 1) % pivot.nrstates;
if(pivot.right == "admin" && nxtst == 2)
confirm("You are about to deny the admin right for this user.
Continue?");
else if(pivot.right == "admin" && nxtst == 0)
confirm("You are about to clear the admin right for this user.
Continue?");
pivot.next(); // go to next state
-
+
//compute the complete url
var action = "";
if(pivot.state == 0) action = "clear";
@@ -484,12 +423,12 @@
else action = "deny";
var url = pivot.saveUrl + "&action=" + action + "&right=" + pivot.right;
-
- new Ajax.Request(url,
- {
+
+ new Ajax.Request(url,
+ {
method: 'get',
onSuccess: function() {}
- });
+ });
}
},
@@ -509,11 +448,11 @@
var userinlineurl = row.userinlineurl;
var wikiname = row.wikiname;
var docurl = row.docurl;
-
- var tr = document.createElement('tr');
+
+ var tr = document.createElement('tr');
if(i % 2 == 0) tr.className = "even";
else tr.className = "odd";
-
+
var username = document.createElement('td');
if(wikiname == "local")
{
@@ -524,20 +463,20 @@
}
else
username.appendChild( document.createTextNode( row.username ) );
-
+
tr.appendChild(username);
-
+
var firstname = document.createElement('td');
firstname.appendChild(document.createTextNode(row.firstname) );
tr.appendChild(firstname);
-
+
var lastname = document.createElement('td');
lastname.appendChild(document.createTextNode(row.lastname) );
tr.appendChild(lastname);
-
+
var manage = document.createElement('td');
manage.className = "manage";
-
+
if(wikiname == "local")
{
//edit user
@@ -550,7 +489,7 @@
//delete group
var del = document.createElement('img');
-
+
if(row.grayed == "true")
{
del.src = '$xwiki.getSkinFile("icons/rights-manager/clearg.png")';
@@ -565,7 +504,7 @@
del.title = '$msg.get("delete")';
manage.appendChild(del);
}
-
+
tr.appendChild(manage);
return tr;
}
@@ -577,13 +516,13 @@
var userinlineurl = row.userinlineurl;
var usersaveurl = row.usersaveurl;
var wikiname = row.wikiname;
- var docurl = row.docurl;
-
- var tr = document.createElement('tr');
-
+ var docurl = row.docurl;
+
+ var tr = document.createElement('tr');
+
if(i % 2 == 0) tr.className = "even";
else tr.className = "odd";
-
+
var username = document.createElement('td');
if(wikiname == "local")
{
@@ -596,17 +535,17 @@
username.appendChild( document.createTextNode( row.username ) );
tr.appendChild(username);
-
+
var members = document.createElement('td');
if(wikiname == "local")
members.appendChild(document.createTextNode(row.members));
else
members.appendChild(document.createTextNode("-"));
tr.appendChild(members);
-
+
var manage = document.createElement('td');
manage.className = "manage";
-
+
if(wikiname == "local")
{
//delete group
@@ -628,7 +567,7 @@
}
tr.appendChild(manage);
-
+
return tr;
}
@@ -638,9 +577,9 @@
var tr = document.createElement('tr');
if(i % 2 == 0) tr.className = "even";
else tr.className = "odd";
-
+
var membername = document.createElement("td");
-
+
if(row.wikiname == "local")
{
var a = document.createElement("a");
@@ -650,11 +589,11 @@
}
else
membername.appendChild(document.createTextNode(row.fullname));
-
+
var membermanage = document.createElement("td");
membermanage.className = "manage";
var del = document.createElement('img');
-
+
if(row.grayed == "true")
{
del.src = '$xwiki.getSkinFile("icons/rights-manager/clearg.png")';
@@ -671,26 +610,26 @@
tr.appendChild(membername);
tr.appendChild(membermanage);
-
+
return tr;
}
/** user and groups list element creator **/
function displayUsersAndGroups( row, i, table )
-{
+{
var userurl = row.userurl;
var uorg = table.json.uorg;
var allows = row.allows;
var denys = row.denys;
var saveUrl = "?xpage=saverights&clsname=" + table.json.clsname +
"&fullname=" + row.fullname + "&uorg=" + uorg;
-
+
var objs = new Array(); //array with checkboxes objects
var tr = document.createElement('tr');
-
+
if(i % 2 == 0) tr.className = "even";
else tr.className = "odd";
-
+
var username = document.createElement('td');
if(row.wikiname == "local")
{
@@ -701,7 +640,7 @@
}
else
username.appendChild( document.createTextNode( row.username ) );
-
+
username.className = "usersorgroupsnames";
tr.appendChild(username);
@@ -712,7 +651,7 @@
else if(denys.indexOf("view") >= 0) r = 2;
var chbx1 = new MSCheckbox(view, "view", saveUrl, r);
tr.appendChild(view);
-
+
var comment = document.createElement('td');
comment.className = "rights";
r = 0;
@@ -720,7 +659,7 @@
else if(denys.indexOf("comment") >= 0) r = 2;
var chbx2 = new MSCheckbox(comment, "comment", saveUrl, r);
tr.appendChild(comment);
-
+
var edit = document.createElement('td');
edit.className = "rights";
r = 0;
@@ -728,7 +667,7 @@
else if(denys.indexOf("edit") >= 0) r = 2;
var chbx3 = new MSCheckbox(edit, "edit", saveUrl, r);
tr.appendChild(edit);
-
+
var del = document.createElement('td');
del.className = "rights";
r = 0;
@@ -736,7 +675,7 @@
else if(denys.indexOf("delete") >= 0) r = 2;
var chbx4 = new MSCheckbox(del, "delete", saveUrl, r);
tr.appendChild(del);
-
+
if(table.json.reg == true)
{
var register = document.createElement('td');
@@ -747,7 +686,7 @@
var chbx5 = new MSCheckbox(register, "register", saveUrl, r);
tr.appendChild(register);
}
-
+
if(table.json.admin == true)
{
var admin = document.createElement('td');
@@ -758,7 +697,7 @@
var chbx6 = new MSCheckbox(admin, "admin", saveUrl, r);
tr.appendChild(admin);
}
-
+
if(table.json.progr == true)
{
var progr = document.createElement('td');
@@ -769,13 +708,13 @@
var chbx7 = new MSCheckbox(progr, "programming", saveUrl, r);
tr.appendChild(progr);
}
-
+
return tr;
}
////////////////////////////////////////////////////////////////
-function editUserOrGroup(userinlineurl, usersaveurl, userredirecturl)
+function editUserOrGroup(userinlineurl, usersaveurl, userredirecturl)
{
return function()
{
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
