Author: vmassol
Date: 2008-02-06 21:18:29 +0100 (Wed, 06 Feb 2008)
New Revision: 7325

Modified:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
Log:
XSALBATROSS-4: Provide CSS hooks to allow to style pages differently depending 
on sub wikis
Patch from Laurent Lunati


Modified: 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm 
    2008-02-06 20:17:10 UTC (rev 7324)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/htmlheader.vm 
    2008-02-06 20:18:29 UTC (rev 7325)
@@ -6,7 +6,6 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="$context.language" 
xml:lang="$context.language">
   <head>
-
     <title>
     #if(!$title)
       #set( $title = $!xwiki.getWebPreference("title"))
@@ -19,36 +18,27 @@
       $title
     #end
     </title>
-
     <meta http-equiv="Content-Type" content="text/html; 
charset=$xwiki.encoding" />
     <meta http-equiv="imagetoolbar" content="no"/>
     $xwiki.parseContent($!xwiki.getWebPreference("meta"))
-
     #template("stylesheets.vm")
     #template("analytics.vm")
     #template("javascript.vm")
-
   </head>
-
   #if(($context.action=="inline")||($context.action=="edit") || 
($context.action=="admin"))
-    <body onunload="cancelEdit();"
-          onload="prepareCancelEdit(); createColorPicker();" id="body" 
class="${context.action}body">
+    <body onunload="return false; cancelEdit()"
+          onload="prepareCancelEdit(); createColorPicker();" id="body" 
class="$context.database ${context.action}body #if($showLeftPanels == 
"0")hideleft#end#if($showRightPanels == "0")hideright#end#if($hidecolumns && 
($!hidecolumns == 1))hidelefthideright#end">
   #else
-    <body id="body" class="${context.action}body">
+    <body id="body" class="$context.database ${context.action}body 
#if($showLeftPanels == "0")hideleft#end#if($showRightPanels == 
"0")hideright#end#if($hidecolumns && ($!hidecolumns == 
1))hidelefthideright#end">
   #end
-
 #else
-
   #template("stylesheets2.vm")
   #template("javascript.vm")
-
   <!-- This is a hack for Exo which needs this for the XWiki portlet to fit in 
the Portlet window
        properly. In the future Exo should modifies its behavior so that this 
is not necessary and
        this will need to be removed -->
   <div class="UIApplication" style="overflow: auto">
-
 #end
-
 <!-- These elements will be closed in the footer vm file -->
 <div id="xwikimaincontainer">
-<div id="xwikimaincontainerinner">
+<div id="xwikimaincontainerinner">
\ No newline at end of file

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to