Author: tmortagne
Date: 2008-01-10 11:24:57 +0100 (Thu, 10 Jan 2008)
New Revision: 6716

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
Log:
XAWM-44: Table rendering broken in some cases in WikiManager.WebHome

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
 2008-01-10 10:18:45 UTC (rev 6715)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
 2008-01-10 10:24:57 UTC (rev 6716)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1186676868000</creationDate>
-<date>1196357162000</date>
-<contentUpdateDate>1199724181000</contentUpdateDate>
-<version>1.1</version>
+<date>1199960205000</date>
+<contentUpdateDate>1199960205000</contentUpdateDate>
+<version>15.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -54,94 +54,100 @@
 <tags/>
 </property>
 </object>
-<content>#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#set($action = $request.getParameter("action"))
-#set($confirm = $request.getParameter("confirm"))
-
-#set($wikiname = $request.getParameter("wikiname"))
-#set($serverid = $xwiki.parseInt($request.getParameter("serverid")))
-#set($wikivisibility = $request.getParameter("wikivisibility"))
-
-#############################################################################
-
-#if($action)
-  #if($action == "delete")
-    #includeInContext("WikiCode.DeleteWikiCode")
-  #elseif($action == "setvisibility")
-    #includeInContext("WikiCode.SetWikiVisibilityCode")
-  #end
-#end
-
-#############################################################################
-
-1 Wikis
-
-#############################################################################
-
-#set($wikiList = $WikiManager.getAllWikis())
-&lt;div style="font-weight:bold;"&gt;
-  $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()&lt;br /&gt;
-  #if($hasadmin)
-    [$msg.get("wikimanager.createwiki")&gt;WikiManager.CreateNewWiki]&lt;br 
/&gt;
-  #end
-&lt;/div&gt;
-
-#if($wikiList.size()!=0)
-  &lt;table id="wikiTable" class="grid sortable filterable doOddEven"&gt;
-      &lt;tr class="sortHeader"&gt;
-        &lt;th&gt;$msg.get("wikimanager.listwikiname")&lt;/th&gt;
-        &lt;th&gt;$msg.get("wikimanager.listwikiadmin")&lt;/th&gt;
-        &lt;th&gt;$msg.get("wikimanager.listwikicreation")&lt;/th&gt;
-        &lt;th&gt;$msg.get("wikimanager.listwikistate")&lt;/th&gt;
-        &lt;th&gt;$msg.get("wikimanager.listwikivisibility")&lt;/th&gt;
-        &lt;th class="unsortable noFilter"&gt;$msg.get("more")&lt;/th&gt;
-      &lt;/tr&gt;
-    #foreach($wiki in $wikiList)
-      #set($wikiAliasList = $wiki.wikiAliasList)
-      &lt;tr&gt;
-        &lt;td&gt;$wiki.wikiName #if($wikiAliasList.size() == 1) 
($!wikiAliasList.get(0).wikiPrettyName 
[$wikiAliasList.get(0).server&gt;$wikiAliasList.get(0).homePageUrl]) 
#end&lt;/td&gt;
-        &lt;td&gt;#if($wikiAliasList.size()==1) [$wikiAliasList.get(0).owner] 
#end&lt;/td&gt;
-        &lt;td&gt;$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")&lt;/td&gt;
-        &lt;td&gt;#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state 
#end&lt;/td&gt;
-        &lt;td&gt;#if($wikiAliasList.size()==1) 
$wikiAliasList.get(0).visibility #end&lt;/td&gt;
-        &lt;td&gt;
-          #if($wikiAliasList.size()==1)
-            #if($wikiAliasList.get(0).visibility == "public")
-              
[$msg.get("wikimanager.action.setvisibility.private")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=private]
 | 
-            #elseif($wikiAliasList.get(0).visibility == "private")
-              
[$msg.get("wikimanager.action.setvisibility.template")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=template]
 | 
