Author: sdumitriu
Date: 2007-10-16 18:01:27 +0200 (Tue, 16 Oct 2007)
New Revision: 5405
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/create.mv
Removed:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/create.vm
Log:
XWIKI-1703: Create page/space/blog doesn't work with "finch" skin
Fixed by moving the create.vm macro in the common "templates" directory.
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/create.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/create.vm
2007-10-16 15:42:00 UTC (rev 5404)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/create.vm
2007-10-16 16:01:27 UTC (rev 5405)
@@ -1,103 +0,0 @@
-#set($tocreate=$request.getParameter("tocreate"))
-#set($title = $request.getParameter("title"))
-#set($template = "")
-#set($template = $request.getParameter("template"))
-#set($parent = "")
-#set($parent=$request.getParameter("parent"))
-#set($auxparams="")
-#set($auxparams=$request.getParameter("auxparams"))
-##
-## Create panel
-##
-#if($tocreate=="panel")
-#set($docname=$title.replaceAll("/", "%2F"))
-#if(!$template || $template == "")
-#set($template="Panels.PanelTemplate")
-#end
-#set($newdoc=$xwiki.getDocument($docname))
-#if($newdoc.isNew())
-#set($pcontent = "#")
-#set($pcontent =
$pcontent.concat("panelheader('${title}')${xwiki.getNl()}${xwiki.getNl()}#"))
-#set($pcontent = $pcontent.concat("panelfooter()"))
-#set($pcontent = $xwiki.getURLEncoded($pcontent))
-$response.sendRedirect($newdoc.getURL("inline",
"template=${template}&Panels.PanelClass_0_name=${title}&Panels.PanelClass_0_content=$pcontent"))
-#else
-$response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
-#end
-##
-## Create page
-##
-#elseif($tocreate=="page")
-#set($docname=$title.replaceAll("/", "."))
-##
-## Create space
-##
-#elseif($tocreate=="space")
-#set($title=$title.replaceAll(" \\.\\/", ""))
-#set($docname="${title}.WebHome")
-##
-## Create blog post
-##
-#elseif($tocreate=="post")
-#set($docname="Blog.${title.replaceAll(' ', '')}")
-#end
-##
-## Send redirect
-##
-#set($newdoc=$xwiki.getDocument($docname))
-##$newdoc.getURL("edit", "template=${template}&parent=${parent}$auxparams"))
-#if($newdoc.isNew())
-#if($tocreate == "post")
-#set($etitle = $xwiki.getURLEncoded($title))
-$response.sendRedirect($newdoc.getURL("inline",
"parent=Blog.WebHome&template=XWiki.ArticleClassTemplate&XWiki.ArticleClass_0_title=$etitle"))
-#else
-#set($etitle = $xwiki.getURLEncoded($title))
-#set($etemplate = $xwiki.getURLEncoded("${template}"))
-#set($eparent = $xwiki.getURLEncoded("${parent}${auxparams}"))
-$response.sendRedirect($newdoc.getURL("edit",
"template=${etemplate}&parent=${eparent}&title=$etitle"))
-#end
-#else
-$response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
-#end
-##
-##
-##
-##
-##
-## #set($tocreate=$request.getParameter("tocreate"))
-## #set($title = $request.getParameter("title"))
-## #set($template = $request.getParameter("template"))
-## #if($tocreate=="panel")
-## #set($docname=$title.replaceAll("/", "%2F"))
-## #if(!$template)
-## #set($template="Panels.PanelTemplate")
-## #end
-## #set($newdoc=$xwiki.getDocument($docname))
-## #if($newdoc.isNew())
-## #set($pcontent = "#")
-## #set($pcontent =
$pcontent.concat("panelheader('${title}')${xwiki.getNl()}${xwiki.getNl()}#"))
-## #set($pcontent = $pcontent.concat("panelfooter()"))
-## #set($pcontent = $xwiki.getURLEncoded($pcontent))
-## $pcontent
-## $response.sendRedirect($newdoc.getURL("inline",
"template=${template}&Panels.PanelClass_0_name=${title}&Panels.PanelClass_0_content=$pcontent"))
-## #else
-## $response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
-## #end
-## #elseif($tocreate=="page")
-## #set($docname=$title.replaceAll("/", "."))
-## #elseif($tocreate=="space")
-## #set($title=$title.replaceAll("[ ./]", ""))
-## #set($docname="${title}.WebHome")
-## #elseif($tocreate=="post")
-## #set($docname="Blog.${title.replaceAll(' ', '')}")
-## #end
-## #set($newdoc=$xwiki.getDocument($docname))
-## #if($newdoc.isNew())
-## #if($tocreate == "post")
-## $response.sendRedirect($newdoc.getURL("inline",
"parent=Blog.WebHome&template=XWiki.ArticleClassTemplate&XWiki.ArticleClass_0_title=$title"))
-## #else
-## $response.sendRedirect($newdoc.getURL("edit", "template=${template}"))
-## #end
-## #else
-## $response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
-## #end
Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/create.mv
(from rev 5403,
xwiki-platform/web/trunk/standard/src/main/webapp/skins/albatross/create.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/create.mv
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/create.mv
2007-10-16 16:01:27 UTC (rev 5405)
@@ -0,0 +1,103 @@
+#set($tocreate=$request.getParameter("tocreate"))
+#set($title = $request.getParameter("title"))
+#set($template = "")
+#set($template = $request.getParameter("template"))
+#set($parent = "")
+#set($parent=$request.getParameter("parent"))
+#set($auxparams="")
+#set($auxparams=$request.getParameter("auxparams"))
+##
+## Create panel
+##
+#if($tocreate=="panel")
+#set($docname=$title.replaceAll("/", "%2F"))
+#if(!$template || $template == "")
+#set($template="Panels.PanelTemplate")
+#end
+#set($newdoc=$xwiki.getDocument($docname))
+#if($newdoc.isNew())
+#set($pcontent = "#")
+#set($pcontent =
$pcontent.concat("panelheader('${title}')${xwiki.getNl()}${xwiki.getNl()}#"))
+#set($pcontent = $pcontent.concat("panelfooter()"))
+#set($pcontent = $xwiki.getURLEncoded($pcontent))
+$response.sendRedirect($newdoc.getURL("inline",
"template=${template}&Panels.PanelClass_0_name=${title}&Panels.PanelClass_0_content=$pcontent"))
+#else
+$response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
+#end
+##
+## Create page
+##
+#elseif($tocreate=="page")
+#set($docname=$title.replaceAll("/", "."))
+##
+## Create space
+##
+#elseif($tocreate=="space")
+#set($title=$title.replaceAll(" \\.\\/", ""))
+#set($docname="${title}.WebHome")
+##
+## Create blog post
+##
+#elseif($tocreate=="post")
+#set($docname="Blog.${title.replaceAll(' ', '')}")
+#end
+##
+## Send redirect
+##
+#set($newdoc=$xwiki.getDocument($docname))
+##$newdoc.getURL("edit", "template=${template}&parent=${parent}$auxparams"))
+#if($newdoc.isNew())
+#if($tocreate == "post")
+#set($etitle = $xwiki.getURLEncoded($title))
+$response.sendRedirect($newdoc.getURL("inline",
"parent=Blog.WebHome&template=XWiki.ArticleClassTemplate&XWiki.ArticleClass_0_title=$etitle"))
+#else
+#set($etitle = $xwiki.getURLEncoded($title))
+#set($etemplate = $xwiki.getURLEncoded("${template}"))
+#set($eparent = $xwiki.getURLEncoded("${parent}${auxparams}"))
+$response.sendRedirect($newdoc.getURL("edit",
"template=${etemplate}&parent=${eparent}&title=$etitle"))
+#end
+#else
+$response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
+#end
+##
+##
+##
+##
+##
+## #set($tocreate=$request.getParameter("tocreate"))
+## #set($title = $request.getParameter("title"))
+## #set($template = $request.getParameter("template"))
+## #if($tocreate=="panel")
+## #set($docname=$title.replaceAll("/", "%2F"))
+## #if(!$template)
+## #set($template="Panels.PanelTemplate")
+## #end
+## #set($newdoc=$xwiki.getDocument($docname))
+## #if($newdoc.isNew())
+## #set($pcontent = "#")
+## #set($pcontent =
$pcontent.concat("panelheader('${title}')${xwiki.getNl()}${xwiki.getNl()}#"))
+## #set($pcontent = $pcontent.concat("panelfooter()"))
+## #set($pcontent = $xwiki.getURLEncoded($pcontent))
+## $pcontent
+## $response.sendRedirect($newdoc.getURL("inline",
"template=${template}&Panels.PanelClass_0_name=${title}&Panels.PanelClass_0_content=$pcontent"))
+## #else
+## $response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
+## #end
+## #elseif($tocreate=="page")
+## #set($docname=$title.replaceAll("/", "."))
+## #elseif($tocreate=="space")
+## #set($title=$title.replaceAll("[ ./]", ""))
+## #set($docname="${title}.WebHome")
+## #elseif($tocreate=="post")
+## #set($docname="Blog.${title.replaceAll(' ', '')}")
+## #end
+## #set($newdoc=$xwiki.getDocument($docname))
+## #if($newdoc.isNew())
+## #if($tocreate == "post")
+## $response.sendRedirect($newdoc.getURL("inline",
"parent=Blog.WebHome&template=XWiki.ArticleClassTemplate&XWiki.ArticleClass_0_title=$title"))
+## #else
+## $response.sendRedirect($newdoc.getURL("edit", "template=${template}"))
+## #end
+## #else
+## $response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
+## #end
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
