r1365 - in xwiki/trunk/src/main: java/com/xpn/xwiki/render web/skins/xwiki10
Ludovic Dubost
ludovic at users.forge.objectweb.org
Thu Oct 5 14:19:18 CEST 2006
Author: ludovic
Date: 2006-10-05 14:19:17 +0200 (Thu, 05 Oct 2006)
New Revision: 1365
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java
xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm
xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm
xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm
xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm
xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm
xwiki/trunk/src/main/web/skins/xwiki10/create.vm
xwiki/trunk/src/main/web/skins/xwiki10/editpanels.vm
xwiki/trunk/src/main/web/skins/xwiki10/leftpanels.vm
xwiki/trunk/src/main/web/skins/xwiki10/rightpanels.vm
Log:
Fixed admin templates not calling adminactions inside the form tag
Made rendering cache local to the rendering of a page even when included from another page. This allows to cache menus
Updated panels templates
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java 2006-10-05 12:19:17 UTC (rev 1365)
@@ -151,6 +151,7 @@
public String renderText(String text, XWikiDocument contentdoc, XWikiDocument includingdoc, XWikiContext context) {
String key = getKey(text, contentdoc, includingdoc, context);
+ int currentCacheDuration = context.getCacheDuration();
try {
if (cache==null)
@@ -180,6 +181,8 @@
MonitorPlugin monitor = Util.getMonitorPlugin(context);
try {
+ // We need to make sure we don't use the cache duretion currently in the system
+ context.setCacheDuration(0);
// Start monitoring timer
if (monitor!=null)
monitor.startTimer("rendering");
@@ -236,6 +239,9 @@
return content;
}
finally {
+ // We need to make sure we reset the cache Duration
+ context.setCacheDuration(currentCacheDuration);
+
if (monitor!=null)
monitor.endTimer("rendering");
}
Modified: xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/admin.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/admin.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -67,11 +67,9 @@
</div>
<div id="xwikieditor" class="layoutsection">
<div id="editcolumn" class="editor">
-##<div>#template("adminactions.vm")</div>
#set($formname = "update")
#set($saveaction = "save")
#template("admin${editor}.vm")
-<div>#template("adminactions.vm")</div>
</div>
#template("adminpanels.vm")
<div class="clearfloats"></div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -6,6 +6,7 @@
#set( $redirect = "$xwiki.getRequestURL()&editor=rights")
<div style="overflow:auto">
<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>#template("adminactions.vm")</div>
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
#set ($first = 1)
@@ -28,6 +29,7 @@
#end
</table>
</div>
+<div>#template("adminactions.vm")</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -6,6 +6,7 @@
#set( $redirect = "$xwiki.getRequestURL()&editor=rights")
<div style="overflow:auto">
<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>#template("adminactions.vm")</div>
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
#set ($first = 1)
@@ -28,6 +29,7 @@
#end
</table>
</div>
+<div>#template("adminactions.vm")</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -63,6 +63,7 @@
#set($redirect = "$xwiki.getRequestURL()")
<div style="overflow:auto;">
<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>#template("adminactions.vm")</div>
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
@@ -74,6 +75,7 @@
</div>
<script type="text/javascript">new Rico.Accordion( 'xwikiprefs', {panelHeight:'max'} );</script>
</div>
+<div>#template("adminactions.vm")</div>
</form>
</div>
</div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -4,6 +4,7 @@
#set($redirect = "$xwiki.getRequestURL()&editor=skin")
<div class="overflowcontainer">
<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>#template("adminactions.vm")</div>
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
#set($nb = $doc.getObjectNumbers("${class.name}"))
@@ -37,6 +38,7 @@
</table>
</div>
#end
+<div>#template("adminactions.vm")</div>
</form>
#template("chw/colorpicker.vm")
</div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -6,6 +6,7 @@
#set( $redirect = "$xwiki.getRequestURL()&editor=rights")
<div style="overflow:auto">
<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>#template("adminactions.vm")</div>
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
#set ($first = 1)
@@ -28,6 +29,7 @@
#end
</table>
</div>
+<div>#template("adminactions.vm")</div>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/create.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/create.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/create.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -1,14 +1,31 @@
#set($tocreate=$request.getParameter("tocreate"))
#set($title = $request.getParameter("title"))
#set($template = $request.getParameter("template"))
-#if($tocreate=="page")
+#if($tocreate=="panel")
+#set($docname=$title.replace("/", "%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.replace("/", "."))
#elseif($tocreate=="space")
-#set($title=$title.replace(" \.\/", ""))
+#set($title=$title.replace(" \\.\\/", ""))
#set($docname="${title}.WebHome")
#elseif($tocreate=="post")
#set($docname="Blog.${title.replace(' ', '')}")
#end
+#*
#set($newdoc=$xwiki.getDocument($docname))
#if($newdoc.isNew())
#if($tocreate == "post")
@@ -19,3 +36,4 @@
#else
$response.sendRedirect($newdoc.getURL("view", "xpage=docalreadyexists"))
#end
+*#
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/skins/xwiki10/editpanels.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editpanels.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editpanels.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -10,7 +10,8 @@
#set($editorPanels = $editorPanels.split(","))
<div id="editPanels" class="panels editor">
#foreach($panel in $editorPanels)
-$xwiki.includeForm("$panel",false)
+##$xwiki.includeForm("$panel",false)
+#displaypanel($panel)
#end
</div>
#if($editor == "wysiwyg")
Modified: xwiki/trunk/src/main/web/skins/xwiki10/leftpanels.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/leftpanels.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/leftpanels.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -1,7 +1,7 @@
-#if($showLeftPanels == "1")
-<div id="leftPanels" class="panels left">
+#if($showLeftPanels == "1" || $request.getParameter("forceLeftPanels"))
+<div id="leftPanels" class="panels left"#if($showLeftPanels != "1" && $request.getParameter("forceLeftPanels")) style="display: none;"#end>
#foreach($panel in $leftPanels)
-$xwiki.includeForm("$panel",false)
+#displaypanel($panel)
#end
</div>
#end
\ No newline at end of file
Modified: xwiki/trunk/src/main/web/skins/xwiki10/rightpanels.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/rightpanels.vm 2006-10-05 02:29:59 UTC (rev 1364)
+++ xwiki/trunk/src/main/web/skins/xwiki10/rightpanels.vm 2006-10-05 12:19:17 UTC (rev 1365)
@@ -1,7 +1,8 @@
-#if($showRightPanels == "1")
-<div id="rightPanels" class="panels right">
+#if($showRightPanels == "1" || $request.getParameter("forceRightPanels"))
+<div id="rightPanels" class="panels right"#if($showRightPanels != "1" && $request.getParameter("forceRightPanels")) style="display: none;"#end>
#foreach($panel in $rightPanels)
-$xwiki.includeForm("$panel",false)
+##$xwiki.includeForm("$panel",false)
+#displaypanel($panel)
#end
</div>
#end
\ No newline at end of file
More information about the Xwiki-notifications
mailing list