-            #elseif($wikiAliasList.get(0).visibility == "template")
-              
[$msg.get("wikimanager.action.setvisibility.public")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=public]
 | 
-            #end
-          #end
-          
[$msg.get("delete")&gt;?action=delete&amp;amp;wikiname=$wiki.WikiName] | &lt;a 
href="$wiki.getURL("inline")"&gt;$msg.get("edit")&lt;/a&gt;&lt;/td&gt;
-      &lt;/tr&gt;
-      #if($wikiAliasList.size() &gt; 1)
-        #foreach($wikiAlias in $wikiAliasList)
-          &lt;tr&gt;
-            &lt;td&gt;- $!wikiAliasList.get(0).wikiPrettyName 
[$wikiAlias.server&gt;$wikiAlias.homePageUrl]&lt;/td&gt;
-            &lt;td&gt;[$wikiAlias.owner]&lt;/td&gt;
-            &lt;td&gt;&lt;/td&gt;
-            &lt;td&gt;$wikiAlias.state&lt;/td&gt;
-            &lt;td&gt;$wikiAlias.visibility&lt;/td&gt;
-            &lt;td&gt;
-              #if($wikiAlias.visibility == "public")
-                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=private")"&gt;$msg.get("wikimanager.action.setvisibility.private")&lt;/a&gt;
 | 
-              #elseif($wikiAlias.visibility == "private")
-                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=template")"&gt;$msg.get("wikimanager.action.setvisibility.template")&lt;/a&gt;
 | 
-              #elseif($wikiAlias.visibility == "template")
-                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=public")"&gt;$msg.get("wikimanager.action.setvisibility.public")&lt;/a&gt;
 | 
-              #end
-              &lt;a href="$doc.getURL("view", 
"action=delete&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId")"&gt;$msg.get("delete")&lt;/a&gt;
-            &lt;/td&gt;
-          &lt;/tr&gt;
-        #end
-      #end
-    #end
-  &lt;/table&gt;
-#else
-  $msg.get("wikimanager.listwikiempty")
-#end
+<content>#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#set($action = $request.getParameter("action"))
+#set($confirm = $request.getParameter("confirm"))
+
+#set($wikiname = $request.getParameter("wikiname"))
+#set($serverid = $xwiki.parseInt($request.getParameter("serverid")))
+#set($wikivisibility = $request.getParameter("wikivisibility"))
+
+#############################################################################
+
+#macro(printLink $linkContent)
+  #if($!linkContent.length() &gt; 0) [$linkContent] #end
+#end
+
+#############################################################################
+
+#if($action)
+  #if($action == "delete")
+    #includeInContext("WikiCode.DeleteWikiCode")
+  #elseif($action == "setvisibility")
+    #includeInContext("WikiCode.SetWikiVisibilityCode")
+  #end
+#end
+
+#############################################################################
+
+1 Wikis
+
+#############################################################################
+
+#set($wikiList = $WikiManager.getAllWikis())
+&lt;div style="font-weight:bold;"&gt;
+  $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()&lt;br /&gt;
+  #if($hasadmin)
+    [$msg.get("wikimanager.createwiki")&gt;WikiManager.CreateNewWiki]&lt;br 
/&gt;
+  #end
+&lt;/div&gt;
+
+#if($wikiList.size()!=0)
+  &lt;table id="wikiTable" class="grid sortable filterable doOddEven"&gt;
+      &lt;tr class="sortHeader"&gt;
+        &lt;th&gt;$msg.get("wikimanager.listwikiname")&lt;/th&gt;
+        &lt;th&gt;$msg.get("wikimanager.listwikiadmin")&lt;/th&gt;
+        &lt;th&gt;$msg.get("wikimanager.listwikicreation")&lt;/th&gt;
+        &lt;th&gt;$msg.get("wikimanager.listwikistate")&lt;/th&gt;
+        &lt;th&gt;$msg.get("wikimanager.listwikivisibility")&lt;/th&gt;
+        &lt;th class="unsortable noFilter"&gt;$msg.get("more")&lt;/th&gt;
+      &lt;/tr&gt;
+    #foreach($wiki in $wikiList)
+      #set($wikiAliasList = $wiki.wikiAliasList)
+      &lt;tr&gt;
+        &lt;td&gt;$wiki.wikiName #if($wikiAliasList.size() == 1) 
($!wikiAliasList.get(0).wikiPrettyName 
[$wikiAliasList.get(0).server&gt;$wikiAliasList.get(0).homePageUrl]) 
#end&lt;/td&gt;
+        &lt;td&gt;#if($wikiAliasList.size()==1) 
#printLink($wikiAliasList.get(0).owner) #end&lt;/td&gt;
+        &lt;td&gt;$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")&lt;/td&gt;
+        &lt;td&gt;#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state 
#end&lt;/td&gt;
+        &lt;td&gt;#if($wikiAliasList.size()==1) 
$wikiAliasList.get(0).visibility #end&lt;/td&gt;
+        &lt;td&gt;
+          #if($wikiAliasList.size()==1)
+            #if($wikiAliasList.get(0).visibility == "public")
+              
[$msg.get("wikimanager.action.setvisibility.private")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=private]
 | 
