Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminglobalrights.vm (working copy) @@ -63,19 +63,19 @@ -
+ - - - - - - - + + + + + + + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) - #if($hasPrgr) #end + #if($hasPrgr) #end @@ -101,16 +101,16 @@
$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.register")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.register")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.program")$msg.get("rightsmanager.program")
$msg.get("rightsmanager.unregisteredusers")
- - - - - - - + + + + + + + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) - #if($hasPrgr) #end + #if($hasPrgr) #end
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.register")$msg.get("rightsmanager.admin")
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.register")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.program")$msg.get("rightsmanager.program")
Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/admingroups.vm (working copy) @@ -16,7 +16,7 @@
- +
Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminspacerights.vm (working copy) @@ -71,19 +71,18 @@
Group NameMembersManage
-
+ - - - - - - - + + + + + + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) - #if($hasPrgr) #end + #if($hasPrgr) #end @@ -91,7 +90,6 @@ - #if($hasPrgr) #end @@ -106,22 +104,22 @@   -
$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.register")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.program")$msg.get("rightsmanager.program")
$msg.get("rightsmanager.unregisteredusers")
- +
+ - - - - - + + + + + ## does not have register rights at space level - + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) - #if($hasPrgr) #end + #if($hasPrgr) #end -
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")Register$msg.get("rightsmanager.admin")$msg.get("rightsmanager.admin")$msg.get("rightsmanager.program")$msg.get("rightsmanager.program")
+ @@ -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}"); Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/adminusers.vm (working copy) @@ -18,7 +18,7 @@ -
+
Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/deletegroupmember.vm (working copy) @@ -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 Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/editrights.vm (working copy) @@ -68,17 +68,17 @@
User NameFirst NameLast NameManage
-
+ - - - - - + + + + + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) - #if($hasPrgr) #end + #if($hasPrgr) #end @@ -102,11 +102,11 @@
$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.specialusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.program")$msg.get("rightsmanager.program")
$msg.get("rightsmanager.unregisteredusers")
- - - - - + + + + + ## if global rights and main wiki show programming right column #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki')) #if($hasPrgr) #end Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getgroupmembers.vm (working copy) @@ -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 Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/getusers.vm (working copy) @@ -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 ]} Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.css (working copy) @@ -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 Index: /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js =================================================================== --- /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js (revision 5760) +++ /media/work/XWiki-Work/Eclipse_Workspace_Tests/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/usersandgroups.js (working copy) @@ -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');
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")
$msg.get("rightsmanager.groupsorusers")$msg.get("rightsmanager.view")$msg.get("rightsmanager.comment")$msg.get("rightsmanager.edit")$msg.get("rightsmanager.delete")$msg.get("rightsmanager.program")