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

[SVN]

Author: sdumitriu
Date: 2008-02-13 19:45:56 +0100 (Wed, 13 Feb 2008)
New Revision: 7677

Added:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/delete.vm
Removed:
   xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/delete.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/delete.vm
===================================================================
--- xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/delete.vm 
2008-02-13 18:45:48 UTC (rev 7676)
+++ xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/delete.vm 
2008-02-13 18:45:56 UTC (rev 7677)
@@ -1,56 +0,0 @@
-###
-### Delete page confirm message
-###
-###
-#template("startpage.vm")
-<div class="main layoutsubsection">
-#if($message)
-  <div id="xwikimessage">$message</div>
-#end
-#set($links=$doc.getBacklinks())
-#set($orphans = $xwiki.searchDocuments(" where doc.fullName <> ? and 
(doc.parent = ? or (doc.parent = ? and doc.web = ?))", ["${doc.fullName}as", 
${doc.fullName}, ${doc.name}, ${doc.web}]))
-#if($request.xredirect)
-  #set($redirectparam = "&amp;xredirect=$request.xredirect")
-#end
-#set($quote = '"')
-#set($hasInlinks = false)
-#set($fullmsg = "")
-#if($links && $links.size() > 0)
-  #set($tmpmsg = "</p><ul style=${quote}text-align: left;${quote}>")
-  #foreach($docname in $links)
-    #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
-    #set($tmpmsg = "${tmpmsg}<li><a 
href=${quote}${rdoc.getURL('view')}${quote}>${rdoc.displayTitle}</a></li>")
-  #end
-  #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage${quote}>")
-  #set($tmpmsg = $msg.get("core.delete.backlinksWarning", [$tmpmsg]))
-  #set($fullmsg="${fullmsg}${tmpmsg}</p><p 
class=${quote}xwikimessage${quote}>")
-  #set($hasInlinks = true)
-#end
-#if($orphans && $orphans.size() > 0)
-  #set($tmpmsg ="</p><ul style=${quote}text-align: left;${quote}>")
-  #foreach($docname in $orphans)
-    #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
-    #set($tmpmsg = "${tmpmsg}<li><a 
href=${quote}${rdoc.getURL('view')}${quote}>${rdoc.displayTitle}</a></li>")
-  #end
-  #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage${quote}>")
-  #set($tmpmsg = $msg.get("core.delete.orphansWarning", [$tmpmsg]))
-  #set($fullmsg="${fullmsg}${tmpmsg}</p><p 
class=${quote}xwikimessage${quote}>")
-  #set($hasInlinks = true)
-#end
-#if($xwiki.hasRecycleBin())
-  #if($hasInlinks)
-    #set($fullmsg="${fullmsg}${msg.get('core.recyclebin.confirmWithInlinks')}")
-  #else
-    #set($fullmsg = $msg.get("core.recyclebin.confirm"))
-  #end
-#else
-  #if($hasInlinks)
-    #set($fullmsg="${fullmsg}${msg.get('core.delete.confirmWithInlinks')}")
-  #else
-    #set($fullmsg = $msg.get("core.delete.confirm"))
-  #end
-#end
-#xwikimessagebox($msg.get("core.delete") $fullmsg $doc.getURL("delete", 
"confirm=1$!{redirectparam}&amp;$languageparams") $doc.getURL("view") 
$msg.get("yes") $msg.get("no"))
-</div>
-<div class="clearfloats"></div>
-#template("endpage.vm")
\ No newline at end of file

Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/delete.vm 
(from rev 7676, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/delete.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/delete.vm       
                        (rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/delete.vm       
2008-02-13 18:45:56 UTC (rev 7677)
@@ -0,0 +1,56 @@
+###
+### Delete page confirm message
+###
+###
+#template("startpage.vm")
+<div class="main layoutsubsection">
+#if($message)
+  <div id="xwikimessage">$message</div>
+#end
+#set($links=$doc.getBacklinks())
+#set($orphans = $xwiki.searchDocuments(" where doc.fullName <> ? and 
(doc.parent = ? or (doc.parent = ? and doc.web = ?))", ["${doc.fullName}as", 
${doc.fullName}, ${doc.name}, ${doc.web}]))
+#if($request.xredirect)
+  #set($redirectparam = "&amp;xredirect=$request.xredirect")
+#end
+#set($quote = '"')
+#set($hasInlinks = false)
+#set($fullmsg = "")
+#if($links && $links.size() > 0)
+  #set($tmpmsg = "</p><ul style=${quote}text-align: left;${quote}>")
+  #foreach($docname in $links)
+    #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
+    #set($tmpmsg = "${tmpmsg}<li><a 
href=${quote}${rdoc.getURL('view')}${quote}>${rdoc.displayTitle}</a></li>")
+  #end
+  #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage${quote}>")
+  #set($tmpmsg = $msg.get("core.delete.backlinksWarning", [$tmpmsg]))
+  #set($fullmsg="${fullmsg}${tmpmsg}</p><p 
class=${quote}xwikimessage${quote}>")
+  #set($hasInlinks = true)
+#end
+#if($orphans && $orphans.size() > 0)
+  #set($tmpmsg ="</p><ul style=${quote}text-align: left;${quote}>")
+  #foreach($docname in $orphans)
+    #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
+    #set($tmpmsg = "${tmpmsg}<li><a 
href=${quote}${rdoc.getURL('view')}${quote}>${rdoc.displayTitle}</a></li>")
+  #end
+  #set($tmpmsg = "${tmpmsg}</ul><p class=${quote}xwikimessage${quote}>")
+  #set($tmpmsg = $msg.get("core.delete.orphansWarning", [$tmpmsg]))
+  #set($fullmsg="${fullmsg}${tmpmsg}</p><p 
class=${quote}xwikimessage${quote}>")
+  #set($hasInlinks = true)
+#end
+#if($xwiki.hasRecycleBin())
+  #if($hasInlinks)
+    #set($fullmsg="${fullmsg}${msg.get('core.recyclebin.confirmWithInlinks')}")
+  #else
+    #set($fullmsg = $msg.get("core.recyclebin.confirm"))
+  #end
+#else
+  #if($hasInlinks)
+    #set($fullmsg="${fullmsg}${msg.get('core.delete.confirmWithInlinks')}")
+  #else
+    #set($fullmsg = $msg.get("core.delete.confirm"))
+  #end
+#end
+#xwikimessagebox($msg.get("core.delete") $fullmsg $doc.getURL("delete", 
"confirm=1$!{redirectparam}&amp;$languageparams") $doc.getURL("view") 
$msg.get("yes") $msg.get("no"))
+</div>
+<div class="clearfloats"></div>
+#template("endpage.vm")
\ No newline at end of file

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