Main

Thomas Mortagne Sat, 25 Sep 2010 05:51:46 -0700

On Sat, Sep 25, 2010 at 14:50, Thomas Mortagne
<[email protected]> wrote:
> On Sat, Sep 25, 2010 at 14:44, sdumitriu
> <[email protected]> wrote:
>> Author: sdumitriu
>> Date: 2010-09-25 14:44:23 +0200 (Sat, 25 Sep 2010)
>> New Revision: 31359
>>
>> Modified:
>>   enterprise/trunk/wiki/src/main/resources/Main/Spaces.xml
>> Log:
>> XE-542: Apache proxy breaks icons on the Dashboard.
>> Fixed.
>>
>> Modified: enterprise/trunk/wiki/src/main/resources/Main/Spaces.xml
>> ===================================================================
>> --- enterprise/trunk/wiki/src/main/resources/Main/Spaces.xml    2010-09-25 
>> 09:59:48 UTC (rev 31358)
>> +++ enterprise/trunk/wiki/src/main/resources/Main/Spaces.xml    2010-09-25 
>> 12:44:23 UTC (rev 31359)
>> @@ -191,16 +191,16 @@
>>           &lt;div 
>> class="spSpaceName"&gt;[[${space}&gt;&gt;${space}.WebHome]]&lt;/div&gt;
>>           &lt;div class="xshowonhover spSpaceActions"&gt;
>>             ## Link to the space index.
>> -            &lt;a href="$xwiki.getURL('Main.SpaceIndex', 'view', 
>> "space=$escapetool.url($space)")" 
>> title="$msg.get('xe.spaces.action.index')"&gt;
>> -              &lt;img src="$xwiki.getSkinFile('icons/silk/book_open.gif')" 
>> alt="$msg.get('xe.spaces.action.index.alt')"/&gt;
>> +            &lt;a href="{{html 
>> wiki="false"}}$xwiki.getURL('Main.SpaceIndex', 'view', 
>> "space=$escapetool.url($space)"){{/html}}" 
>> title="$msg.get('xe.spaces.action.index')"&gt;
>
> Note that wiki=false is alre


(sorry, Gmail shortcuts) Note that wiki=false is already the default

>
>> +              &lt;img src="{{html 
>> wiki="false"}}$xwiki.getSkinFile('icons/silk/book_open.gif'){{/html}}" 
>> alt="$msg.get('xe.spaces.action.index.alt')"/&gt;
>>             &lt;/a&gt;
>>             ## If the user has admin right on the space display links to 
>> administration and delete.
>>             #if($xwiki.hasAccessLevel('admin', "${space}.XWikiPreferences"))
>> -              &lt;a href="$xwiki.getURL("${space}.WebPreferences", 
>> 'admin')" title="$msg.get('xe.spaces.action.admin')"&gt;
>> -                &lt;img src="$xwiki.getSkinFile('icons/silk/cog.gif')" 
>> alt="$msg.get('xe.spaces.action.admin.alt')"/&gt;
>> +              &lt;a href="{{html 
>> wiki="false"}}$xwiki.getURL("${space}.WebPreferences", 'admin'){{/html}}" 
>> title="$msg.get('xe.spaces.action.admin')"&gt;
>> +                &lt;img src="{{html 
>> wiki="false"}}$xwiki.getSkinFile('icons/silk/cog.gif'){{/html}}" 
>> alt="$msg.get('xe.spaces.action.admin.alt')"/&gt;
>>               &lt;/a&gt;
>> -              ## &lt;a href="#" onclick="confirm('ALL THE PAGES WITHIN THE 
>> SPACE &amp;ldquo;${space}&amp;rdquo; WILL BE DELETED, are you sure that you 
>> want to continue ?'); this.href='$spaceListDoc.getURL('view', 
>> "deleteSpace=${space}&amp;amp;xredirect=$doc.getExternalURL()&amp;amp;form_token=$!{services.csrf.getToken()}")'"
>>  title="$msg.get('xe.spaces.action.delete')"&gt;
>> -              ##   &lt;img src="$xwiki.getSkinFile('icons/silk/cross.gif')" 
>> alt="$msg.get('xe.spaces.action.delete.alt')" /&gt;
>> +              ## &lt;a href="#" onclick="confirm('ALL THE PAGES WITHIN THE 
>> SPACE &amp;ldquo;${space}&amp;rdquo; WILL BE DELETED, are you sure that you 
>> want to continue ?'); this.href='{{html 
>> wiki="false"}}$spaceListDoc.getURL('view', 
>> "deleteSpace=${space}&amp;amp;xredirect=$doc.getExternalURL()&amp;amp;form_token=$!{services.csrf.getToken()}"){{/html}}'"
>>  title="$msg.get('xe.spaces.action.delete')"&gt;
>> +              ##   &lt;img src="{{html 
>> wiki="false"}}$xwiki.getSkinFile('icons/silk/cross.gif'){{/html}}" 
>> alt="$msg.get('xe.spaces.action.delete.alt')" /&gt;
>>               ## &lt;/a&gt;
>>             #end
>>           &lt;/div&gt;
>> @@ -215,10 +215,10 @@
>>   #if($xwiki.hasAdminRights())
>>     &lt;li id="spSpaceCreateItem" class="xitem space"&gt;
>>       &lt;div class="xitemcontainer"&gt;
>> -        &lt;div id="spSpaceCreateLabel" class="spSpaceName"&gt;&lt;a 
>> href="$xwiki.getURL('XWiki.CreatePage', 'view', 'tocreate=space')" 
>> onclick="toggleClass($('spSpaceCreateForm'), 'hidden'); return 
>> false;"&gt;$msg.get('xe.spaces.createspace')&lt;/a&gt;&lt;/div&gt;
>> +        &lt;div id="spSpaceCreateLabel" class="spSpaceName"&gt;&lt;a 
>> href="{{html wiki="false"}}$xwiki.getURL('XWiki.CreatePage', 'view', 
>> 'tocreate=space'){{/html}}" onclick="toggleClass($('spSpaceCreateForm'), 
>> 'hidden'); return 
>> false;"&gt;$msg.get('xe.spaces.createspace')&lt;/a&gt;&lt;/div&gt;
>>         &lt;div class="spacer"&gt;&amp;nbsp;&lt;/div&gt;
>>         &lt;div id="spSpaceCreateForm" class="hidden"&gt;
>> -          &lt;form method="post" action="$doc.getURL('view', 
>> 'xpage=create')"&gt;
>> +          &lt;form method="post" action="{{html 
>> wiki="false"}}$doc.getURL('view', 'xpage=create'){{/html}}"&gt;
>>             &lt;div&gt;
>>               &lt;input name="tocreate" type="hidden" value="space" /&gt;
>>               #set($newSpaceName = 
>> $escapetool.xml($msg.get('xe.spaces.createspace.defaultname')))
>>
>> _______________________________________________
>> notifications mailing list
>> [email protected]
>> http://lists.xwiki.org/mailman/listinfo/notifications
>>
>
>
>
> --
> Thomas Mortagne
>



-- 
Thomas Mortagne
_______________________________________________
devs mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/devs

Re: [xwiki-devs] [xwiki-notifications] r31359 - enterprise/trunk/wiki/src/main/resources/Main

Reply via email to