Re: [xwiki-devs] [xwiki-notifications] r35662 - platform/xwiki-applications/trunk/administration/src/main/resources/XWiki

Author: sdumitriu Date: 2011-03-17 02:31:42 +0100 (Thu, 17 Mar 2011) New Revision: 35662 Modified: platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiUserSheet.xml Log: XAADMINISTRATION-257: Improve the UI for changing the user's avatar Done. Patch from Marta Girdea applied without changes. Modified: platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiUserSheet.xml =================================================================== --- platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiUserSheet.xml 2011-03-17 00:54:43 UTC (rev 35661) +++ platform/xwiki-applications/trunk/administration/src/main/resources/XWiki/XWikiUserSheet.xml 2011-03-17 01:31:42 UTC (rev 35662) @@ -3,7 +3,7 @@ <web>XWiki</web> <name>XWikiUserSheet</name> <language></language> -<defaultLanguage>en</defaultLanguage> +<defaultLanguage></defaultLanguage> <translation>0</translation> <parent>Main.XWikiUsers</parent> <creator>xwiki:XWiki.Admin</creator> @@ -167,11 +167,6 @@ userprofile : { init : function() { - if ($('avatar')) { - Event.observe($('avatar'), 'mouseover', function() { XWiki.userprofile.displayChangePhoto('true') }); - Event.observe($('avatar'), 'mouseout', function() { XWiki.userprofile.displayChangePhoto('false') }); - XWiki.userprofile.adjustTabsContainerHeight(); - } this.tabsContainer = $('vertical-tabs'); this.tabsContainer.select('.vertical-tab').each(function (tabElement) { if (!tabElement.__name) { @@ -185,6 +180,7 @@ this.tabsContainer.select('.vertical-tab.active').each(function (activeTab) { document.fire('xwiki:profile:switchedCategory', {'category' : activeTab.__name}); }); + XWiki.userprofile.adjustTabsContainerHeight(); }, /* @@ -207,15 +203,6 @@ } }, - displayChangePhoto : function(display) { - var changePhoto = $('avatarUpload'); - if (display == true) { - changePhoto.removeClassName('hidden'); - } else { - changePhoto.addClassName('hidden'); - } - }, - switchTab : function(tab) { $("vertical-panes").select("div.vertical-pane").each(function(pane){ pane.addClassName('hidden'); @@ -537,6 +524,38 @@ float: right; margin-right: -16px; padding: 0; +} +## -------------------------------------- +## Picker style +.attachment-picker { + position: relative; +} +.attachment-picker p { + padding: 0; + margin: 0; +} + +.attachment-picker .picture { + z-index: -1; +} +.attachment-picker .buttonwrapper { + margin: 0; +} + +.attachment-picker-start { + background: url("$xwiki.getSkinFile('icons/silk/picture_edit.gif')") no-repeat center center $theme.pageContentBackgroundColor !important; + border: 0 none !important; + border-radius-bottomleft: 8px; + -moz-border-radius-bottomleft: 8px; + -webkit-border-radius-bottomleft: 8px; + height: 18px; + position: absolute; + right: 0; + text-align: left; + text-indent: -9999px; + top: 0; + width: 18px !important; + z-index: 1; }</code> </property> <property> @@ -569,20 +588,6 @@ #if($isMyProfile &amp;&amp; $hasWatch) #set($discard = $categories.add(['watchlist', $msg.get('platform.core.profile.category.watchlist'), 'XWiki.XWikiUserWatchListSheet', 'icons/silk/star.gif'])) #end -## -## Avatar -## -#set($avatarURL = '') -#if($obj.getProperty("avatar") &amp;&amp; $obj.getProperty("avatar").getValue() != '') - #foreach ($attach in $doc.attachmentList) - #if($attach.filename == $obj.getProperty("avatar").getValue()) - #set($avatarURL = "$doc.getAttachmentURL($attach.filename, 'download', 'width=120')") - #end - #end -#end -#if("$!avatarURL" == '') - #set($avatarURL = $xwiki.getDocument("XWiki.XWikiUserSheet").getAttachmentURL('noavatar.png', 'download', 'width=120')) -#end #if ($isMyProfile) #set ($discard = $categories.add(['network', $msg.get('platform.core.profile.category.network'), 'XWiki.XWikiUserNetworkSheet', 'icons/silk/group.gif'])) #end @@ -603,9 +608,12 @@ ## &lt;div id="vertical-tabs"&gt; &lt;div id="avatar"&gt; - &lt;span id="avatarUpload" class="hidden"&gt;$msg.get('platform.core.profile.changePhoto')&lt;/span&gt; - &lt;a href="$doc.getURL('edit', 'xpage=changemyavatar')" &gt;&lt;img class="photo" id="xwikiuseravatar" alt="$doc.display('first_name', 'view', $obj)" src="$avatarURL"/&gt;&lt;/a&gt; - &lt;/div&gt; +{{/html}} + +{{attachmentSelector classname="XWiki.XWikiUsers" object="$obj.number" property="avatar" #if ($isMyProfile) savemode="direct" #end defaultValue=&quot;XWiki.XWikiUserSheet(a)noavatar.png&quot; width="120" alternateText="$xwiki.getUserName($doc.fullName, false)" buttontext="$msg.get('platform.core.profile.changePhoto')" displayImage="true" filter="png,jpg,gif"/}} + +{{html clean="false"}} + &lt;/div&gt;## avatar &lt;div&gt; &lt;ul&gt; #foreach($tab in $categories)