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 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]

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.name)#{end}$services.localization.render('platform.core.profile.title', [$userName])
Author
... ... @@ -1,1 +1,1 @@
1 -xwiki:XWiki.ludovic
1 +xwiki:XWiki.ThomasMortagne
Content
... ... @@ -8,28 +8,29 @@
8 8  ## Setting categories
9 9  #########################
10 10  #set($categories = [])
11 -#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet'}))
11 +#set($discard = $categories.add({'id':'profile', 'sheet':'XWiki.XWikiUserProfileSheet', 'glyphicon': 'user'}))
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'}))
14 + #set($discard = $categories.add({'id':'preferences', 'sheet':'XWiki.XWikiUserPreferencesSheet', 'glyphicon': 'wrench'}))
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'}))
17 +#if($isMyProfile && $hasWatch)
18 + #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet', 'glyphicon': 'eye-open'}))
19 19  #end
20 20  #if($isMyProfile)
21 - #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet'}))
21 + #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'globe'}))
22 22  #end
23 -#set($userWorkspaceSheet = 'WorkspaceManager.UserWorkspaceSheet')
24 -#if($xcontext.isMainWiki() && $xwiki.exists($userWorkspaceSheet))
23 +#set($userWikiSheet = 'WikiManager.UserWikiSheet')
24 +#if($xcontext.isMainWiki() && $xwiki.exists($userWikiSheet))
25 25   #set($discard = $categories.add({
26 - 'id': 'workspaces',
27 - 'name': $services.localization.render('workspacemanager.profile.category.workspaces'),
28 - 'sheet': $userWorkspaceSheet
26 + 'id': 'wikis',
27 + 'name': $services.localization.render('platform.wiki.menu.userwikis'),
28 + 'sheet': $userWikiSheet,
29 + 'glyphicon': 'list'
29 29   }))
30 30  #end
31 31  #if($isMyProfile && $hasDashboard)
32 - #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet'}))
33 + #set($discard = $categories.add({'id':'dashboard', 'sheet':'Dashboard.XWikiUserDashboardSheet', 'glyphicon': 'th'}))
33 33  #end
34 34  #########################
35 35  ## Current category
... ... @@ -36,7 +36,7 @@
36 36  #########################
37 37  #set($currentCategory = "$!request.category")
38 38  #if($currentCategory == "")
39 - #set($currentCategory = $listtool.get($categories, 0).get('id'))
40 + #set($currentCategory = $categories[0].get('id'))
40 40  #end
41 41  #########################
42 42  ## Creating vertical menu
... ... @@ -102,7 +102,7 @@
102 102  #########################
103 103  {{html clean="false"}}
104 104   #if($xcontext.action == 'edit' || $xcontext.action == 'inline')
105 - <input type='hidden' name='category' value="$!{currentCategory}" />
106 + <input type='hidden' name='category' value="$!{escapetool.xml($currentCategory)}" />
106 106   #end
107 107   <div class="clearfloats">&nbsp;</div>
108 108   #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-workspaces:before{
43 +.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{
47 +.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,11 +68,6 @@
68 68   margin-left: 14em;
69 69  }
70 70  
71 -#user-page-content h1{
72 - margin: 0 0 20px 0;
73 -}
74 -
75 -
76 76  .column h1 {
77 77   font-weight:bold;
78 78   font-size:115%;
... ... @@ -116,6 +116,14 @@
116 116   background-color: $theme.backgroundSecondaryColor;
117 117  }
118 118  
114 +.userInfo {
115 + -ms-word-break: break-all; /* IE8, IE9 */
116 +}
117 +
118 +.userInfo a {
119 + word-wrap: break-word;
120 +}
121 +
119 119  .userInfo img {
120 120   max-width: 100%;
121 121  }
... ... @@ -143,24 +143,6 @@
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 165   display:block;
166 166   width:$tabswidth;
... ... @@ -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 {
225 +.dashboard .clearfloats,
226 +.dashboard .clearfloats:after, .dashboard .clearfloats:before {
243 243   clear: right;
244 244  }