Index: standard/src/main/webapp/skins/albatross/edituser.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/edituser.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/edituser.vm Tue Nov 20 07:40:49 GMT 2007
@@ -17,6 +17,10 @@
#end
+## add link to the complete profile of the currently logged user
+#if($context.user == $doc.getFullName())
+$msg.get("rightsmanager.edituserprofile") $msg.get("rightsmanager.userprofile")
+#end
Index: standard/src/main/webapp/skins/albatross/usersandgroups.js
===================================================================
--- standard/src/main/webapp/skins/albatross/usersandgroups.js (revision 6024)
+++ standard/src/main/webapp/skins/albatross/usersandgroups.js Tue Nov 20 07:41:36 GMT 2007
@@ -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 \n';
this.displayRows( offset, limit );
}
-
+
//we need get new rows
else
{
buff += 'we need to get rows '+min+' to '+ (max+1) +' \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,87 +179,9 @@
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(){
- //
- }
- } */
-}
-
////////////////////////////////////////////////////////////////////////
/* the class representing the dynamic scroller */
ASSScroller = Class.create();
@@ -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,50 +291,61 @@
pivot.refreshContent();
}
},
-
+
linkEvents : function()
{
var inputs = this.filterNode.getElementsByTagName('input');
var selects = this.filterNode.getElementsByTagName('select');
-
+
for(var i = 0; i < inputs.length; i++)
+ {
+ if(inputs[i].type == "radio")
+ Event.observe(inputs[i], 'click', this.makeRefreshHandler(this));
+ else
- Event.observe(inputs[i], 'keyup', this.makeRefreshHandler(this));
+ 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;
+ if(inputs[i].type == "radio")
+ {
+ if(inputs[i].checked == 1)
- this.filters[key] = trim(inputs[i].value);
- }
+ this.filters[key] = trim(inputs[i].value);
+ }
+ else
+ this.filters[key] = trim(inputs[i].value);
+ }
var selects = this.filterNode.getElementsByTagName('select');
for(var i = 0; i < selects.length; i++)
{
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()
{
Index: standard/src/main/webapp/skins/albatross/getusers.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/getusers.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/getusers.vm Tue Nov 20 07:41:06 GMT 2007
@@ -18,7 +18,7 @@
#if(! $defaultKeys.contains( $key ) )
## build the filters map
#foreach( $i in $params.get( $key ) ) #set( $value = $i ) #end
- #if( $docProps.contains( $key ))
+ #if( $docProps.contains( $key ))
#set( $arr = $xwiki.arrayList )
#set( $discard = $arr.add( null ) ) ## this may be variable...
#set( $discard = $arr.add( "$value" ) )
@@ -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 ))
@@ -48,14 +48,14 @@
#elseif( $value == "global" )
#set( $users = $rm.getAllMatchedGlobalUsers( $filterMap, $limit, $off, $orderList ) )
#set( $countUsers = $rm.countAllMatchedGlobalUsers( $filterMap ) )
-#else
+#else
## get both local and global users
#set( $users = $rm.getAllMatchedUsers( $filterMap, $limit, $off, $orderList ) )
#set( $countUsers = $rm.countAllMatchedUsers( $filterMap ) )
#end
### json starts
-{
+{
"totalrows": $countUsers,
"returnedrows": #if($countUsers < $limit) $countUsers #else $limit #end,
"offset": $offset,
@@ -69,10 +69,10 @@
#set($wikiname = $user.getWiki())
#if($wikiname != "xwiki" || $wikiname == $context.database) #set($wikiname = "local") #end
#if( $velocityCount > 1 ) , #end
- {"username" : "$user.name",
+ {"username" : "$user.name",
"fullname" : "$user.fullName",
"wikiname" : "$wikiname",
- "firstname" : "$user.getObject('XWiki.XWikiUsers').get('first_name')",
+ "firstname" : "$user.getObject('XWiki.XWikiUsers').get('first_name')",
"lastname" : "$user.getObject('XWiki.XWikiUsers').get('last_name')",
"userurl" : "$xwiki.getURL($user.fullName)",
"usersaveurl" : "$user.getURL("save")",
Index: standard/src/main/webapp/skins/albatross/adminspacerights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/adminspacerights.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/adminspacerights.vm Tue Nov 20 07:39:57 GMT 2007
@@ -6,23 +6,23 @@
############ 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 @@
$msg.get("editrightsforspace"): $space
---
- #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"))
$spaceitem
@@ -69,7 +67,7 @@
#end
-
+
@@ -80,9 +78,6 @@
$msg.get("rightsmanager.edit")
$msg.get("rightsmanager.delete")
$msg.get("rightsmanager.admin")
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki'))
- #if($hasPrgr)$msg.get("rightsmanager.program") #end
$msg.get("rightsmanager.unregisteredusers")
@@ -91,37 +86,32 @@
- #if($hasPrgr) #end
-
-
- Groups
- Users
-
+
+
######### display the stable interface
@@ -200,4 +191,4 @@
#template("adminactions.vm")
#end
- ##xwikieditcontent
\ No newline at end of file
+ ##xwikieditcontent
Index: standard/src/main/webapp/skins/albatross/usersandgroups.css
===================================================================
--- standard/src/main/webapp/skins/albatross/usersandgroups.css (revision 6024)
+++ standard/src/main/webapp/skins/albatross/usersandgroups.css Tue Nov 20 07:41:24 GMT 2007
@@ -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
+}
Index: standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css
===================================================================
--- standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css (revision 6024)
+++ standard/src/main/webapp/skins/albatross/css/lightbox/lightbox.css Tue Nov 20 07:38:53 GMT 2007
@@ -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;
@@ -151,4 +152,4 @@
cursor: pointer;
background-image: url("$xwiki.getSkinFile("icons/rights-manager/btnClose.png")");
background-repeat: no-repeat;
-}
+}
\ No newline at end of file
Index: standard/src/main/webapp/skins/albatross/adminglobalrights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/adminglobalrights.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/adminglobalrights.vm Tue Nov 20 08:20:01 GMT 2007
@@ -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 @@
-
+
-
-
- $msg.get("Groups")
- $msg.get("Users")
-
+
+
######## display the stable interface
-#else
+#else
#set ($classname = "XWiki.XWikiGlobalRights")
#set( $class = $xwiki.getDocument($classname).xWikiClass)
#set( $redirect = "$xwiki.getRequestURL()&editor=rights")
Index: standard/src/main/webapp/skins/albatross/editrights.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/editrights.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/editrights.vm Tue Nov 20 07:40:36 GMT 2007
@@ -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
Loading...
-
+
@@ -76,9 +70,6 @@
$msg.get("rightsmanager.comment")
$msg.get("rightsmanager.edit")
$msg.get("rightsmanager.delete")
- ## if global rights and main wiki show programming right column
- #set($hasPrgr = ($doc.fullName=='XWiki.XWikiPreferences' && $context.database=='xwiki'))
- #if($hasPrgr)$msg.get("rightsmanager.program") #end
$msg.get("rightsmanager.unregisteredusers")
@@ -86,30 +77,25 @@
- #if($hasPrgr) #end
-
- $msg.get("Groups")
- $msg.get("Users")
-
+
############ display the old interface
Index: standard/src/main/webapp/skins/albatross/editgroup.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/editgroup.vm (revision 6024)
+++ standard/src/main/webapp/skins/albatross/editgroup.vm Tue Nov 20 07:40:22 GMT 2007
@@ -26,11 +26,11 @@
- Add a new user
+ Add a new user
- Local
- Global
+ $msg.get("rightsmanager.local")
+ $msg.get("rightsmanager.global")
@@ -65,50 +65,50 @@
#set($url = $doc.getURL("view", "xpage=getgroupmembers"))