[xwiki-notifications] r7592 - in xwiki-platform: skins/trunk/albatross/src/main/resources/albatross web/trunk/standard/src/main/webapp/templates

[SVN]

Author: sdumitriu
Date: 2008-02-13 16:30:17 +0100 (Wed, 13 Feb 2008)
New Revision: 7592

Added:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm
Removed:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/historyinline.vm
Log:
XWIKI-2114: Upgrade the default templates
XSALBATROSS-13: Move Albatross templates files to the XWiki Core templates 
directory to share them with other skins


Deleted: 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/historyinline.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/historyinline.vm
  2008-02-13 15:28:45 UTC (rev 7591)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/historyinline.vm
  2008-02-13 15:30:17 UTC (rev 7592)
@@ -1,78 +0,0 @@
-<div id="historycontent" class="xwikiintracontent">
-#if($inline && ($inline == true))    <div class="xwikititlewrapper" 
onclick="toggleClass($('history'), 'hidden'); toggleClass($('historycontent'), 
'exp')"><h3 class="xwikiintratitle">$msg.get("history")</h3></div>#end
-    <form id="history" action="$doc.getURL("view", 
"viewer=changes&amp;$docvariant")" method="post">
-      #set($formname="history")
-      <div id="history">
-      <div class="centered">
-      <table class="xwikidatatable" summary="$msg.get(document) 
${doc.displayTitle} &mdash; $msg.get("history")">
-        <tr>
-          <th>$msg.get("from")</th>
-          <th>$msg.get("to")</th>
-          <th>$msg.get("version")</th>
-          <th>$msg.get("reveditor")</th>
-          <th>$msg.get("date")</th>
-#if($xwiki.hasEditComment())
-          <th>$msg.get("comment")</th>
-#end
-#if($hasedit || $hasadmin)
-          <th colspan="2"></th>
-#end
-        </tr>
-#if(!$revisionscount)
-#set($revisionscount = 0)
-#end
-#set($skipnext = false)
-#set($versionshown = 0)
-#if ($tdoc.realLanguage!="")
-#set($lang = "&amp;language=${tdoc.realLanguage}")
-#else
-#set($lang = "")
-#end
-#foreach ($version in $tdoc.getRecentRevisions($revisionscount))
-#set($nextversion = $version)
-#set($revinfo = $tdoc.getRevisionInfo($nextversion))
-#if($xwiki.hasMinorEdit() && (!$request.getParameter("showminor")))
-  #set($skipcur = $skipnext)
-  #set($skipnext = $revinfo.isMinorEdit())
-#end
-#if(!$skipcur)
-  #set($versionshown = $versionshown + 1)
-        <tr class="row#if($versionshown % 2 == 1) even #else odd #end">
-          <td><input type="radio" name="rev1" value="$nextversion" /></td>
-          <td><input type="radio" name="rev2" value="$nextversion" /></td>
-          <td><a 
href="$tdoc.getURL("viewrev","rev=$nextversion")">$nextversion</a></td>
-          <td>$xwiki.getLocalUserName($revinfo.author)</td>
-          <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")</td>
-#if($xwiki.hasEditComment())
-          <td>$!{revinfo.comment}</td>
-#end
-#if($hasedit || $hasadmin)
-          <td class="xwikibuttonlink"><a 
href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if 
(confirm('$msg.get("readytorollback") $nextversion')){this.href += 
'&amp;confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
-#end
-#if($hasadmin)
-          <td class="xwikibuttonlink"><a 
href="$tdoc.getURL("deleteversions","rev=$nextversion$lang")" onclick="if 
(confirm('$msg.get("core.versions.delete.confirm.single", 
[$nextversion])')){this.href += '&amp;confirm=1'; return true;} return 
false;">$msg.get("core.versions.delete.single")</a></td>
-#end
-        </tr>
-#end
-#end
-</table>
-      <div class="buttons">
-        <div class="buttonwrapper"><input type="submit" accesskey="c" 
value="$msg.get("compare")" class="button"/></div>
-        #if($hasadmin)
-          <div class="buttonwrapper"><input class="button" type="submit" 
name="deleteversions" value="$msg.get("core.versions.delete.many")" 
-            
onclick="document.forms.${formname}.action='$doc.getURL("deleteversions")'; if 
(document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();" 
/></div>
-        #end
-        #if($xwiki.hasMinorEdit())
-          #if(!$request.getParameter("showminor"))
-            <div class="buttonwrapper"><input class="button" type="submit" 
name="viewminorversions" value="$msg.get("core.minoredit.show")"
-              
onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;showminor=1&amp;$docvariant")';
 if (document.forms.${formname}.onsubmit) 
document.forms.${formname}.onsubmit();" /></div>
-          #else
-            <div class="buttonwrapper"><input class="button" type="submit" 
name="hideminorversions" value="$msg.get("core.minoredit.hide")"
-              
onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;$docvariant")';
 if (document.forms.${formname}.onsubmit) 
document.forms.${formname}.onsubmit();" /></div>
-          #end
-        #end
-      </div>
-      </div>
-    </div>
-  </form>
-  </div>

Copied: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm 
(from rev 7591, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/historyinline.vm)
===================================================================
--- 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm    
                            (rev 0)
+++ 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm    
    2008-02-13 15:30:17 UTC (rev 7592)
@@ -0,0 +1,78 @@
+<div id="historycontent" class="xwikiintracontent">
+#if($inline && ($inline == true))    <div class="xwikititlewrapper" 
onclick="toggleClass($('history'), 'hidden'); toggleClass($('historycontent'), 
'exp')"><h3 class="xwikiintratitle">$msg.get("history")</h3></div>#end
+    <form id="history" action="$doc.getURL("view", 
"viewer=changes&amp;$docvariant")" method="post">
+      #set($formname="history")
+      <div id="history">
+      <div class="centered">
+      <table class="xwikidatatable" summary="$msg.get(document) 
${doc.displayTitle} &mdash; $msg.get("history")">
+        <tr>
+          <th>$msg.get("from")</th>
+          <th>$msg.get("to")</th>
+          <th>$msg.get("version")</th>
+          <th>$msg.get("reveditor")</th>
+          <th>$msg.get("date")</th>
+#if($xwiki.hasEditComment())
+          <th>$msg.get("comment")</th>
+#end
+#if($hasedit || $hasadmin)
+          <th colspan="2"></th>
+#end
+        </tr>
+#if(!$revisionscount)
+#set($revisionscount = 0)
+#end
+#set($skipnext = false)
+#set($versionshown = 0)
+#if ($tdoc.realLanguage!="")
+#set($lang = "&amp;language=${tdoc.realLanguage}")
+#else
+#set($lang = "")
+#end
+#foreach ($version in $tdoc.getRecentRevisions($revisionscount))
+#set($nextversion = $version)
+#set($revinfo = $tdoc.getRevisionInfo($nextversion))
+#if($xwiki.hasMinorEdit() && (!$request.getParameter("showminor")))
+  #set($skipcur = $skipnext)
+  #set($skipnext = $revinfo.isMinorEdit())
+#end
+#if(!$skipcur)
+  #set($versionshown = $versionshown + 1)
+        <tr class="row#if($versionshown % 2 == 1) even #else odd #end">
+          <td><input type="radio" name="rev1" value="$nextversion" /></td>
+          <td><input type="radio" name="rev2" value="$nextversion" /></td>
+          <td><a 
href="$tdoc.getURL("viewrev","rev=$nextversion")">$nextversion</a></td>
+          <td>$xwiki.getLocalUserName($revinfo.author)</td>
+          <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")</td>
+#if($xwiki.hasEditComment())
+          <td>$!{revinfo.comment}</td>
+#end
+#if($hasedit || $hasadmin)
+          <td class="xwikibuttonlink"><a 
href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if 
(confirm('$msg.get("readytorollback") $nextversion')){this.href += 
'&amp;confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
+#end
+#if($hasadmin)
+          <td class="xwikibuttonlink"><a 
href="$tdoc.getURL("deleteversions","rev=$nextversion$lang")" onclick="if 
(confirm('$msg.get("core.versions.delete.confirm.single", 
[$nextversion])')){this.href += '&amp;confirm=1'; return true;} return 
false;">$msg.get("core.versions.delete.single")</a></td>
+#end
+        </tr>
+#end
+#end
+</table>
+      <div class="buttons">
+        <div class="buttonwrapper"><input type="submit" accesskey="c" 
value="$msg.get("compare")" class="button"/></div>
+        #if($hasadmin)
+          <div class="buttonwrapper"><input class="button" type="submit" 
name="deleteversions" value="$msg.get("core.versions.delete.many")" 
+            
onclick="document.forms.${formname}.action='$doc.getURL("deleteversions")'; if 
(document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();" 
/></div>
+        #end
+        #if($xwiki.hasMinorEdit())
+          #if(!$request.getParameter("showminor"))
+            <div class="buttonwrapper"><input class="button" type="submit" 
name="viewminorversions" value="$msg.get("core.minoredit.show")"
+              
onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;showminor=1&amp;$docvariant")';
 if (document.forms.${formname}.onsubmit) 
document.forms.${formname}.onsubmit();" /></div>
+          #else
+            <div class="buttonwrapper"><input class="button" type="submit" 
name="hideminorversions" value="$msg.get("core.minoredit.hide")"
+              
onclick="document.forms.${formname}.action='$tdoc.getURL("view","viewer=history&amp;$docvariant")';
 if (document.forms.${formname}.onsubmit) 
document.forms.${formname}.onsubmit();" /></div>
+          #end
+        #end
+      </div>
+      </div>
+    </div>
+  </form>
+  </div>

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