Changes for page Profile of XWikiUserSheet

Summary

• Page properties (2 modified, 0 added, 0 removed)
• Objects (2 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]
  • XWiki.StyleSheetExtension[0]

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-xwiki:XWiki.ludovic
	1	+xwiki:XWiki.ThomasMortagne

Content

...	...	@@ -15,17 +15,10 @@
15	15	#end
16	16	## TODO: add APIs to be able to display users watchlists to admins
17	17	#if($isMyProfile && $hasWatch)
18		- #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet', 'glyphicon': 'eye'}))
	18	+ #set($discard = $categories.add({'id':'watchlist', 'sheet':'XWiki.XWikiUserWatchListSheet', 'glyphicon': 'eye-open'}))
19	19	#end
20	20	#if($isMyProfile)
21		- #if ("$!services.notification.watch" != '' || $hasWatch)
22		- #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'world'}))
23		- #end
24		- ## TODO: add an enhancement system instead
25		- #set($notificationsSheet = $services.model.createDocumentReference('', ['XWiki', 'Notifications', 'Code'], 'XWikiUserNotificationsSheet'))
26		- #if ($xwiki.exists($notificationsSheet))
27		- #set($discard = $categories.add({'id':'notifications', 'sheet':'XWiki.Notifications.Code.XWikiUserNotificationsSheet', 'glyphicon': 'bell'}))
28		- #end
	21	+ #set($discard = $categories.add({'id':'network', 'sheet':'XWiki.XWikiUserNetworkSheet', 'glyphicon': 'globe'}))
29	29	#end
30	30	#set($userWikiSheet = 'WikiManager.UserWikiSheet')
31	31	#if($xcontext.isMainWiki() && $xwiki.exists($userWikiSheet))
...	...	@@ -75,13 +75,10 @@
75	75	(((
76	76	#if($request.xpage == 'edituser')
77	77	{{html clean="false"}}
78		- #resizedUserAvatar($doc.fullName 180)
	71	+ #resizedUserAvatar($doc.fullName 170)
79	79	{{/html}}
80	80	#else
81		- ## By specifying the image width we enable server side resizing. The width value we use is greater than the
82		- ## available space because we don't want to loose too much of the image quality (we rely on the browser to fit the
83		- ## image in the available space).
84		- {{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"/}}
	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"/}}
85	85	#end
86	86	)))
87	87	##########

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -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) {

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;