+            #elseif($wikiAliasList.get(0).visibility == "private")
+              
[$msg.get("wikimanager.action.setvisibility.template")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=template]
 | 
+            #elseif($wikiAliasList.get(0).visibility == "template")
+              
[$msg.get("wikimanager.action.setvisibility.public")&gt;?action=setvisibility&amp;amp;wikiname=$wikiAliasList.get(0).WikiName&amp;amp;serverid=$wikiAliasList.get(0).objectId&amp;amp;wikivisibility=public]
 | 
+            #end
+          #end
+          
[$msg.get("delete")&gt;?action=delete&amp;amp;wikiname=$wiki.WikiName] | &lt;a 
href="$wiki.getURL("inline")"&gt;$msg.get("edit")&lt;/a&gt;&lt;/td&gt;
+      &lt;/tr&gt;
+      #if($wikiAliasList.size() &gt; 1)
+        #foreach($wikiAlias in $wikiAliasList)
+          &lt;tr&gt;
+            &lt;td&gt;- $!wikiAliasList.get(0).wikiPrettyName 
[$wikiAlias.server&gt;$wikiAlias.homePageUrl]&lt;/td&gt;
+            &lt;td&gt;#printLink($wikiAlias.owner)&lt;/td&gt;
+            &lt;td&gt;&lt;/td&gt;
+            &lt;td&gt;$wikiAlias.state&lt;/td&gt;
+            &lt;td&gt;$wikiAlias.visibility&lt;/td&gt;
+            &lt;td&gt;
+              #if($wikiAlias.visibility == "public")
+                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=private")"&gt;$msg.get("wikimanager.action.setvisibility.private")&lt;/a&gt;
 | 
+              #elseif($wikiAlias.visibility == "private")
+                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=template")"&gt;$msg.get("wikimanager.action.setvisibility.template")&lt;/a&gt;
 | 
+              #elseif($wikiAlias.visibility == "template")
+                &lt;a href="$doc.getURL("view", 
"action=setvisibility&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId&amp;amp;wikivisibility=public")"&gt;$msg.get("wikimanager.action.setvisibility.public")&lt;/a&gt;
 | 
+              #end
+              &lt;a href="$doc.getURL("view", 
"action=delete&amp;amp;wikiname=$wikiAlias.WikiName&amp;amp;serverid=$wikiAlias.objectId")"&gt;$msg.get("delete")&lt;/a&gt;
+            &lt;/td&gt;
+          &lt;/tr&gt;
+        #end
+      #end
+    #end
+  &lt;/table&gt;
+#else
+  $msg.get("wikimanager.listwikiempty")
+#end
 </content></xwikidoc>
\ No newline at end of file

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to