Author: tmortagne
Date: 2007-11-09 18:10:52 +0100 (Fri, 09 Nov 2007)
New Revision: 5761
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
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/adminspacerights.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/deletegroupmember.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm
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.js
Log:
XWIKI-1780: Improve rights management
Apply Evelina's patch without modifications.
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -63,19 +63,19 @@
<table id="usersandgroupstable">
<tr>
-<td colspan="2" style="width:100%">
+<td style="width:100%">
<table id="specialusersandgroups">
<tr class="theader">
- <td>$msg.get("rightsmanager.specialusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
- <td>$msg.get("rightsmanager.register")</td>
- <td>$msg.get("rightsmanager.admin")</td>
+ <td class="usersorgroupsnames">$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>
+ <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>$msg.get("rightsmanager.program")</td> #end
+ #if($hasPrgr)<td class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="XWikiGuestSpecial">
<td class="suorg">$msg.get("rightsmanager.unregisteredusers")</td>
@@ -101,16 +101,16 @@
<tr><td style="width:100%">
<table class="display">
<thead class="theader">
- <tr><td>$msg.get("rightsmanager.groupsorusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
- <td>$msg.get("rightsmanager.register")</td>
- <td>$msg.get("rightsmanager.admin")</td>
+ <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>$msg.get("rightsmanager.program")</td> #end
+ #if($hasPrgr)<td
class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="table-filters">
<td>
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-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -16,7 +16,7 @@
<table id="groupstable">
<tr><td colspan="2" id="showLimits"></td></tr>
<tr><td style="width: 100%;">
- <table class="display">
+ <table class="display" cellpadding="3">
<thead class="theader">
<tr>
<td>Group Name</td><td>Members</td><td>Manage</td>
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -71,19 +71,18 @@
</div>
<table id="usersandgroupstable">
<tr>
-<td colspan="2" style="width:100%">
+<td style="width:100%">
<table id="specialusersandgroups">
<tr class="theader">
- <td>$msg.get("rightsmanager.specialusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
- <td>$msg.get("rightsmanager.register")</td>
- <td>$msg.get("rightsmanager.admin")</td>
+ <td class="usersorgroupsnames">$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>
+ <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>$msg.get("rightsmanager.program")</td> #end
+ #if($hasPrgr)<td class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="XWikiGuestSpecial">
<td class="suorg">$msg.get("rightsmanager.unregisteredusers")</td>
@@ -91,7 +90,6 @@
<td class="rights" id="tdcomment"></td>
<td class="rights" id="tdedit"></td>
<td class="rights" id="tddelete"></td>
- <td class="rights" id="tdregister"></td>
<td class="rights" id="tdadmin"></td>
#if($hasPrgr)<td class="rights" id="tdprogr"></td> #end
</tr>
@@ -106,22 +104,22 @@
</select> <span id="showLimits"></span>
</td>
</tr>
-<tr><td valign="top" style="width:100%">
- <table border="0" cellpadding="2" cellspacing="0" width="100%"
class="display">
+<tr><td style="width:100%">
+ <table class="display">
<thead class="theader">
- <tr><td>$msg.get("rightsmanager.groupsorusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
+ <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>
## does not have register rights at space level <td
class="rights">Register</td>
- <td>$msg.get("rightsmanager.admin")</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>$msg.get("rightsmanager.program")</td> #end
+ #if($hasPrgr)<td
class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="table-filters">
- <td class="fuorgname">
+ <td>
<input name="name" type="text" class="filter" />
<input name="progr" type="hidden" value="#if($hasPrgr) true
#else false #end" />
<input name="admin" type="hidden" value="true" />
@@ -155,7 +153,6 @@
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>
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-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -18,7 +18,7 @@
<table id="userstable">
<tr><td colspan="2" id="showLimits"></td></tr>
<tr>
- <td style="width:100%;"><table class="display">
+ <td style="width:100%;"><table class="display" cellpadding="3">
<thead class="theader">
<tr><td>User Name</td><td>First Name</td><td>Last
Name</td><td>Manage</td></tr>
<tr id="table-filters">
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -1,4 +1,10 @@
#set($fullname = $request.get("fullname"))
#set($obj = $doc.getObject("XWiki.XWikiGroups", "member", $fullname))
#set($discard = $doc.removeObject($obj))
-#set($discard = $doc.save())
+
+## add a new empty group object so the group does not dissappears
+#if($doc.getObjects("XWiki.XWikiGroups").size() == 0)
+ #set($discard = $doc.newObject("XWiki.XWikiGroups"))
+ added empty group
+#end
+#set($discard = $doc.save())
\ No newline at end of file
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -68,17 +68,17 @@
<table id="usersandgroupstable">
<tr>
-<td colspan="2" style="width:100%">
+<td style="width:100%">
<table id="specialusersandgroups">
<tr class="theader">
- <td>$msg.get("rightsmanager.specialusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
+ <td class="usersorgroupsnames">$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>
+ <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
+ #if($hasPrgr)<td class="rights">$msg.get("rightsmanager.program")</td> #end
</tr>
<tr id="XWikiGuestSpecial">
<td class="suorg">$msg.get("rightsmanager.unregisteredusers")</td>
@@ -102,11 +102,11 @@
<tr><td style="width:100%">
<table class="display">
<thead class="theader">
- <tr><td>$msg.get("rightsmanager.groupsorusers")</td>
- <td>$msg.get("rightsmanager.view")</td>
- <td>$msg.get("rightsmanager.comment")</td>
- <td>$msg.get("rightsmanager.edit")</td>
- <td>$msg.get("rightsmanager.delete")</td>
+ <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>
## 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
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -13,6 +13,11 @@
"offset": $offset,
"rows": [
#foreach( $m in $members )
+ #if($context.user == $m && $doc.fullName == "XWiki.XWikiAdminGroup")
+ #set($grayed = true)
+ #else
+ #set($grayed = false)
+ #end
#set($mdoc = $xwiki.getDocument($m))
#set($wikiname = $mdoc.getWiki())
#if($wikiname != "xwiki" || $wikiname == $context.database) #set($wikiname
= "local") #end
@@ -21,7 +26,8 @@
"fullname" : "$m",
"wikiname" : "$wikiname",
"memberurl" : "$xwiki.getURL($m)",
- "docurl" : "$doc.getURL()"
+ "docurl" : "$doc.getURL()",
+ "grayed" : "$grayed"
}
#end
]}
\ No newline at end of file
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm
2007-11-09 17:10:52 UTC (rev 5761)
@@ -61,6 +61,11 @@
"offset": $offset,
"rows": [
#foreach( $user in $users )
+ #if($context.user == $user.fullName)
+ #set($grayed = true)
+ #else
+ #set($grayed = false)
+ #end
#set($wikiname = $user.getWiki())
#if($wikiname != "xwiki" || $wikiname == $context.database) #set($wikiname
= "local") #end
#if( $velocityCount > 1 ) , #end
@@ -72,7 +77,8 @@
"userurl" : "$xwiki.getURL($user.fullName)",
"usersaveurl" : "$user.getURL("save")",
"userinlineurl" : "$user.getURL("inline", "xpage=edituser")",
- "docurl" : "$xwiki.getURL("XWiki.XWikiUsers", "admin",
"editor=users&space=XWiki")"
+ "docurl" : "$xwiki.getURL("XWiki.XWikiUsers", "admin",
"editor=users&space=XWiki")",
+ "grayed" : "$grayed"
}
#end
]}
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-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css
2007-11-09 17:10:52 UTC (rev 5761)
@@ -40,6 +40,10 @@
padding-right: 10px;
}
+.icon-manageg {
+ padding-right: 10px;
+}
+
#ajax-loader {
margin: 0px;
padding: 0px;
@@ -77,11 +81,11 @@
}
#userstable, #groupstable, #usersandgroupstable, #memberstable {
- width: 100%;
- position: relative;
- padding: 0px;
- margin: 0px;
- left: 8px;
+ width: 100%;
+ position: relative;
+ padding: 0px;
+ margin: 0px;
+ left: 8px;
}
#specialusersandgroups {
@@ -94,13 +98,6 @@
border: 1px solid #d4dee8;
}
-.suorg {
- color: #1f66ab;
- font-weight: bold;
- font-size: 13px;
- padding-left: 10px;
-}
-
#display1 td {
padding-left: 11px;
}
@@ -113,8 +110,10 @@
.rights {
text-align: center;
padding-left: 0px !important;
+ padding-top: 4px;
}
+
.spaceName {
margin-left: 13px;
margin-top: 5px;
@@ -146,8 +145,17 @@
}
#XWikiGuestSpecial {
- background-color: #ACBFD2;
- font-size: 12px;
- font-weight: bold;
+ background-color: #fff;
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/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-09 11:58:42 UTC (rev 5760)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js
2007-11-09 17:10:52 UTC (rev 5761)
@@ -441,7 +441,6 @@
//add new image
var img = document.createElement('img');
img.src = this.images[ state ];
-
this.domNode.appendChild( img );
//add label
if( this.labels[ state ] != '')
@@ -549,12 +548,22 @@
//delete group
var del = document.createElement('img');
- del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
- del.title = '$msg.get("delete")';
- Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname));
- del.className = 'icon-manage';
- manage.appendChild(del);
+
+ if(row.grayed == "true")
+ {
+ del.src = '$xwiki.getSkinFile("icons/rights-manager/clearg.png")';
+ del.className = 'icon-manageg';
+ }
+ else
+ {
+ del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
+ Event.observe(del, 'click', deleteUserOrGroup(i, table, row.fullname));
+ del.className = 'icon-manage';
+ }
+ del.title = '$msg.get("delete")';
+ manage.appendChild(del);
}
+
tr.appendChild(manage);
return tr;
}
@@ -643,10 +652,19 @@
var membermanage = document.createElement("td");
membermanage.className = "manage";
var del = document.createElement('img');
- del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
+
+ if(row.grayed == "true")
+ {
+ del.src = '$xwiki.getSkinFile("icons/rights-manager/clearg.png")';
+ del.className = 'icon-manageg';
+ }
+ else
+ {
+ del.src = '$xwiki.getSkinFile("icons/rights-manager/clear.png")';
+ Event.observe(del, 'click', deleteMember(i, table, row.fullname,
row.docurl));
+ del.className = 'icon-manage';
+ }
del.title = '$msg.get("delete")';
- Event.observe(del, 'click', deleteMember(i, table, row.fullname,
row.docurl));
- del.className = 'icon-manage';
membermanage.appendChild(del);
tr.appendChild(membername);
@@ -682,6 +700,7 @@
else
username.appendChild( document.createTextNode( row.username ) );
+ username.className = "usersorgroupsnames";
tr.appendChild(username);
var view = document.createElement('td');
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
