[xwiki-notifications] r7692 - 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:59:30 +0100 (Wed, 13 Feb 2008)
New Revision: 7692

Added:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm
Removed:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editobject.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/editobject.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editobject.vm 
    2008-02-13 18:59:22 UTC (rev 7691)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editobject.vm 
    2008-02-13 18:59:30 UTC (rev 7692)
@@ -1,74 +0,0 @@
-#if($request.xpage && $request.xpage=="editobject")
-$response.sendRedirect($doc.getURL($context.action, "editor=object"))
-#else
-#set($formname = "update")
-#set($saveaction = "save")
-#set($hasCustomClass = ($request.classname && 
(!$request.classname.trim().equals(""))))
-#set($hasCustomObject = ($hasCustomClass && $request.nb && 
(!$request.nb.trim().equals(""))))
-#if($hasCustomClass)
-#set($classes = [$xwiki.getDocument($request.classname).getxWikiClass()])
-#else
-#set($classes = $doc.getxWikiClasses())
-#end
-#set($redirect = $xwiki.getRequestURL())
-<div class="clear"></div>
-<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
-<div id="xwikieditcontent">
-#set($q = "editor=object")
-#if($hasCustomClass)
-#set($q = "${q}&amp;classname=${request.classname}")
-#if($hasCustomObject)
-#set($q = "${q}&amp;nb=${request.nb}")
-#end
-#end
-<div class="hidden"><input type="hidden" name="xcontinue" 
value="$doc.getURL($context.action, $q)"/></div>
-<div id="xwikiobjects" class="accordion">
-#foreach($class in $classes)
-#set($props = $class.getProperties())
-#foreach($prop in $props)
-#if ($velocityCount==1)
-#set($firstfield = $prop.name)
-#end
-#end
-#set($first = 1)
-#set($nb = $doc.getObjectNumbers("${class.name}"))
-#if($hasCustomObject)
-#set($object = $doc.getObject($class.name, $xwiki.parseInt($request.nb)))
-#if($object)
-#set($objects = [$object])
-#else
-#set($objects = [])
-#warning($msg.get("nosuchobject"))
-#end
-#else
-#set($objects = $doc.getObjects($class.name))
-#end
-#foreach($obj in $objects)
-#if(!$hasCustomObject)
-<div id="field_${class.name}_${obj.number}">
-<div id="field_${class.name}_${obj.number}_title" 
class="accordionTabTitleBar"><h6><tt><strong>${class.name}[${obj.number}]: 
</strong>$doc.display($firstfield, $obj)</tt></h6></div>
-<div id="field_${class.name}_${obj.number}_content" 
class="accordionTabContentBox"><div>
-#end
-#if($first == 1)
-<input type="hidden" name="${class.name}_nb" value="$nb" />
-#set($first = 0)
-#end
-<dl>
-#foreach($prop in $class.properties)
-<dt class="label"><label 
for="${class.name}_${obj.number}_$prop.name">$prop.prettyName:</label></dt>
-<dd>$doc.displayEdit($prop, "${class.name}_${obj.number}_" , $obj)</dd>
-#end
-</dl>
-<div class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${doc.getURL('edit',
 'editor=object')}")" onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("removethisobject")</a></div>
-#if(!$hasCustomObject)
-</div></div>
-</div>
-#end
-#end
-#end
-</div>
-</div>
-<div class="bottombuttons">#template("editactions.vm")</div>
-</form>
-<script type="text/javascript">new Rico.Accordion( 'xwikiobjects', 
{panelHeight:'flex'} );</script>
-#end
\ No newline at end of file

Copied: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm (from 
rev 7691, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/editobject.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm   
                        (rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/editobject.vm   
2008-02-13 18:59:30 UTC (rev 7692)
@@ -0,0 +1,74 @@
+#if($request.xpage && $request.xpage=="editobject")
+$response.sendRedirect($doc.getURL($context.action, "editor=object"))
+#else
+#set($formname = "update")
+#set($saveaction = "save")
+#set($hasCustomClass = ($request.classname && 
(!$request.classname.trim().equals(""))))
+#set($hasCustomObject = ($hasCustomClass && $request.nb && 
(!$request.nb.trim().equals(""))))
+#if($hasCustomClass)
+#set($classes = [$xwiki.getDocument($request.classname).getxWikiClass()])
+#else
+#set($classes = $doc.getxWikiClasses())
+#end
+#set($redirect = $xwiki.getRequestURL())
+<div class="clear"></div>
+<form id="update" method="post" action="$doc.getURL("save")" 
onsubmit="cancelCancelEdit()">
+<div id="xwikieditcontent">
+#set($q = "editor=object")
+#if($hasCustomClass)
+#set($q = "${q}&amp;classname=${request.classname}")
+#if($hasCustomObject)
+#set($q = "${q}&amp;nb=${request.nb}")
+#end
+#end
+<div class="hidden"><input type="hidden" name="xcontinue" 
value="$doc.getURL($context.action, $q)"/></div>
+<div id="xwikiobjects" class="accordion">
+#foreach($class in $classes)
+#set($props = $class.getProperties())
+#foreach($prop in $props)
+#if ($velocityCount==1)
+#set($firstfield = $prop.name)
+#end
+#end
+#set($first = 1)
+#set($nb = $doc.getObjectNumbers("${class.name}"))
+#if($hasCustomObject)
+#set($object = $doc.getObject($class.name, $xwiki.parseInt($request.nb)))
+#if($object)
+#set($objects = [$object])
+#else
+#set($objects = [])
+#warning($msg.get("nosuchobject"))
+#end
+#else
+#set($objects = $doc.getObjects($class.name))
+#end
+#foreach($obj in $objects)
+#if(!$hasCustomObject)
+<div id="field_${class.name}_${obj.number}">
+<div id="field_${class.name}_${obj.number}_title" 
class="accordionTabTitleBar"><h6><tt><strong>${class.name}[${obj.number}]: 
</strong>$doc.display($firstfield, $obj)</tt></h6></div>
+<div id="field_${class.name}_${obj.number}_content" 
class="accordionTabContentBox"><div>
+#end
+#if($first == 1)
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+#set($first = 0)
+#end
+<dl>
+#foreach($prop in $class.properties)
+<dt class="label"><label 
for="${class.name}_${obj.number}_$prop.name">$prop.prettyName:</label></dt>
+<dd>$doc.displayEdit($prop, "${class.name}_${obj.number}_" , $obj)</dd>
+#end
+</dl>
+<div class="xwikibuttonlink"><a href="$doc.getURL("objectremove", 
"classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${doc.getURL('edit',
 'editor=object')}")" onclick="return 
confirm('$msg.get("confirmobjectremove")')">$msg.get("removethisobject")</a></div>
+#if(!$hasCustomObject)
+</div></div>
+</div>
+#end
+#end
+#end
+</div>
+</div>
+<div class="bottombuttons">#template("editactions.vm")</div>
+</form>
+<script type="text/javascript">new Rico.Accordion( 'xwikiobjects', 
{panelHeight:'flex'} );</script>
+#end
\ No newline at end of file

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