Skip to Content

Changes for page Profile of XWikiUserSheet

Last modified by Ludovic Dubost on 2024/07/22 15:51
From 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]
To version 4.1
edited by Ludovic Dubost
on 2015/09/01 11:46
Change comment: Install extension [org.xwiki.platform:xwiki-platform-user-profile-ui-7.1]

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
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])
1 +#set($userName="$!doc.getValue('first_name') $!doc.getValue('last_name')")#if($userName==' ')#set($userName=$doc.name)#{end}$services.localization.render('platform.core.profile.title', [$userName])
Content
... ... @@ -8,21 +8,30 @@
8 8  ## Setting categories
9 9  #########################
10 10  #set($categories = [])
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
11 +#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet', 'glyphicon': 'user'}))
12 +#set($isMyProfile = ($services.model.resolveDocument($xcontext.user) == $doc.documentReference))
13 +#if($isMyProfile || $hasAdmin)
14 + #set($discard = $categories.add({'id':'preferences', 'sheet':'XWiki.XWikiUserPreferencesSheet', 'glyphicon': 'wrench'}))
25 25  #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', 'glyphicon': 'eye-open'}))
19 +#end
20 +#if($isMyProfile)
21 + #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'globe'}))
22 +#end
23 +#set($userWikiSheet = 'WikiManager.UserWikiSheet')
24 +#if($xcontext.isMainWiki() && $xwiki.exists($userWikiSheet))
25 + #set($discard = $categories.add({
26 + 'id': 'wikis',
27 + 'name': $services.localization.render('platform.wiki.menu.userwikis'),
28 + 'sheet': $userWikiSheet,
29 + 'glyphicon': 'list'
30 + }))
31 +#end
32 +#if($isMyProfile && $hasDashboard)
33 + #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet', 'glyphicon': 'th'}))
34 +#end
26 26  #########################
27 27  ## Current category
28 28  #########################
... ... @@ -59,13 +59,10 @@
59 59   (((
60 60   #if($request.xpage == 'edituser')
61 61   {{html clean="false"}}
62 - #resizedUserAvatar($doc.fullName 180)
71 + #resizedUserAvatar($doc.fullName 170)
63 63   {{/html}}
64 64   #else
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 + {{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"/}}
69 69   #end
70 70   )))
71 71   ##########
... ... @@ -86,7 +86,8 @@
86 86   #set($tabKey = $subcategory.get('id'))
87 87   (% id="${tabKey}Pane" class="user-page-pane#if($tabKey != $currentCategory) hidden#end" %)
88 88   (((
89 - {{html}}$services.rendering.render($subcategory.uix.execute(), 'html/5.0'){{/html}}
95 + #set($tabInclude = $subcategory.get('sheet'))
96 + {{include reference="${tabInclude}" /}}
90 90   )))
91 91   #end
92 92   #end
... ... @@ -99,5 +99,10 @@
99 99   <input type='hidden' name='category' value="$!{escapetool.xml($currentCategory)}" />
100 100   #end
101 101   <div class="clearfloats">&nbsp;</div>
109 + #if($request.get('xpage'))
110 + <script type="text/javascript">
111 + document.fire('lightbox:userprofile:loaded');
112 + </script>
113 + #end
102 102  {{/html}}
103 103  {{/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(container) {
5 + init : function() {
6 6   this.crtCategory = '';
7 - this.tabsContainer = (container || $('body')).down('#user-vertical-menu');
7 + this.tabsContainer = $('user-vertical-menu');
8 8   if (!this.tabsContainer) {
9 9   return;
10 10   }
... ... @@ -17,7 +17,6 @@
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');
21 21   }.bind(this));
22 22   this.handleCancelAction();
23 23  
... ... @@ -48,7 +48,6 @@
48 48   this.updateURL(tabName);
49 49   }
50 50   document.fire('xwiki:profile:switchedCategory', {'category' : tab});
51 - document.fire('xwiki:dom:refresh');
52 52   },
53 53  
54 54   updateCategoryFields : function (category) {
... ... @@ -63,7 +63,7 @@
63 63   if (history.pushState) {
64 64   var params = window.location.search.toQueryParams();
65 65   params.category = category;
66 - var newQueryString = Object.toQueryString(params);
64 + newQueryString = Object.toQueryString(params);
67 67  
68 68   var newURL = window.location.protocol + '//' + window.location.host + window.location.pathname + '?' + newQueryString;
69 69   window.history.pushState({category : category}, '', newURL);
... ... @@ -72,7 +72,7 @@
72 72  
73 73   updateField : function (fieldName, value) {
74 74   var element = $$('input[name=' + fieldName + ']');
75 - if (element && element.length) {
73 + if (element && element.size() > 0) {
76 76   element[0].value = value;
77 77   }
78 78   },
... ... @@ -79,7 +79,7 @@
79 79  
80 80   handleCancelAction : function() {
81 81   var elements = $$('form .buttons input[type=submit][name=action_cancel]');
82 - if (elements && elements.length) {
80 + if (elements && elements.size() > 0) {
83 83   var button = elements[0];
84 84   Event.stopObserving(button, 'click');
85 85   button.observe('click', function(event){
... ... @@ -91,14 +91,12 @@
91 91   }
92 92  });
93 93  
94 -var init = function(event) {
95 - ((event && event.memo.elements) || [$('body')]).each(function(element) {
96 - XWiki.userprofile.init(element);
97 - });
92 +var init = function() {
93 + XWiki.userprofile.init();
98 98   return true;
99 99  };
100 100  (XWiki.domIsLoaded && init()) || document.observe('xwiki:dom:loaded', init);
101 -document.observe('xwiki:dom:updated', init);
97 +document.observe('lightbox:userprofile:loaded', init);
102 102  // End XWiki augmentation.
103 103  return XWiki;
104 104  }(XWiki || {}));
XWiki.StyleSheetExtension[0]
Code
... ... @@ -12,7 +12,7 @@
12 12  
13 13  #avatar img {
14 14   border: 1px solid $theme.borderColor;
15 - border-radius: 8px 8px 8px 8px;
15 + border-radius: 5px 5px 5px 5px;
16 16   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
17 17   margin: 0 auto;
18 18   padding: 0.3em;
... ... @@ -72,13 +72,13 @@
72 72   margin-left: 14em;
73 73  }
74 74  
75 -.column h1, .column h2 {
76 - font-weight: bold;
77 - font-size: 115%;
78 - margin: 10px 0;
75 +.column h1 {
76 + font-weight:bold;
77 + font-size:115%;
78 + margin:10px 0;
79 79  }
80 80  
81 -.column h3 {
81 +.column h2 {
82 82   font-size: 110%;
83 83  }
84 84  
... ... @@ -96,7 +96,7 @@
96 96  
97 97  /* ----- Profile ----- */
98 98  td.recentChangesLeft, .recentChangesMoreActions {
99 - display: none;
99 + display:none;
100 100  }
101 101  
102 102  td.recentChangesRight {
... ... @@ -115,6 +115,10 @@
115 115   background-color: $theme.backgroundSecondaryColor;
116 116  }
117 117  
118 +.userInfo {
119 + -ms-word-break: break-all; /* IE8, IE9 */
120 +}
121 +
118 118  .userInfo a {
119 119   word-wrap: break-word;
120 120  }
... ... @@ -122,21 +122,21 @@
122 122  .userInfo img {
123 123   max-width: 100%;
124 124  }
125 -
126 -.userInfo h2 {
127 - font-size: larger;
128 - font-weight: bolder;
129 - margin-top: 10px;
130 -}
131 -
129 +
132 132  div.userInfo input[type="text"], div.userInfo input[type="password"], div.userInfo textarea, div.userInfo select, div.userPreferences select {
133 133   width: 100%;
134 134  }
135 135  
136 136  div.editProfileCategory {
137 - float: right;
135 + float:right;
138 138  }
139 139  
138 +div.editProfileCategory a {
139 + display:block;
140 + width: 16px;
141 + height: 16px;
142 + background: url("$xwiki.getSkinFile('icons/silk/pencil.png')") no-repeat;
143 +}
140 140  
141 141  /* Watchlist */
142 142  
... ... @@ -147,9 +147,9 @@
147 147  }
148 148  
149 149  span#avatarUpload {
150 - display: block;
151 - width: $tabswidth;
152 - position: absolute;
154 + display:block;
155 + width:$tabswidth;
156 + position:absolute;
153 153   font-size: 10px;
154 154   font-weight: bold;
155 155   background-color: white;
... ... @@ -164,35 +164,28 @@
164 164   margin: 0;
165 165   padding: 0;
166 166  }
167 -
168 168  #networkPane .following li {
169 169   padding: 2px 20px 2px 2px;
170 170  }
171 -
172 172  #networkPane .following li:hover {
173 173   background-color: $theme.highlightColor;
174 174  }
175 -
176 176  #networkPane .following img {
177 177   float: left;
178 178   margin-right: 5px;
179 179  }
180 -
181 181  #networkPane .following .user-info {
182 182   float: left;
183 183  }
184 -
185 185  #networkPane .following .user-id {
186 186   font-size: .8em;
187 187   font-weight: 900;
188 188  }
189 -
190 190  #networkPane .following .unfollow {
191 191   float: right;
192 192   margin-right: -16px;
193 193   padding: 0;
194 194  }
195 -
196 196  ## --------------------------------------
197 197  ## Picker style
198 198  .attachment-picker {
... ... @@ -200,7 +200,6 @@
200 200   margin: auto;
201 201   width: 100%;
202 202  }
203 -
204 204  .attachment-picker p {
205 205   padding: 0;
206 206   margin: 0;
... ... @@ -209,7 +209,6 @@
209 209  .attachment-picker .picture {
210 210   z-index: -1;
211 211  }
212 -
213 213  .attachment-picker .buttonwrapper {
214 214   margin: 0;
215 215  }
Content Type
... ... @@ -1,1 +1,0 @@
1 -LESS