Skip to Content

Changes for page Profile of XWikiUserSheet

Last modified by Ludovic Dubost on 2024/07/22 15:51
From version 2.1
edited by Ludovic Dubost
on 2014/03/30 19:46
Change comment: Imported from XAR
To version 12.1
edited by Ludovic Dubost
on 2024/07/22 15:51
Change comment: Install extension [org.xwiki.platform:xwiki-platform-user-profile-ui/16.5.0]

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -$services.localization.render('platform.core.profile.title', ["$!doc.getValue('first_name') $!doc.getValue('last_name')"])
1 +#set($userName="$!doc.getValue('first_name') $!doc.getValue('last_name')")#if($userName==' ')#set($userName=$doc.documentReference.name)#{end}$services.localization.render('platform.core.profile.title', [$userName])
Content
... ... @@ -8,35 +8,27 @@
8 8  ## Setting categories
9 9  #########################
10 10  #set($categories = [])
11 -#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet'}))
12 -#set($isMyProfile = ($services.model.resolveDocument($xcontext.user) == $doc.documentReference))
13 -#if($isMyProfile || $hasAdmin)
14 - #set($discard = $categories.add({'id':'preferences', 'sheet':'XWiki.XWikiUserPreferencesSheet'}))
11 +
12 +## load the user menu from the 'org.xwiki.plaftorm.user.profile.menu' UIXP.
13 +#foreach ($uix in $services.uix.getExtensions('org.xwiki.plaftorm.user.profile.menu', {'sortByParameter': 'priority'}))
14 + #if(!$uix.parameters.containsKey('isActive') || $uix.parameters.get('isActive') != 'false')
15 + #if (!$uix.parameters.containsKey('id'))
16 + ## when no id is explicitly provided, we use the id of the UIX.
17 + #set ($discard = $uix.parameters.put('id', $uix.id))
18 + #end
19 + #if ($uix.parameters.containsKey('icon'))
20 + #set ($discard = $uix.parameters.put('glyphicon', $uix.parameters.get('icon')))
21 + #end
22 + #set ($discard = $uix.parameters.put('uix', $uix))
23 + #set($discard = $categories.add($uix.parameters))
24 + #end
15 15  #end
16 -## TODO: add APIs to be able to display users watchlists to admins
17 -#if($isMyProfile && $hasWatch)
18 - #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet'}))
19 -#end
20 -#if($isMyProfile)
21 - #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet'}))
22 -#end
23 -#set($userWorkspaceSheet = 'WorkspaceManager.UserWorkspaceSheet')
24 -#if($xcontext.isMainWiki() && $xwiki.exists($userWorkspaceSheet))
25 - #set($discard = $categories.add({
26 - 'id': 'workspaces',
27 - 'name': $services.localization.render('workspacemanager.profile.category.workspaces'),
28 - 'sheet': $userWorkspaceSheet
29 - }))
30 -#end
31 -#if($isMyProfile && $hasDashboard)
32 - #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet'}))
33 -#end
34 34  #########################
35 35  ## Current category
36 36  #########################
37 37  #set($currentCategory = "$!request.category")
38 38  #if($currentCategory == "")
39 - #set($currentCategory = $listtool.get($categories, 0).get('id'))
31 + #set($currentCategory = $categories[0].get('id'))
40 40  #end
41 41  #########################
42 42  ## Creating vertical menu
... ... @@ -67,10 +67,13 @@
67 67   (((
68 68   #if($request.xpage == 'edituser')
69 69   {{html clean="false"}}
70 - #resizedUserAvatar($doc.fullName 170)
62 + #resizedUserAvatar($doc.fullName 180)
71 71   {{/html}}
72 72   #else
73 - {{attachmentSelector classname="XWiki.XWikiUsers" object="$obj.number" property="avatar" #if ($isMyProfile) savemode="direct" #end defaultValue="XWiki.XWikiUserSheet@noavatar.png" width="120" alternateText="$xwiki.getUserName($doc.fullName, false)" buttontext="$services.localization.render('platform.core.profile.changePhoto')" displayImage="true" filter="png,jpg,gif"/}}
65 + ## By specifying the image width we enable server side resizing. The width value we use is greater than the
66 + ## available space because we don't want to loose too much of the image quality (we rely on the browser to fit the
67 + ## image in the available space).
68 + {{attachmentSelector classname="XWiki.XWikiUsers" object="$obj.number" property="avatar" #if ($hasEdit) savemode="direct" #end defaultValue="XWiki.XWikiUserSheet@noavatar.png" width="180" alternateText="$xwiki.getUserName($doc.fullName, false)" buttontext="$services.localization.render('platform.core.profile.changePhoto')" displayImage="true" filter="png,jpg,jpeg,gif"/}}
74 74   #end
75 75   )))
76 76   ##########
... ... @@ -91,8 +91,7 @@
91 91   #set($tabKey = $subcategory.get('id'))
92 92   (% id="${tabKey}Pane" class="user-page-pane#if($tabKey != $currentCategory) hidden#end" %)
93 93   (((
94 - #set($tabInclude = $subcategory.get('sheet'))
95 - {{include reference="${tabInclude}" /}}
89 + {{html}}$services.rendering.render($subcategory.uix.execute(), 'html/5.0'){{/html}}
96 96   )))
97 97   #end
98 98   #end
... ... @@ -102,13 +102,8 @@
102 102  #########################
103 103  {{html clean="false"}}
104 104   #if($xcontext.action == 'edit' || $xcontext.action == 'inline')
105 - <input type='hidden' name='category' value="$!{currentCategory}" />
99 + <input type='hidden' name='category' value="$!{escapetool.xml($currentCategory)}" />
106 106   #end
107 107   <div class="clearfloats">&nbsp;</div>
108 - #if($request.get('xpage'))
109 - <script type="text/javascript">
110 - document.fire('lightbox:userprofile:loaded');
111 - </script>
112 - #end
113 113  {{/html}}
114 114  {{/velocity}}
XWiki.JavaScriptExtension[0]
Code
... ... @@ -2,9 +2,9 @@
2 2  // Start XWiki augmentation.
3 3  Object.extend(XWiki, {
4 4   userprofile : {
5 - init : function() {
5 + init : function(container) {
6 6   this.crtCategory = '';
7 - this.tabsContainer = $('user-vertical-menu');
7 + this.tabsContainer = (container || $('body')).down('#user-vertical-menu');
8 8   if (!this.tabsContainer) {
9 9   return;
10 10   }
... ... @@ -11,17 +11,29 @@
11 11   this.tabsContainer.select('.category-tab').each(function (tabElement) {
12 12   tabElement.observe('click', function(event) {
13 13   Event.stop(event);
14 - this.switchTab(tabElement.id);
14 + this.switchTab(tabElement.id, true);
15 15   }.bindAsEventListener(this));
16 16   }.bind(this));
17 17   this.tabsContainer.select('.category-tab.current').each(function (activeTab) {
18 18   this.updateCategoryFields(activeTab.id);
19 19   document.fire('xwiki:profile:switchedCategory', {'category' : activeTab.id});
20 + document.fire('xwiki:dom:refresh');
20 20   }.bind(this));
21 21   this.handleCancelAction();
23 +
24 + // History navigation through our pushed states.
25 + window.addEventListener('popstate', function(event) {
26 + if (event.state && event.state.category) {
27 + this.switchTab('vertical-menu-' + event.state.category);
28 + }
29 + }.bindAsEventListener(this));
30 + // Store the initial history state so we can go back.
31 + history.replaceState({
32 + category: window.location.search.toQueryParams().category || 'profile'
33 + }, document.title, document.location.href);
22 22   },
23 23  
24 - switchTab : function(tab) {
36 + switchTab : function(tab, pushHistory) {
25 25   var tabName = tab.substring(14); // 14 = len('vertical-menu-')
26 26   $("user-page-content").select("div.user-page-pane").each(function(pane){
27 27   pane.addClassName('hidden');
... ... @@ -32,7 +32,11 @@
32 32   });
33 33   $(tab).addClassName('current');
34 34   this.updateCategoryFields(tab);
47 + if (pushHistory) {
48 + this.updateURL(tabName);
49 + }
35 35   document.fire('xwiki:profile:switchedCategory', {'category' : tab});
51 + document.fire('xwiki:dom:refresh');
36 36   },
37 37  
38 38   updateCategoryFields : function (category) {
... ... @@ -43,9 +43,20 @@
43 43   this.updateField('category', category);
44 44   },
45 45  
62 + updateURL : function (category) {
63 + if (history.pushState) {
64 + var params = window.location.search.toQueryParams();
65 + params.category = category;
66 + var newQueryString = Object.toQueryString(params);
67 +
68 + var newURL = window.location.protocol + '//' + window.location.host + window.location.pathname + '?' + newQueryString;
69 + window.history.pushState({category : category}, '', newURL);
70 + }
71 + },
72 +
46 46   updateField : function (fieldName, value) {
47 47   var element = $$('input[name=' + fieldName + ']');
48 - if (element && element.size() > 0) {
75 + if (element && element.length) {
49 49   element[0].value = value;
50 50   }
51 51   },
... ... @@ -52,7 +52,7 @@
52 52  
53 53   handleCancelAction : function() {
54 54   var elements = $$('form .buttons input[type=submit][name=action_cancel]');
55 - if (elements && elements.size() > 0) {
82 + if (elements && elements.length) {
56 56   var button = elements[0];
57 57   Event.stopObserving(button, 'click');
58 58   button.observe('click', function(event){
... ... @@ -64,12 +64,14 @@
64 64   }
65 65  });
66 66  
67 -var init = function() {
68 - XWiki.userprofile.init();
94 +var init = function(event) {
95 + ((event && event.memo.elements) || [$('body')]).each(function(element) {
96 + XWiki.userprofile.init(element);
97 + });
69 69   return true;
70 70  };
71 71  (XWiki.domIsLoaded && init()) || document.observe('xwiki:dom:loaded', init);
72 -document.observe('lightbox:userprofile:loaded', init);
101 +document.observe('xwiki:dom:updated', init);
73 73  // End XWiki augmentation.
74 74  return XWiki;
75 75  }(XWiki || {}));
XWiki.StyleSheetExtension[0]
Code
... ... @@ -6,9 +6,13 @@
6 6   width: 13em;
7 7  }
8 8  
9 +#avatar p {
10 + text-align: center;
11 +}
12 +
9 9  #avatar img {
10 10   border: 1px solid $theme.borderColor;
11 - border-radius: 5px 5px 5px 5px;
15 + border-radius: 8px 8px 8px 8px;
12 12   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
13 13   margin: 0 auto;
14 14   padding: 0.3em;
... ... @@ -40,11 +40,11 @@
40 40   content: url("$xwiki.getSkinFile('icons/silk/application_view_tile.png')");
41 41  }
42 42  
43 -.profile-menu .user-menu-workspaces:before{
47 +.profile-menu .user-menu-wikis:before{
44 44   content: url("$xwiki.getSkinFile('icons/silk/chart_organisation.png')");
45 45  }
46 46  
47 -.profile-menu .group.user-menu-title{
51 +.skin-colibri .profile-menu .group.user-menu-title{
48 48   #set ($menuIcon = "url(${escapetool.S}$xwiki.getSkinFile('icons/silk/user.png')${escapetool.S})")
49 49   #css3_backgroundIconAndLinearGradient($menuIcon, {
50 50   'to': 'bottom',
... ... @@ -68,18 +68,13 @@
68 68   margin-left: 14em;
69 69  }
70 70  
71 -#user-page-content h1{
72 - margin: 0 0 20px 0;
75 +.column h1, .column h2 {
76 + font-weight: bold;
77 + font-size: 115%;
78 + margin: 10px 0;
73 73  }
74 74  
75 -
76 -.column h1 {
77 - font-weight:bold;
78 - font-size:115%;
79 - margin:10px 0;
80 -}
81 -
82 -.column h2 {
81 +.column h3 {
83 83   font-size: 110%;
84 84  }
85 85  
... ... @@ -97,7 +97,7 @@
97 97  
98 98  /* ----- Profile ----- */
99 99  td.recentChangesLeft, .recentChangesMoreActions {
100 - display:none;
99 + display: none;
101 101  }
102 102  
103 103  td.recentChangesRight {
... ... @@ -116,24 +116,28 @@
116 116   background-color: $theme.backgroundSecondaryColor;
117 117  }
118 118  
118 +.userInfo a {
119 + word-wrap: break-word;
120 +}
121 +
119 119  .userInfo img {
120 120   max-width: 100%;
121 121  }
122 -
125 +
126 +.userInfo h2 {
127 + font-size: larger;
128 + font-weight: bolder;
129 + margin-top: 10px;
130 +}
131 +
123 123  div.userInfo input[type="text"], div.userInfo input[type="password"], div.userInfo textarea, div.userInfo select, div.userPreferences select {
124 124   width: 100%;
125 125  }
126 126  
127 127  div.editProfileCategory {
128 - float:right;
137 + float: right;
129 129  }
130 130  
131 -div.editProfileCategory a {
132 - display:block;
133 - width: 16px;
134 - height: 16px;
135 - background: url("$xwiki.getSkinFile('icons/silk/pencil.png')") no-repeat;
136 -}
137 137  
138 138  /* Watchlist */
139 139  
... ... @@ -143,28 +143,10 @@
143 143   font-weight: bold;
144 144  }
145 145  
146 -span.wikiWatchlistType, span.spaceWatchlistType, span.pageWatchlistType {
147 - width: 16px;
148 - height: 16px;
149 - display: block;
150 -}
151 -
152 -span.wikiWatchlistType {
153 - background: url("$xwiki.getSkinFile('icons/silk/world.png')") no-repeat;
154 -}
155 -
156 -span.spaceWatchlistType {
157 - background: url("$xwiki.getSkinFile('icons/silk/folder.png')") no-repeat;
158 -}
159 -
160 -span.pageWatchlistType {
161 - background: url("$xwiki.getSkinFile('icons/silk/page_white_text.png')") no-repeat;
162 -}
163 -
164 164  span#avatarUpload {
165 - display:block;
166 - width:$tabswidth;
167 - position:absolute;
150 + display: block;
151 + width: $tabswidth;
152 + position: absolute;
168 168   font-size: 10px;
169 169   font-weight: bold;
170 170   background-color: white;
... ... @@ -179,28 +179,35 @@
179 179   margin: 0;
180 180   padding: 0;
181 181  }
167 +
182 182  #networkPane .following li {
183 183   padding: 2px 20px 2px 2px;
184 184  }
171 +
185 185  #networkPane .following li:hover {
186 186   background-color: $theme.highlightColor;
187 187  }
175 +
188 188  #networkPane .following img {
189 189   float: left;
190 190   margin-right: 5px;
191 191  }
180 +
192 192  #networkPane .following .user-info {
193 193   float: left;
194 194  }
184 +
195 195  #networkPane .following .user-id {
196 196   font-size: .8em;
197 197   font-weight: 900;
198 198  }
189 +
199 199  #networkPane .following .unfollow {
200 200   float: right;
201 201   margin-right: -16px;
202 202   padding: 0;
203 203  }
195 +
204 204  ## --------------------------------------
205 205  ## Picker style
206 206  .attachment-picker {
... ... @@ -208,6 +208,7 @@
208 208   margin: auto;
209 209   width: 100%;
210 210  }
203 +
211 211  .attachment-picker p {
212 212   padding: 0;
213 213   margin: 0;
... ... @@ -216,6 +216,7 @@
216 216  .attachment-picker .picture {
217 217   z-index: -1;
218 218  }
212 +
219 219  .attachment-picker .buttonwrapper {
220 220   margin: 0;
221 221  }
... ... @@ -224,8 +224,6 @@
224 224   background: url("$xwiki.getSkinFile('icons/silk/picture_edit.png')") no-repeat center center $theme.pageContentBackgroundColor !important;
225 225   border: 0 none !important;
226 226   border-bottom-left-radius: 8px;
227 - -moz-border-radius-bottomleft: 8px;
228 - -webkit-border-bottom-left-radius: 8px;
229 229   height: 18px;
230 230   position: absolute;
231 231   right: 0;
... ... @@ -239,6 +239,7 @@
239 239  ## --------------------------------------
240 240  ## Dashboard
241 241  /* prevent the clearfloats between buttons & dashboard gadgets from clearing the tabs as well, only the buttons float */
242 -.dashboard .clearfloats {
234 +.dashboard .clearfloats,
235 +.dashboard .clearfloats:after, .dashboard .clearfloats:before {
243 243   clear: right;
244 244  }
Content Type
... ... @@ -1,0 +1,1 @@
1 +LESS