[xwiki-dev] Re: [xwiki-commits] r2916 - in xwiki/trunk/web/standard/src/main/webapp: skins/albatross skins/dodo skins/finch templates
Ludovic Dubost
ludovic at xwiki.com
Mon Apr 23 10:22:25 CEST 2007
Hi,
The reason I did not add a task is that the change concerns a PDF
customization feature that was not documented in the XWIKI-1000 commit.
But it's right that the customization feature would not work without
these changes so it's better to have a task.
The task is XWIKI-1122 and the change has been commited to 1.0RC2
Ludovic
Vincent Massol a écrit :
> Hi Ludovic,
>
> You cannot do this as XWIKI-1000 is already closed (in B6)! So your
> change won't appear in the release notes of whatever version comes
> next You need a new JIRA issue for this.
>
> Thanks
> -Vincent
>
> PS: Ludovic, I think we really ought to talk about JIRA because if we
> do not all agree on how to use it, it's going to be a mess. I'm trying
> my best to maintain a consistent usage of it but I need everyone's
> help for that. I have the feeling that some of us do not agree or
> understand with the practices that we have set forth (proposed/votes
> for most of them). That's fine but in that case we need to discuss
> them openly and revisit them. I'd rather we all argeed on something
> than playing the "police" every time which is not a nice role to
> play... :)
>
> On Apr 20, 2007, at 11:49 PM, Ludovic Dubost wrote:
>
>> Author: ludovic
>> Date: 2007-04-20 23:49:55 +0200 (Fri, 20 Apr 2007)
>> New Revision: 2916
>>
>> Added:
>>
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdfhtmlheader.vm
>>
>> xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdfhtmlheader.vm
>> xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdfhtmlheader.vm
>> xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm
>> Modified:
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm
>> xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm
>> xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm
>> xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm
>> Log:
>> XWIKI-1000 missing pdf templates for improvements
>>
>> Modified:
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm
>> ===================================================================
>> ---
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -1,20 +1,32 @@
>> -#template("xwiki.vm")
>> -#template("httpheader.vm")
>> -#template("pdfheader.vm")
>> -<div id="xwikicontent">
>> -$cdoc.getRenderedContent()
>> -</div>
>> -#if ($request.get("comments")=="1")
>> -#template("comments2.vm")
>> -#end
>> -#if ($request.get("attachments")=="1")
>> -<div id="xwikiattachments">
>> -#foreach ($attach in $doc.attachmentList)
>> -#if ($attach.isImage())
>> -<img src="$doc.getAttachmentURL("${attach.filename}", "download")"
>> alt="${attach.filename}" />
>> -<br />
>> -#end
>> -#end
>> -</div>
>> -#end
>> -#template("pdffooter.vm")
>> +#template("xwiki.vm")
>> +$doc.use("XWiki.PDFClass")
>> +#template("pdfhtmlheader.vm")
>> +#set($pdfheader = $doc.display("header"))
>> +#if($pdfheader=="")
>> +#template("pdfheader.vm")
>> +#else
>> +$pdfheader
>> +#end
>> +<div id="xwikicontent">
>> +$cdoc.getRenderedContent()
>> +</div>
>> +#if ($request.get("comments")=="1")
>> +#template("comments2.vm")
>> +#end
>> +#if ($request.get("attachments")=="1")
>> +<div id="xwikiattachments">
>> +#foreach ($attach in $doc.attachmentList)
>> +#if ($attach.isImage())
>> +<img src="$doc.getAttachmentURL("${attach.filename}", "download")"
>> alt="${attach.filename}" />
>> +<br />
>> +#end
>> +#end
>> +</div>
>> +#end
>> +$doc.use("XWiki.PDFClass")
>> +#set($pdffooter = $doc.display("footer"))
>> +#if($pdffooter=="")
>> +#template("pdffooter.vm")
>> +#else
>> +$pdffooter
>> +#end
>> \ No newline at end of file
>>
>> Added:
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdfhtmlheader.vm
>>
>> ===================================================================
>> ---
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdfhtmlheader.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++
>> xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdfhtmlheader.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -0,0 +1,24 @@
>> +<?xml version="1.0" encoding="$xwiki.encoding" ?>
>> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
>> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
>> +<html xmlns="http://www.w3.org/1999/xhtml">
>> +<head>
>> +<title>
>> +$doc.use("XWiki.PDFClass")
>> +#set($title = $doc.display("title"))
>> +#if((!$title)||($title==""))
>> +#set( $title = $!xwiki.getWebPreference("title"))
>> +#if ( $title != "")
>> +$xwiki.parseContent($title)
>> +#else
>> +XWiki - $!doc.web - $!doc.displayTitle
>> +#end
>> +#else
>> +$title
>> +#end
>> +</title>
>> +<meta http-equiv="Content-Type" content="text/html;
>> charset=$xwiki.encoding" />
>> +</head>
>> +<body id="body" class="${context.action}body">
>> +<div id="xwikimaincontainer">
>> +<div id="xwikimaincontainerinner">
>>
>> Modified: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm
>> ===================================================================
>> --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -1,6 +1,12 @@
>> #template("xwiki.vm")
>> -#template("httpheader.vm")
>> +$doc.use("XWiki.PDFClass")
>> +#template("pdfhtmlheader.vm")
>> +#set($pdfheader = $doc.display("header"))
>> +#if($pdfheader=="")
>> #template("pdfheader.vm")
>> +#else
>> +$pdfheader
>> +#end
>> <div id="xwikicontent">
>> $cdoc.getRenderedContent()
>> </div>
>> @@ -17,4 +23,10 @@
>> #end
>> </div>
>> #end
>> +$doc.use("XWiki.PDFClass")
>> +#set($pdffooter = $doc.display("footer"))
>> +#if($pdffooter=="")
>> #template("pdffooter.vm")
>> +#else
>> +$pdffooter
>> +#end
>> \ No newline at end of file
>>
>> Added:
>> xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdfhtmlheader.vm
>> ===================================================================
>> ---
>> xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdfhtmlheader.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++
>> xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdfhtmlheader.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -0,0 +1,24 @@
>> +<?xml version="1.0" encoding="$xwiki.encoding" ?>
>> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
>> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
>> +<html xmlns="http://www.w3.org/1999/xhtml">
>> +<head>
>> +<title>
>> +$doc.use("XWiki.PDFClass")
>> +#set($title = $doc.display("title"))
>> +#if((!$title)||($title==""))
>> +#set( $title = $!xwiki.getWebPreference("title"))
>> +#if ( $title != "")
>> +$xwiki.parseContent($title)
>> +#else
>> +XWiki - $!doc.web - $!doc.displayTitle
>> +#end
>> +#else
>> +$title
>> +#end
>> +</title>
>> +<meta http-equiv="Content-Type" content="text/html;
>> charset=$xwiki.encoding" />
>> +</head>
>> +<body id="body" class="${context.action}body">
>> +<div id="xwikimaincontainer">
>> +<div id="xwikimaincontainerinner">
>>
>> Modified: xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm
>> ===================================================================
>> --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -1,20 +1,32 @@
>> -#template("xwiki.vm")
>> -#template("httpheader.vm")
>> -#template("pdfheader.vm")
>> -<div id="xwikicontent">
>> -$cdoc.getRenderedContent()
>> -</div>
>> -#if ($request.get("comments")=="1")
>> -#template("comments2.vm")
>> -#end
>> -#if ($request.get("attachments")=="1")
>> -<div id="xwikiattachments">
>> -#foreach ($attach in $doc.attachmentList)
>> -#if ($attach.isImage())
>> -<img src="$doc.getAttachmentURL("${attach.filename}", "download")"
>> alt="${attach.filename}" />
>> -<br />
>> -#end
>> -#end
>> -</div>
>> -#end
>> -#template("pdffooter.vm")
>> +#template("xwiki.vm")
>> +$doc.use("XWiki.PDFClass")
>> +#template("pdfhtmlheader.vm")
>> +#set($pdfheader = $doc.display("header"))
>> +#if($pdfheader=="")
>> +#template("pdfheader.vm")
>> +#else
>> +$pdfheader
>> +#end
>> +<div id="xwikicontent">
>> +$cdoc.getRenderedContent()
>> +</div>
>> +#if ($request.get("comments")=="1")
>> +#template("comments2.vm")
>> +#end
>> +#if ($request.get("attachments")=="1")
>> +<div id="xwikiattachments">
>> +#foreach ($attach in $doc.attachmentList)
>> +#if ($attach.isImage())
>> +<img src="$doc.getAttachmentURL("${attach.filename}", "download")"
>> alt="${attach.filename}" />
>> +<br />
>> +#end
>> +#end
>> +</div>
>> +#end
>> +$doc.use("XWiki.PDFClass")
>> +#set($pdffooter = $doc.display("footer"))
>> +#if($pdffooter=="")
>> +#template("pdffooter.vm")
>> +#else
>> +$pdffooter
>> +#end
>> \ No newline at end of file
>>
>> Added:
>> xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdfhtmlheader.vm
>> ===================================================================
>> ---
>> xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdfhtmlheader.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++
>> xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdfhtmlheader.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -0,0 +1,24 @@
>> +<?xml version="1.0" encoding="$xwiki.encoding" ?>
>> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
>> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
>> +<html xmlns="http://www.w3.org/1999/xhtml">
>> +<head>
>> +<title>
>> +$doc.use("XWiki.PDFClass")
>> +#set($title = $doc.display("title"))
>> +#if((!$title)||($title==""))
>> +#set( $title = $!xwiki.getWebPreference("title"))
>> +#if ( $title != "")
>> +$xwiki.parseContent($title)
>> +#else
>> +XWiki - $!doc.web - $!doc.displayTitle
>> +#end
>> +#else
>> +$title
>> +#end
>> +</title>
>> +<meta http-equiv="Content-Type" content="text/html;
>> charset=$xwiki.encoding" />
>> +</head>
>> +<body id="body" class="${context.action}body">
>> +<div id="xwikimaincontainer">
>> +<div id="xwikimaincontainerinner">
>>
>> Modified: xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm
>> ===================================================================
>> --- xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++ xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -1,6 +1,12 @@
>> #template("xwiki.vm")
>> -#template("httpheader.vm")
>> +$doc.use("XWiki.PDFClass")
>> +#template("pdfhtmlheader.vm")
>> +#set($pdfheader = $doc.display("header"))
>> +#if($pdfheader=="")
>> #template("pdfheader.vm")
>> +#else
>> +$pdfheader
>> +#end
>> <div id="xwikicontent">
>> $cdoc.getRenderedContent()
>> </div>
>> @@ -17,4 +23,10 @@
>> #end
>> </div>
>> #end
>> +$doc.use("XWiki.PDFClass")
>> +#set($pdffooter = $doc.display("footer"))
>> +#if($pdffooter=="")
>> #template("pdffooter.vm")
>> +#else
>> +$pdffooter
>> +#end
>> \ No newline at end of file
>>
>> Added:
>> xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm
>> ===================================================================
>> ---
>> xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm
>> 2007-04-20 19:49:33 UTC (rev 2915)
>> +++
>> xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm
>> 2007-04-20 21:49:55 UTC (rev 2916)
>> @@ -0,0 +1,24 @@
>> +<?xml version="1.0" encoding="$xwiki.encoding" ?>
>> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
>> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
>> +<html xmlns="http://www.w3.org/1999/xhtml">
>> +<head>
>> +<title>
>> +$doc.use("XWiki.PDFClass")
>> +#set($title = $doc.display("title"))
>> +#if((!$title)||($title==""))
>> +#set( $title = $!xwiki.getWebPreference("title"))
>> +#if ( $title != "")
>> +$xwiki.parseContent($title)
>> +#else
>> +XWiki - $!doc.web - $!doc.displayTitle
>> +#end
>> +#else
>> +$title
>> +#end
>> +</title>
>> +<meta http-equiv="Content-Type" content="text/html;
>> charset=$xwiki.encoding" />
>> +</head>
>> +<body id="body" class="${context.action}body">
>> +<div id="xwikimaincontainer">
>> +<div id="xwikimaincontainerinner">
>>
>>
>>
>> --
>> You receive this message as a subscriber of the
>> xwiki-commits at objectweb.org mailing list.
>> To unsubscribe: mailto:xwiki-commits-unsubscribe at objectweb.org
>> For general help: mailto:sympa at objectweb.org?subject=help
>> ObjectWeb mailing lists service home page: http://www.objectweb.org/wws
>
>
> ------------------------------------------------------------------------
>
>
> --
> You receive this message as a subscriber of the xwiki-dev at objectweb.org mailing list.
> To unsubscribe: mailto:xwiki-dev-unsubscribe at objectweb.org
> For general help: mailto:sympa at objectweb.org?subject=help
> ObjectWeb mailing lists service home page: http://www.objectweb.org/wws
>
--
Ludovic Dubost
Blog: http://www.ludovic.org/blog/
XWiki: http://www.xwiki.com
Skype: ldubost GTalk: ldubost
AIM: nvludo Yahoo: ludovic
More information about the devs
mailing list