Skip to Content

Changes for page Profile of XWikiUserSheet

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

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.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')"])
Author
... ... @@ -1,1 +1,1 @@
1 -xwiki:XWiki.ThomasMortagne
1 +xwiki:XWiki.ludovic
Content
... ... @@ -8,29 +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 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'}))
17 +#if($isMyProfile && $hasWatch)
18 + #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet'}))
19 19  #end
20 20  #if($isMyProfile)
21 - #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'globe'}))
21 + #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet'}))
22 22  #end
23 -#set($userWikiSheet = 'WikiManager.UserWikiSheet')
24 -#if($xcontext.isMainWiki() && $xwiki.exists($userWikiSheet))
23 +#set($userWorkspaceSheet = 'WorkspaceManager.UserWorkspaceSheet')
24 +#if($xcontext.isMainWiki() && $xwiki.exists($userWorkspaceSheet))
25 25   #set($discard = $categories.add({
26 - 'id': 'wikis',
27 - 'name': $services.localization.render('platform.wiki.menu.userwikis'),
28 - 'sheet': $userWikiSheet,
29 - 'glyphicon': 'list'
26 + 'id': 'workspaces',
27 + 'name': $services.localization.render('workspacemanager.profile.category.workspaces'),
28 + 'sheet': $userWorkspaceSheet
30 30   }))
31 31  #end
32 32  #if($isMyProfile && $hasDashboard)
33 - #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet', 'glyphicon': 'th'}))
32 + #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet'}))
34 34  #end
35 35  #########################
36 36  ## Current category
... ... @@ -37,7 +37,7 @@
37 37  #########################
38 38  #set($currentCategory = "$!request.category")
39 39  #if($currentCategory == "")
40 - #set($currentCategory = $categories[0].get('id'))
39 + #set($currentCategory = $listtool.get($categories, 0).get('id'))
41 41  #end
42 42  #########################
43 43  ## Creating vertical menu
... ... @@ -103,7 +103,7 @@
103 103  #########################
104 104  {{html clean="false"}}
105 105   #if($xcontext.action == 'edit' || $xcontext.action == 'inline')
106 - <input type='hidden' name='category' value="$!{escapetool.xml($currentCategory)}" />
105 + <input type='hidden' name='category' value="$!{currentCategory}" />
107 107   #end
108 108   <div class="clearfloats">&nbsp;</div>
109 109   #if($request.get('xpage'))
XWiki.StyleSheetExtension[0]
Code
... ... @@ -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-wikis:before{
43 +.profile-menu .user-menu-workspaces:before{
44 44   content: url("$xwiki.getSkinFile('icons/silk/chart_organisation.png')");
45 45  }
46 46  
47 -.skin-colibri .profile-menu .group.user-menu-title{
47 +.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,6 +68,11 @@
68 68   margin-left: 14em;
69 69  }
70 70  
71 +#user-page-content h1{
72 + margin: 0 0 20px 0;
73 +}
74 +
75 +
71 71  .column h1 {
72 72   font-weight:bold;
73 73   font-size:115%;
... ... @@ -111,14 +111,6 @@
111 111   background-color: $theme.backgroundSecondaryColor;
112 112  }
113 113  
114 -.userInfo {
115 - -ms-word-break: break-all; /* IE8, IE9 */
116 -}
117 -
118 -.userInfo a {
119 - word-wrap: break-word;
120 -}
121 -
122 122  .userInfo img {
123 123   max-width: 100%;
124 124  }
... ... @@ -146,6 +146,24 @@
146 146   font-weight: bold;
147 147  }
148 148  
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 +
149 149  span#avatarUpload {
150 150   display:block;
151 151   width:$tabswidth;
... ... @@ -209,6 +209,8 @@
209 209   background: url("$xwiki.getSkinFile('icons/silk/picture_edit.png')") no-repeat center center $theme.pageContentBackgroundColor !important;
210 210   border: 0 none !important;
211 211   border-bottom-left-radius: 8px;
227 + -moz-border-radius-bottomleft: 8px;
228 + -webkit-border-bottom-left-radius: 8px;
212 212   height: 18px;
213 213   position: absolute;
214 214   right: 0;
... ... @@ -222,7 +222,6 @@
222 222  ## --------------------------------------
223 223  ## Dashboard
224 224  /* prevent the clearfloats between buttons & dashboard gadgets from clearing the tabs as well, only the buttons float */
225 -.dashboard .clearfloats,
226 -.dashboard .clearfloats:after, .dashboard .clearfloats:before {
242 +.dashboard .clearfloats {
227 227   clear: right;
228 228  }