Re: [xwiki-devs] [xwiki-notifications] r31359 - enterprise/trunk/wiki/src/main/resources/Main
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 @@ <div class="spSpaceName">[[${space}>>${space}.WebHome]]</div> <div class="xshowonhover spSpaceActions"> ## Link to the space index. - <a href="$xwiki.getURL('Main.SpaceIndex', 'view', "space=$escapetool.url($space)")" title="$msg.get('xe.spaces.action.index')"> - <img src="$xwiki.getSkinFile('icons/silk/book_open.gif')" alt="$msg.get('xe.spaces.action.index.alt')"/> + <a href="{{html wiki="false"}}$xwiki.getURL('Main.SpaceIndex', 'view', "space=$escapetool.url($space)"){{/html}}" title="$msg.get('xe.spaces.action.index')">
Note that wiki=false is alre
(sorry, Gmail shortcuts) Note that wiki=false is already the default
+ <img src="{{html wiki="false"}}$xwiki.getSkinFile('icons/silk/book_open.gif'){{/html}}" alt="$msg.get('xe.spaces.action.index.alt')"/> </a> ## If the user has admin right on the space display links to administration and delete. #if($xwiki.hasAccessLevel('admin', "${space}.XWikiPreferences")) - <a href="$xwiki.getURL("${space}.WebPreferences", 'admin')" title="$msg.get('xe.spaces.action.admin')"> - <img src="$xwiki.getSkinFile('icons/silk/cog.gif')" alt="$msg.get('xe.spaces.action.admin.alt')"/> + <a href="{{html wiki="false"}}$xwiki.getURL("${space}.WebPreferences", 'admin'){{/html}}" title="$msg.get('xe.spaces.action.admin')"> + <img src="{{html wiki="false"}}$xwiki.getSkinFile('icons/silk/cog.gif'){{/html}}" alt="$msg.get('xe.spaces.action.admin.alt')"/> </a> - ## <a href="#" onclick="confirm('ALL THE PAGES WITHIN THE SPACE “${space}” WILL BE DELETED, are you sure that you want to continue ?'); this.href='$spaceListDoc.getURL('view', "deleteSpace=${space}&xredirect=$doc.getExternalURL()&form_token=$!{services.csrf.getToken()}")'" title="$msg.get('xe.spaces.action.delete')"> - ## <img src="$xwiki.getSkinFile('icons/silk/cross.gif')" alt="$msg.get('xe.spaces.action.delete.alt')" /> + ## <a href="#" onclick="confirm('ALL THE PAGES WITHIN THE SPACE “${space}” WILL BE DELETED, are you sure that you want to continue ?'); this.href='{{html wiki="false"}}$spaceListDoc.getURL('view', "deleteSpace=${space}&xredirect=$doc.getExternalURL()&form_token=$!{services.csrf.getToken()}"){{/html}}'" title="$msg.get('xe.spaces.action.delete')"> + ## <img src="{{html wiki="false"}}$xwiki.getSkinFile('icons/silk/cross.gif'){{/html}}" alt="$msg.get('xe.spaces.action.delete.alt')" /> ## </a> #end </div> @@ -215,10 +215,10 @@ #if($xwiki.hasAdminRights()) <li id="spSpaceCreateItem" class="xitem space"> <div class="xitemcontainer"> - <div id="spSpaceCreateLabel" class="spSpaceName"><a href="$xwiki.getURL('XWiki.CreatePage', 'view', 'tocreate=space')" onclick="toggleClass($('spSpaceCreateForm'), 'hidden'); return false;">$msg.get('xe.spaces.createspace')</a></div> + <div id="spSpaceCreateLabel" class="spSpaceName"><a href="{{html wiki="false"}}$xwiki.getURL('XWiki.CreatePage', 'view', 'tocreate=space'){{/html}}" onclick="toggleClass($('spSpaceCreateForm'), 'hidden'); return false;">$msg.get('xe.spaces.createspace')</a></div> <div class="spacer"> </div> <div id="spSpaceCreateForm" class="hidden"> - <form method="post" action="$doc.getURL('view', 'xpage=create')"> + <form method="post" action="{{html wiki="false"}}$doc.getURL('view', 'xpage=create'){{/html}}"> <div> <input name="tocreate" type="hidden" value="space" /> #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
participants (1)
-
Thomas Mortagne