9 Aug
2008
9 Aug
'08
2:34 p.m.
Maybe this requires a jira issue for Albatross skin too?
I know it's a bit of a pain but since we're releasing them separately...
Maybe it's a signal that the skins are not very well separated from
the core?
Thanks
-Vincent
On Aug 6, 2008, at 6:50 PM, jvdrean (SVN) wrote:
Author: jvdrean
Date: 2008-08-06 18:50:08 +0200 (Wed, 06 Aug 2008)
New Revision: 11689
Modified:
platform/skins/trunk/albatross/src/main/resources/albatross/
print.css
platform/web/trunk/standard/src/main/webapp/templates/stylesheets.vm
Log:
XWIKI-2335 : Printing without using the print template only prints
the first page
Applied patch from Evelina Slatineanu with a small modification.
Modified: platform/skins/trunk/albatross/src/main/resources/
albatross/print.css
===================================================================
--- platform/skins/trunk/albatross/src/main/resources/albatross/
print.css 2008-08-06 15:12:06 UTC (rev 11688)
+++ platform/skins/trunk/albatross/src/main/resources/albatross/
print.css 2008-08-06 16:50:08 UTC (rev 11689)
@@ -17,4 +17,16 @@
padding: 10px;
text-align: justify;
float: none !important;
-}
\ No newline at end of file
+}
+#rightPanels, #leftPanels, #actionmenu {
+ display: none;
+}
+#globallinks {
+ display: none;
+}
+#headerspace {
+ margin:0 !important;
+}
+#contentcolumn .main {
+ margin:0 !important;
+}
Modified: platform/web/trunk/standard/src/main/webapp/templates/
stylesheets.vm
===================================================================
--- platform/web/trunk/standard/src/main/webapp/templates/
stylesheets.vm 2008-08-06 15:12:06 UTC (rev 11688)
+++ platform/web/trunk/standard/src/main/webapp/templates/
stylesheets.vm 2008-08-06 16:50:08 UTC (rev 11689)
@@ -4,10 +4,8 @@
#set ( $defaultstyle = "style.css" )
#end
#set( $defaultStyleURL = $xwiki.getSkinFile($defaultstyle, true) )
-<link href="$defaultStyleURL" rel="stylesheet"
type="text/css" />
-#if ( $printss )
- <link href="$xwiki.getSkinFile("print.css", true)"
rel="stylesheet" type="text/css"/>
-#end
+<link href="$defaultStyleURL" rel="stylesheet"
type="text/css"
media="all" />
+<link href="$xwiki.getSkinFile("print.css", true)"
rel="stylesheet"
type="text/css" media="print" />
## The stylesheets configuration option allows to override the
alternate stylesheets
## style1.css, style2.css and style3.css
#set ( $stylesheets = $xwiki.getWebPreference("stylesheets") )