Changes for page Profile of XWikiUserSheet
Last modified by Ludovic Dubost on 2024/07/22 15:51
From version 7.1
edited by Ludovic Dubost
on 2018/12/09 12:24
on 2018/12/09 12:24
Change comment:
Install extension [org.xwiki.platform:xwiki-platform-user-profile-ui/10.10]
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Objects (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 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])1 +$services.localization.render('platform.core.profile.title', ["$!doc.getValue('first_name') $!doc.getValue('last_name')"]) - Content
-
... ... @@ -8,37 +8,28 @@ 8 8 ## Setting categories 9 9 ######################### 10 10 #set($categories = []) 11 -#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet' , 'glyphicon': 'user'}))11 +#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet'})) 12 12 #set($isMyProfile = ($services.model.resolveDocument($xcontext.user) == $doc.documentReference)) 13 13 #if($isMyProfile || $hasAdmin) 14 - #set($discard = $categories.add({'id':'preferences', 'sheet':'XWiki.XWikiUserPreferencesSheet' , 'glyphicon': 'wrench'}))14 + #set($discard = $categories.add({'id':'preferences', 'sheet':'XWiki.XWikiUserPreferencesSheet'})) 15 15 #end 16 -#set($discard = $categories.add({'id':'groups', 'sheet':'XWiki.XWikiUserMembershipSheet', 'glyphicon': 'group'})) 17 17 ## TODO: add APIs to be able to display users watchlists to admins 18 -#if($isMyProfile && $hasWatch) 19 - #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet' , 'glyphicon': 'eye'}))17 +#if($isMyProfile && $hasWatch) 18 + #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet'})) 20 20 #end 21 21 #if($isMyProfile) 22 - #if ("$!services.notification.watch" != '' || $hasWatch) 23 - #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'world'})) 24 - #end 25 - ## TODO: add an enhancement system instead 26 - #set($notificationsSheet = $services.model.createDocumentReference('', ['XWiki', 'Notifications', 'Code'], 'XWikiUserNotificationsSheet')) 27 - #if ($xwiki.exists($notificationsSheet)) 28 - #set($discard = $categories.add({'id':'notifications', 'sheet':'XWiki.Notifications.Code.XWikiUserNotificationsSheet', 'glyphicon': 'bell'})) 29 - #end 21 + #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet'})) 30 30 #end 31 -#set($userW ikiSheet = 'WikiManager.UserWikiSheet')32 -#if($xcontext.isMainWiki() && $xwiki.exists($userW ikiSheet))23 +#set($userWorkspaceSheet = 'WorkspaceManager.UserWorkspaceSheet') 24 +#if($xcontext.isMainWiki() && $xwiki.exists($userWorkspaceSheet)) 33 33 #set($discard = $categories.add({ 34 - 'id': 'wikis', 35 - 'name': $services.localization.render('platform.wiki.menu.userwikis'), 36 - 'sheet': $userWikiSheet, 37 - 'glyphicon': 'list' 26 + 'id': 'workspaces', 27 + 'name': $services.localization.render('workspacemanager.profile.category.workspaces'), 28 + 'sheet': $userWorkspaceSheet 38 38 })) 39 39 #end 40 40 #if($isMyProfile && $hasDashboard) 41 - #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet' , 'glyphicon': 'th'}))32 + #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet'})) 42 42 #end 43 43 ######################### 44 44 ## Current category ... ... @@ -45,7 +45,7 @@ 45 45 ######################### 46 46 #set($currentCategory = "$!request.category") 47 47 #if($currentCategory == "") 48 - #set($currentCategory = $categories [0].get('id'))39 + #set($currentCategory = $listtool.get($categories, 0).get('id')) 49 49 #end 50 50 ######################### 51 51 ## Creating vertical menu ... ... @@ -76,13 +76,10 @@ 76 76 ((( 77 77 #if($request.xpage == 'edituser') 78 78 {{html clean="false"}} 79 - #resizedUserAvatar($doc.fullName 1 80)70 + #resizedUserAvatar($doc.fullName 170) 80 80 {{/html}} 81 81 #else 82 - ## By specifying the image width we enable server side resizing. The width value we use is greater than the 83 - ## available space because we don't want to loose too much of the image quality (we rely on the browser to fit the 84 - ## image in the available space). 85 - {{attachmentSelector classname="XWiki.XWikiUsers" object="$obj.number" property="avatar" #if ($isMyProfile) 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"/}} 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"/}} 86 86 #end 87 87 ))) 88 88 ########## ... ... @@ -114,8 +114,13 @@ 114 114 ######################### 115 115 {{html clean="false"}} 116 116 #if($xcontext.action == 'edit' || $xcontext.action == 'inline') 117 - <input type='hidden' name='category' value="$!{ escapetool.xml($currentCategory)}" />105 + <input type='hidden' name='category' value="$!{currentCategory}" /> 118 118 #end 119 119 <div class="clearfloats"> </div> 108 + #if($request.get('xpage')) 109 + <script type="text/javascript"> 110 + document.fire('lightbox:userprofile:loaded'); 111 + </script> 112 + #end 120 120 {{/html}} 121 121 {{/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 } ... ... @@ -11,29 +11,17 @@ 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 , true);14 + this.switchTab(tabElement.id); 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'); 21 21 }.bind(this)); 22 22 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); 34 34 }, 35 35 36 - switchTab : function(tab , pushHistory) {24 + switchTab : function(tab) { 37 37 var tabName = tab.substring(14); // 14 = len('vertical-menu-') 38 38 $("user-page-content").select("div.user-page-pane").each(function(pane){ 39 39 pane.addClassName('hidden'); ... ... @@ -44,11 +44,7 @@ 44 44 }); 45 45 $(tab).addClassName('current'); 46 46 this.updateCategoryFields(tab); 47 - if (pushHistory) { 48 - this.updateURL(tabName); 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) { ... ... @@ -59,17 +59,6 @@ 59 59 this.updateField('category', category); 60 60 }, 61 61 62 - updateURL : function (category) { 63 - if (history.pushState) { 64 - var params = window.location.search.toQueryParams(); 65 - params.category = category; 66 - 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 - 73 73 updateField : function (fieldName, value) { 74 74 var element = $$('input[name=' + fieldName + ']'); 75 75 if (element && element.size() > 0) { ... ... @@ -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 - }); 67 +var init = function() { 68 + 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);72 +document.observe('lightbox:userprofile:loaded', init); 102 102 // End XWiki augmentation. 103 103 return XWiki; 104 104 }(XWiki || {}));
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -6,10 +6,6 @@ 6 6 width: 13em; 7 7 } 8 8 9 -#avatar p { 10 - text-align: center; 11 -} 12 - 13 13 #avatar img { 14 14 border: 1px solid $theme.borderColor; 15 15 border-radius: 5px 5px 5px 5px; ... ... @@ -44,11 +44,11 @@ 44 44 content: url("$xwiki.getSkinFile('icons/silk/application_view_tile.png')"); 45 45 } 46 46 47 -.profile-menu .user-menu-w ikis:before{43 +.profile-menu .user-menu-workspaces:before{ 48 48 content: url("$xwiki.getSkinFile('icons/silk/chart_organisation.png')"); 49 49 } 50 50 51 -. skin-colibri .profile-menu .group.user-menu-title{47 +.profile-menu .group.user-menu-title{ 52 52 #set ($menuIcon = "url(${escapetool.S}$xwiki.getSkinFile('icons/silk/user.png')${escapetool.S})") 53 53 #css3_backgroundIconAndLinearGradient($menuIcon, { 54 54 'to': 'bottom', ... ... @@ -72,6 +72,11 @@ 72 72 margin-left: 14em; 73 73 } 74 74 71 +#user-page-content h1{ 72 + margin: 0 0 20px 0; 73 +} 74 + 75 + 75 75 .column h1 { 76 76 font-weight:bold; 77 77 font-size:115%; ... ... @@ -115,14 +115,6 @@ 115 115 background-color: $theme.backgroundSecondaryColor; 116 116 } 117 117 118 -.userInfo { 119 - -ms-word-break: break-all; /* IE8, IE9 */ 120 -} 121 - 122 -.userInfo a { 123 - word-wrap: break-word; 124 -} 125 - 126 126 .userInfo img { 127 127 max-width: 100%; 128 128 } ... ... @@ -150,6 +150,24 @@ 150 150 font-weight: bold; 151 151 } 152 152 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 + 153 153 span#avatarUpload { 154 154 display:block; 155 155 width:$tabswidth; ... ... @@ -213,6 +213,8 @@ 213 213 background: url("$xwiki.getSkinFile('icons/silk/picture_edit.png')") no-repeat center center $theme.pageContentBackgroundColor !important; 214 214 border: 0 none !important; 215 215 border-bottom-left-radius: 8px; 227 + -moz-border-radius-bottomleft: 8px; 228 + -webkit-border-bottom-left-radius: 8px; 216 216 height: 18px; 217 217 position: absolute; 218 218 right: 0; ... ... @@ -226,7 +226,6 @@ 226 226 ## -------------------------------------- 227 227 ## Dashboard 228 228 /* prevent the clearfloats between buttons & dashboard gadgets from clearing the tabs as well, only the buttons float */ 229 -.dashboard .clearfloats, 230 -.dashboard .clearfloats:after, .dashboard .clearfloats:before { 242 +.dashboard .clearfloats { 231 231 clear: right; 232 232 }