Changes for page User Directory
Last modified by Ecaterina Valica on 2016/11/17 15:21
Summary
-
Page properties (3 modified, 0 added, 0 removed)
-
Objects (0 modified, 0 added, 1 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 1 -$s ervices.localization.render('xe.userdirectory.title')1 +$msg.get("xe.userdirectory.title") - Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. evalica1 +xwiki:XWiki.Admin - Content
-
... ... @@ -5,9 +5,6 @@ 5 5 #set ($directoryPreferencesClassReference = $services.model.createDocumentReference($xcontext.database, 'XWiki', 'UserDirectoryPreferencesClass')) 6 6 #set ($directoryPreferencesClassName = $services.model.serialize($directoryPreferencesClassReference)) 7 7 ## 8 -## Fake user used in some cases to properly display class properties 9 -#set ($fakeUser = false) 10 -## 11 11 ## Set the fixed columns that we want the user directory to always show. 12 12 #set ($columns = ['_avatar', 'doc.fullName']) 13 13 ## ... ... @@ -19,7 +19,7 @@ 19 19 ## Guests and superadmin don't have an user profile and, therefore, no preferences. Offer default. 20 20 #if ($isGuest || $isSuperAdmin) 21 21 #if ($isGuest) 22 - {{info}}$s ervices.localization.render('xe.userdirectory.canCustomizeInfoGuest',["path:$doc.getURL('login')"]){{/info}}19 + {{info}}$msg.get('xe.userdirectory.canCustomizeInfoGuest', "path:$doc.getURL('login')"){{/info}} 23 23 #end 24 24 ## Use the default columns for guests or superadmin. 25 25 #set ($discard = $columns.addAll($defaultColumns)) ... ... @@ -79,13 +79,13 @@ 79 79 ## 80 80 ## Customize form. Note: Using 2 forms to be able to do everything without JavaScript. 81 81 ## 82 - == {{translation key="xe.userdirectory.customizeColumnsTitle"/}}==79 + == $msg.get('xe.userdirectory.customizeColumnsTitle') == 83 83 {{html clean='false' wiki='true'}} 84 84 <form class='xform half' action="$doc.getURL($xcontext.action, $request.queryString)" method='post'> 85 85 <dl> 86 86 <dt class='label'> 87 - <label> {{translation key="xe.userdirectory.customizeAvailableColumnsLabel"/}}</label>88 - <span class='xHint'> {{translation key="xe.userdirectory.customizeAvailableColumnsHint"/}}</span>84 + <label>$msg.get('xe.userdirectory.customizeAvailableColumnsLabel')</label> 85 + <span class='xHint'>$msg.get('xe.userdirectory.customizeAvailableColumnsHint')</span> 89 89 </dt> 90 90 <dd> 91 91 <select name='value'> ... ... @@ -99,7 +99,7 @@ 99 99 <input type='hidden' name='xredirect' value="$xredirect" /> 100 100 <input type='hidden' name='action' value='add' /> 101 101 <span class='buttonwrapper'> 102 - <input type= "submit"class="button"name="submit"value="$services.localization.render('xe.userdirectory.customizeAddColumnButtonLabel')"/>99 + <input type='submit' class='button' name='submit' value='$msg.get('xe.userdirectory.customizeAddColumnButtonLabel')' /> 103 103 </span> 104 104 </dt> 105 105 </dl> ... ... @@ -107,8 +107,8 @@ 107 107 <form class='xform half' action="$doc.getURL($xcontext.action, $request.queryString)" method='post'> 108 108 <dl> 109 109 <dt> 110 - <label> {{translation key="xe.userdirectory.customizeSelectedColumnsLabel"/}}</label>111 - <span class='xHint'> {{translation key="xe.userdirectory.customizeSelectedColumnsHint"/}}</span>107 + <label>$msg.get('xe.userdirectory.customizeSelectedColumnsLabel')</label> 108 + <span class='xHint'>$msg.get('xe.userdirectory.customizeSelectedColumnsHint')</span> 112 112 </dt> 113 113 <dd>$userPreferences.display('columns', 'edit', $userPreference)</dd> 114 114 <dt> ... ... @@ -115,21 +115,21 @@ 115 115 <input type='hidden' name='xredirect' value="$xredirect" /> 116 116 <input type='hidden' name='action' value='save' /> 117 117 <span class='buttonwrapper'> 118 - <input class='button' type='submit' name='submit' value="$s ervices.localization.render('xe.userdirectory.customizeSaveButtonLabel')"/>115 + <input class='button' type='submit' name='submit' value="$msg.get('xe.userdirectory.customizeSaveButtonLabel')"/> 119 119 </span> 120 120 <span class="buttonwrapper"> 121 - <a href="$doc.getURL($xcontext.action, "$request.queryString&action=reset&xredirect=$escapetool.url($xredirect)")" class='button secondary'> {{translation key="xe.userdirectory.customizeResetButtonLabel"/}}</a>118 + <a href="$doc.getURL($xcontext.action, "$request.queryString&action=reset&xredirect=$escapetool.url($xredirect)")" class='button secondary'>$msg.get('xe.userdirectory.customizeResetButtonLabel')</a> 122 122 </span> 123 123 </dt> 124 124 </dl> 125 125 </form> 126 126 ## 127 - == {{translation key="xe.userdirectory.customizePreviewTitle"/}} ==124 + <h2>$msg.get('xe.userdirectory.customizePreviewTitle')</h2> 128 128 {{/html}} 129 129 #elseif ($isCustomized) 130 - {{warning}}$s ervices.localization.render('xe.userdirectory.isCustomizedWarning', ["$doc.fullName", "customize=true&action=reset&xredirect=$escapetool.url($xredirect)", "$doc.fullName", 'customize=true']){{/warning}}127 + {{warning}}$msg.get('xe.userdirectory.isCustomizedWarning', ["$doc.fullName", "customize=true&action=reset&xredirect=$escapetool.url($xredirect)", "$doc.fullName", 'customize=true']){{/warning}} 131 131 #else 132 - {{info}}$s ervices.localization.render('xe.userdirectory.canCustomizeInfo', ["$doc.fullName", 'customize=true']){{/info}}129 + {{info}}$msg.get('xe.userdirectory.canCustomizeInfo', ["$doc.fullName", 'customize=true']){{/info}} 133 133 #end 134 134 #end 135 135 ## ... ... @@ -176,9 +176,4 @@ 176 176 'rowCount': 10 177 177 }) 178 178 #livetable('userdirectory' $columns $columnsProperties $options) 179 -## 180 -## Clean up any existing fake user from the current in-memory document to avoid side-effects 181 -#if ($fakeUser) 182 - #set ($discard = $doc.removeObject($fakeUser)) 183 -#end 184 184 {{/velocity}}
- XWiki.UIExtensionClass[0]
-
- Extension Point ID
-
... ... @@ -1,1 +1,0 @@ 1 -org.xwiki.platform.panels.Applications - Extension ID
-
... ... @@ -1,1 +1,0 @@ 1 -platform.panels.userDirectoryApplication - Extension Parameters
-
... ... @@ -1,3 +1,0 @@ 1 -label=$services.localization.render('xe.panels.quicklinks.userdirectory') 2 -target=Main.UserDirectory 3 -icon=icon:group - Extension Scope
-
... ... @@ -1,1 +1,0 @@ 1 -wiki