Index: wiki/src/main/resources/XWSCode/Translations
===================================================================
--- wiki/src/main/resources/XWSCode/Translations (revision 10117)
+++ wiki/src/main/resources/XWSCode/Translations (working copy)
@@ -12,8 +12,8 @@
XWiki.Admin
1206992640000
-1212160466000
-1212160466000
+1212673781000
+1212673781000
3.1
Translations
@@ -224,6 +224,10 @@
xws.members.managemembers=Manage members
xws.members.managemembers.title=Manage members for this workspace
+xws.directory.users=Utilisateurs
+
+xws.directory.users=Users
+
xws.mydashboard.recentactivity=Recent activity on my spaces
xws.mydashboard.help=Your dashboard shows you the recent activity on the spaces you are involved with a role : either you are an admin, writer, or a reader. If you want to see the full list of the spaces you can access including public and restricted spaces in which you don't have a specific role, please visit your My spaces page. There's a button too, in the top action bar, to access this list anytime.
Index: wiki/src/main/resources/XWSCode/UserTableView
===================================================================
--- wiki/src/main/resources/XWSCode/UserTableView (revision 0)
+++ wiki/src/main/resources/XWSCode/UserTableView (revision 0)
@@ -0,0 +1,122 @@
+
+
+
+XWSCode
+UserTableView
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+1212675053000
+1212743657000
+1212743657000
+15.1
+
+
+
+
+
+false
+
+<div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br />
+ <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get('ui.ajaxTable.loading')" title="" />
+</div>
+<table id="alluserstable" style="width: 100%">
+<tr>
+ <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="headerlabel">$msg.get("avatar")</td>
+ <td class="headerlabel">$msg.get("firstname")</td>
+ <td class="headerlabel">$msg.get("lastname")</td>
+ <td class="headerlabel">$msg.get("email")</td>
+ </tr>
+ <tr id="table-filters">
+ <td></td>
+ <td><input name="firstname" type="text"/></td>
+ <td><input name="lastname" type="text"/></td>
+ <td><input name="email" type="text" /></td>
+ </tr>
+ </thead>
+ <tbody id="display1"><tr><td> </td></tr></tbody>
+ </table></td>
+ <td valign="top">
+ <div id="scrollbar1" class="scrollbar"><div class="inscrollbar"> </div></div>
+ </td>
+ <td id="buff"></td>
+</tr>
+</table>
+#set($url = "$xwiki.getURL('XWSCode.UserTableResults')?xpage=plain")
+{pre}
+<script type="text/javascript">
+//<![CDATA[
+function displayAllUsers(row, i, table)
+{
+ var ava = new Element('img', {'src' : row.avatarurl});
+ if(row.avatarurl.substring(row.avatarurl.lastIndexOf('/') + 1) == "nophoto.png"){
+ ava.style.width="45px";
+ }
+ var avatar = new Element('td', {'class' : 'avatar'}).update(ava);
+ avatar.style.textAlign="center";
+ var fna = new Element('a', {'href' : row.url}).update(row.firstname);
+ var firstname = new Element('td', {'class' : 'firstname'}).update(fna);
+ var lna = new Element('a', {'href' : row.url}).update(row.lastname);
+ var lastname = new Element('td', {'class' : 'lastname'}).update(lna);
+ var emaila = new Element('a', {'href' : row.url}).update(row.email);
+ var email = new Element('td', {'class' : 'email'}).update(emaila);
+ var tr = new Element('tr', {'class' : (i % 2 == 0) ? 'even' : 'odd'} ).update(firstname);
+ tr.appendChild(avatar);
+ tr.appendChild(firstname);
+ tr.appendChild(lastname);
+ tr.appendChild(email);
+
+ return tr;
+}
+
+var ta = new ASSTable("$url", 10, "display1", "scrollbar1", "alluserstable", displayAllUsers, true);
+
+//]]>
+</script>
+{/pre}
+
Index: wiki/src/main/resources/XWSCode/XWSDirectory
===================================================================
--- wiki/src/main/resources/XWSCode/XWSDirectory (revision 10117)
+++ wiki/src/main/resources/XWSCode/XWSDirectory (working copy)
@@ -12,14 +12,15 @@
XWiki.Admin
1200931553000
-1201003544000
-1202988797000
-1.1
+1212675047000
+1212675047000
+6.1
XWSDirectory
+false
-#set($howMany=50)
-#if($request.offset)
- #set($offset=$xwiki.parseInt($request.offset))
-#else
- #set($offset=0)
-#end
-#set($withLinks=true)
-
-<div style="text-align:center">
-[0-9>$doc.fullName?view=index&letter=09] -
-#foreach($letter in ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'])
- [$letter>$doc.fullName?letter=${letter}&offset=${offset}] -
-#end
-[#>$doc.fullName?offset=${offset}]
-</div>
-
-#if($request.letter && $request.letter!="")
- #set($whereLetter = "and doc.name like '${request.letter}%'")
-#end
-
-#set($hql = ", BaseObject as obj where obj.name=doc.fullName and obj.className='XWiki.XWikiUsers' and doc.web='XWiki' $!whereLetter order by doc.name asc")
-
-#includeInContext("XWSCode.XWSPeopleResult")
+1 $msg.get("xws.directory.users")
+#if((!$view) || ($view == ""))
+ #set($view = $request.getParameter("view"))
+ #if((!$view) || ($view == ""))
+ #set ($view = "index")
+ #end
+#end
+<div id="xwikieditcontent" class="clear">
+#includeTopic("XWSCode.UserTableView")
+</div>
Index: wiki/src/main/resources/XWSCode/UserTableResults
===================================================================
--- wiki/src/main/resources/XWSCode/UserTableResults (revision 0)
+++ wiki/src/main/resources/XWSCode/UserTableResults (revision 0)
@@ -0,0 +1,142 @@
+
+
+
+XWSCode
+UserTableResults
+
+en
+0
+
+XWiki.Admin
+XWiki.Admin
+
+XWiki.Admin
+1212675125000
+1212743638000
+1212743638000
+41.1
+
+
+
+
+
+false
+
+{pre}
+## ============================================================================================
+## This page is called from live grids via Ajax with the argument xpage=plain. It returns a
+## set of results serialized in JSON.
+## You can see an example of live grid in XWSCode.UserTableView (note : this grid doesn't use
+## all the serialized fields).
+## ============================================================================================
+#if ($request.get("xpage") && $request.get("xpage") == "plain")
+ #set( $offset = $xwiki.parseInt( $request.get( "offset" ) ) )
+ ## offset starts from 0 in velocity and 1 in javascript
+ #set( $off = $offset - 1 )
+ #set( $limit = $xwiki.parseInt( $request.get( "limit" ) ) )
+ #set($firstname = $request.get("firstname"))
+ #set($lastname = $request.get("lastname"))
+ #set($email = $request.get("email"))
+ #if($firstname)
+ #set($wheresqlfn = " and propFN.id.name='first_name' and upper(propFN.value) like upper('%${firstname}%')")
+ #end
+ #if($lastname)
+ #set($wheresqlln = " and propLN.id.name='last_name' and upper(propLN.value) like upper('%${lastname}%')")
+ #end
+ #if($email)
+ #set($wheresqlm = " and propM.id.name='email' and upper(propM.value) like upper('%${email}%')")
+ #end
+ #set($sql = ", BaseObject as obj, StringProperty propFN, StringProperty propLN, StringProperty propM where obj.name=doc.fullName and obj.className='XWiki.XWikiUsers' and doc.web='XWiki' and obj.id=propFN.id.id and obj.id=propLN.id.id and obj.id=propM.id.id $!wheresqlfn $!wheresqlln $!wheresqlm")
+ #set($items = $xwiki.searchDocuments($sql, $limit, $off))
+ #set($totalItems = $xwiki.searchDocuments($sql).size())
+ #set($returnedItems = $items.size())
+ ## ==============================================
+ ## json starts
+ ## ==============================================
+ {"totalrows": $totalItems,
+ "returnedrows": #if($returnedItems < $limit) $returnedItems #else $limit #end,
+ "offset": $offset,
+ "reqNo": $request.reqNo,
+ "rows": [
+ #foreach($item in $items)
+ #set($udoc = $xwiki.getDocument($item))
+ #set($uobj = $udoc.getObject("XWiki.XWikiUsers"))
+ ## ==============================================
+ ## Avatar
+ ## ==============================================
+ #if($uobj.get("avatar") != "")
+ #set($width=$xwiki.image.getWidth($item,$uobj.get("avatar")))
+ #set($height=$xwiki.image.getHeight($item,$uobj.get("avatar")))
+ #set($maxsize=45)
+ #if($width > $height)
+ #set($itemavatarurl=$udoc.getAttachmentURL($uobj.get("avatar"),"download","width=$maxsize"))
+ #else
+ #set($itemavatarurl=$udoc.getAttachmentURL($uobj.get("avatar"),"download","height=$maxsize"))
+ #end
+ #else
+ #set($itemavatarurl=$xwiki.getSkinFile("images/nophoto.png"))
+ #end
+ ## ==============================================
+ ## First Name
+ ## ==============================================
+ #set($itemfirstname = $uobj.get("first_name"))
+ ## ==============================================
+ ## Last Name
+ ## ==============================================
+ #set($itemlastname = $uobj.get("last_name"))
+ ## ==============================================
+ ## Email
+ ## ==============================================
+ #set($itememail = $uobj.get("email"))
+ ## ==============================================
+ ## URL
+ ## ==============================================
+ #set($itemurl = $xwiki.getURL($item))
+ ## ==============================================
+ #if($velocityCount > 1) , #end
+ {"avatarurl" : "$itemavatarurl",
+ "firstname" : "$itemfirstname",
+ "lastname" : "$itemlastname",
+ "email" : "$itememail",
+ "url" : "$itemurl"
+ }
+ #end
+ ]}
+ ## ==============================================
+ ## json ended
+ ## ==============================================
+#end
+{/pre}
+
\ No newline at end of file
Index: web/src/main/webapp/skins/workspaces/style.css
===================================================================
--- web/src/main/webapp/skins/workspaces/style.css (revision 10117)
+++ web/src/main/webapp/skins/workspaces/style.css (working copy)
@@ -3251,6 +3251,17 @@
line-height: 1em;
}
+#alluserstable{
+ width: 100%;
+}
+#alluserstable td.headerlabel{
+ padding: 5px 0px 5px 10px;
+ color: #fff;
+}
+#alluserstable td{
+ padding-left:10px;
+}
+
/* IE 7 */
*+html #actionmenu a#globaladminbutton span,
*+html #actionmenu a#logoutbutton span{