[xwiki-notifications] r5858 - xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck

[SVN]

Author: dward
Date: 2007-11-14 00:20:55 +0100 (Wed, 14 Nov 2007)
New Revision: 5858

Modified:
   
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
Log:
- Update 1.4 branch with file from trunk


Modified: 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
===================================================================
--- 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
       2007-11-13 23:14:24 UTC (rev 5857)
+++ 
xwiki-products/curriki/branches/curriki-1.4/wiki/src/main/resources/FileCheck/WebHome
       2007-11-13 23:20:55 UTC (rev 5858)
@@ -8,18 +8,18 @@
 <translation>0</translation>
 <parent></parent>
 <creator>XWiki.LudovicDubost</creator>
-<author>XWiki.ShermanTank</author>
+<author>XWiki.LudovicDubost</author>
 <customClass></customClass>
-<contentAuthor>XWiki.ShermanTank</contentAuthor>
+<contentAuthor>XWiki.LudovicDubost</contentAuthor>
 <creationDate>1194209149000</creationDate>
-<date>1194906144000</date>
-<contentUpdateDate>1194906144000</contentUpdateDate>
-<version>1.54</version>
+<date>1194994686000</date>
+<contentUpdateDate>1194994686000</contentUpdateDate>
+<version>1.56</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Testing exclusion list.</comment>
+<comment>Fix qs</comment>
 <object>
 <class>
 <name>XWiki.TagClass</name>
@@ -158,18 +158,21 @@
 $itemdoc.display("fcnotes")
 &lt;/div&gt;&lt;/td&gt;
 &lt;td&gt;&lt;div class="action"&gt;
-#set($qs = $xwiki.getURLEncoded($fullname))
-[${msg.fc_action}&gt;Check?page=$qs]
+#set($qs2 = $xwiki.getURLEncoded($fullname))
+[${msg.fc_action}&gt;Check?page=$qs2]
 &lt;/div&gt;&lt;/td&gt;
 &lt;/tr&gt;
 #end
 &lt;/table&gt;
 
+#if($request.order)
+#set($qs = "${qs}&amp;${request.order}")
+#end
 #if($counter==$inbitems)
 &lt;div style="text-align:center; margin-top:10px;"&gt;
 #if ($inbstart!=0)
 #set($iprev = $inbstart - $inbitems)
-&lt;span class="search 
searchprevious"&gt;[$msg.fc_previous&gt;$doc.name?nbstart=${iprev}]&lt;/span&gt;
+&lt;span class="search 
searchprevious"&gt;[$msg.fc_previous&gt;$doc.name?nbstart=${iprev}&amp;${qs}]&lt;/span&gt;
 #end
 #set($istart = $inbstart + 1)
 #set($inext = $inbstart + $inbitems)
@@ -178,7 +181,7 @@
 &lt;span class="search searchcount"&gt;
 {pre} $istart - $inext $msg.of $stotalnb {/pre}
 &lt;/span&gt;
-&lt;span class="search 
searchnext"&gt;[$msg.fc_next&gt;$doc.name?nbstart=${inext}]&lt;/span&gt;
+&lt;span class="search 
searchnext"&gt;[$msg.fc_next&gt;$doc.name?nbstart=${inext}&amp;${qs}]&lt;/span&gt;
 &lt;/div&gt;
 #end
 </content></xwikidoc>
\ No newline at end of file

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