Author: tmortagne
Date: 2007-11-28 15:02:10 +0100 (Wed, 28 Nov 2007)
New Revision: 6110
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate
Log:
XAWM-30: Velocity warning in WikiCode.DeleteWikiCode and
WikiCode.SetWikiVisibilityCode
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
2007-11-28 14:02:10 UTC (rev 6110)
@@ -12,14 +12,15 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1190984758000</creationDate>
-<date>1194018382000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
-<version>1.1</version>
+<date>1196258174000</date>
+<contentUpdateDate>1196258174000</contentUpdateDate>
+<version>2.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -53,18 +54,18 @@
<tags/>
</property>
</object>
-<content>#if($action == "delete")
- #if($confirm && $confirm == 1)
- #set($result = $WikiManager.deleteWiki($wikiname, $serverid))
- #if ($result == $Exception.ERROR_NOERROR)
- #info($msg.get("wikimanager.successdeletewiki", [$wikiname]))
- #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
- #error($msg.get("notallowed"))
- #else
- #error($msg.get("wikimanager.errordeletewiki", [$wikiname, $result]))
- #end
- #else
- #xwikimessagebox($msg.get("wikimanager.answer.deletewiki.title")
$msg.get("wikimanager.answer.deletewiki.msg", [$wikiname]) $doc.getURL("view",
"$!request.queryString&confirm=1") $doc.getURL("view") $msg.get("yes")
$msg.get("no"))
- #end
+<content>#if($action && $action == "delete")
+ #if($confirm && $confirm == 1)
+ #set($result = $WikiManager.deleteWiki($wikiname, $serverid))
+ #if ($result == $Exception.ERROR_NOERROR)
+ #info($msg.get("wikimanager.successdeletewiki", [$wikiname]))
+ #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
+ #error($msg.get("notallowed"))
+ #else
+ #error($msg.get("wikimanager.errordeletewiki", [$wikiname, $result]))
+ #end
+ #else
+ #xwikimessagebox($msg.get("wikimanager.answer.deletewiki.title")
$msg.get("wikimanager.answer.deletewiki.msg", [$wikiname]) $doc.getURL("view",
"$!request.queryString&confirm=1") $doc.getURL("view") $msg.get("yes")
$msg.get("no"))
+ #end
#end</content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861931000</creationDate>
<date>1192548685000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191514175000</creationDate>
<date>1195044573000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191858101000</creationDate>
<date>1195041935000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191500546000</creationDate>
<date>1195043959000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191862105000</creationDate>
<date>1192967360000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
2007-11-28 14:02:10 UTC (rev 6110)
@@ -12,14 +12,15 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1190985121000</creationDate>
-<date>1194019884000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
-<version>1.1</version>
+<date>1196258170000</date>
+<contentUpdateDate>1196258170000</contentUpdateDate>
+<version>2.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -53,14 +54,14 @@
<tags/>
</property>
</object>
-<content>#if($action == "setvisibility")
- #set($result = $WikiManager.setWikiVisibility($wikiname, $serverid,
$wikivisibility))
- #if ($result == $Exception.ERROR_NOERROR)
- #info($msg.get("wikimanager.successsetvisibility", [$wikiname,
$wikivisibility]))
- #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
- #error($msg.get("notallowed"))
- #else
- #error($msg.get("wikimanager.errorsetvisibility", [$wikiname, $result]))
- #end
+<content>#if($action && $action == "setvisibility")
+ #set($result = $WikiManager.setWikiVisibility($wikiname, $serverid,
$wikivisibility))
+ #if ($result == $Exception.ERROR_NOERROR)
+ #info($msg.get("wikimanager.successsetvisibility", [$wikiname,
$wikivisibility]))
+ #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
+ #error($msg.get("notallowed"))
+ #else
+ #error($msg.get("wikimanager.errorsetvisibility", [$wikiname, $result]))
+ #end
#end</content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861990000</creationDate>
<date>1192549257000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191862009000</creationDate>
<date>1192549207000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861970000</creationDate>
<date>1192548761000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>Panels.PanelClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676964000</creationDate>
<date>1195049983000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173412000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
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
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676868000</creationDate>
<date>1195484631000</date>
-<contentUpdateDate>1195484631000</contentUpdateDate>
-<version>1.24</version>
+<contentUpdateDate>1196173412000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -53,94 +54,94 @@
<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())
-<div style="font-weight:bold;">
- $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()<br />
- #if($hasadmin)
- [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br
/>
- #end
-</div>
-
-#if($wikiList.size()!=0)
- <table id="wikiTable" class="grid sortable filterable doOddEven">
- <tr class="sortHeader">
- <th>$msg.get("wikimanager.listwikiname")</th>
- <th>$msg.get("wikimanager.listwikiadmin")</th>
- <th>$msg.get("wikimanager.listwikicreation")</th>
- <th>$msg.get("wikimanager.listwikistate")</th>
- <th>$msg.get("wikimanager.listwikivisibility")</th>
- <th class="unsortable noFilter">$msg.get("more")</th>
- </tr>
- #foreach($wiki in $wikiList)
- #set($wikiAliasList = $wiki.wikiAliasList)
- <tr>
- <td>$wiki.wikiName #if($wikiAliasList.size() == 1)
([$wikiAliasList.get(0).server>$wikiAliasList.get(0).homePageUrl])
#end</td>
- <td>#if($wikiAliasList.size()==1) [$wikiAliasList.get(0).owner]
#end</td>
- <td>$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")</td>
- <td>#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state
#end</td>
- <td>#if($wikiAliasList.size()==1)
$wikiAliasList.get(0).visibility #end</td>
- <td>
- #if($wikiAliasList.size()==1)
- #if($wikiAliasList.get(0).visibility == "public")
-
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=private]
|
- #elseif($wikiAliasList.get(0).visibility == "private")
-
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=template]
|
- #elseif($wikiAliasList.get(0).visibility == "template")
-
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=public]
|
- #end
- #end
- [$msg.get("delete")>?action=delete&wikiname=$wiki.WikiName] |
<a href="$wiki.getURL("inline")">$msg.get("edit")</a></td>
- </tr>
- #if($wikiAliasList.size() > 1)
- #foreach($wikiAlias in $wikiAliasList)
- <tr>
- <td>-
[$wikiAlias.server>$wikiAlias.homePageUrl]</td>
- <td>[$wikiAlias.owner]</td>
- <td></td>
- <td>$wikiAlias.state</td>
- <td>$wikiAlias.visibility</td>
- <td>
- #if($wikiAlias.visibility == "public")
-
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=private]
|
- #elseif($wikiAlias.visibility == "private")
-
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=template]
|
- #elseif($wikiAlias.visibility == "template")
-
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=public]
|
- #end
-
[$msg.get("delete")>?action=delete&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId]
- </td>
- </tr>
- #end
- #end
- #end
- </table>
-#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"))
+
+#############################################################################
+
+#if($action)
+ #if($action == "delete")
+ #includeInContext("WikiCode.DeleteWikiCode")
+ #elseif($action == "setvisibility")
+ #includeInContext("WikiCode.SetWikiVisibilityCode")
+ #end
+#end
+
+#############################################################################
+
+1 Wikis
+
+#############################################################################
+
+#set($wikiList = $WikiManager.getAllWikis())
+<div style="font-weight:bold;">
+ $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()<br />
+ #if($hasadmin)
+ [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br
/>
+ #end
+</div>
+
+#if($wikiList.size()!=0)
+ <table id="wikiTable" class="grid sortable filterable doOddEven">
+ <tr class="sortHeader">
+ <th>$msg.get("wikimanager.listwikiname")</th>
+ <th>$msg.get("wikimanager.listwikiadmin")</th>
+ <th>$msg.get("wikimanager.listwikicreation")</th>
+ <th>$msg.get("wikimanager.listwikistate")</th>
+ <th>$msg.get("wikimanager.listwikivisibility")</th>
+ <th class="unsortable noFilter">$msg.get("more")</th>
+ </tr>
+ #foreach($wiki in $wikiList)
+ #set($wikiAliasList = $wiki.wikiAliasList)
+ <tr>
+ <td>$wiki.wikiName #if($wikiAliasList.size() == 1)
([$wikiAliasList.get(0).server>$wikiAliasList.get(0).homePageUrl])
#end</td>
+ <td>#if($wikiAliasList.size()==1) [$wikiAliasList.get(0).owner]
#end</td>
+ <td>$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")</td>
+ <td>#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state
#end</td>
+ <td>#if($wikiAliasList.size()==1)
$wikiAliasList.get(0).visibility #end</td>
+ <td>
+ #if($wikiAliasList.size()==1)
+ #if($wikiAliasList.get(0).visibility == "public")
+
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=private]
|
+ #elseif($wikiAliasList.get(0).visibility == "private")
+
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=template]
|
+ #elseif($wikiAliasList.get(0).visibility == "template")
+
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$wikiAliasList.get(0).WikiName&serverid=$wikiAliasList.get(0).objectId&wikivisibility=public]
|
+ #end
+ #end
+ [$msg.get("delete")>?action=delete&wikiname=$wiki.WikiName] |
<a href="$wiki.getURL("inline")">$msg.get("edit")</a></td>
+ </tr>
+ #if($wikiAliasList.size() > 1)
+ #foreach($wikiAlias in $wikiAliasList)
+ <tr>
+ <td>-
[$wikiAlias.server>$wikiAlias.homePageUrl]</td>
+ <td>[$wikiAlias.owner]</td>
+ <td></td>
+ <td>$wikiAlias.state</td>
+ <td>$wikiAlias.visibility</td>
+ <td>
+ #if($wikiAlias.visibility == "public")
+
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=private]
|
+ #elseif($wikiAlias.visibility == "private")
+
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=template]
|
+ #elseif($wikiAlias.visibility == "template")
+
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId&wikivisibility=public]
|
+ #end
+
[$msg.get("delete")>?action=delete&wikiname=$wikiAlias.WikiName&serverid=$wikiAlias.objectId]
+ </td>
+ </tr>
+ #end
+ #end
+ #end
+ </table>
+#else
+ $msg.get("wikimanager.listwikiempty")
+#end
</content></xwikidoc>
\ No newline at end of file
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186679007000</creationDate>
<date>1195050866000</date>
-<contentUpdateDate>1195305638000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1188217603000</creationDate>
<date>1191517448000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationXwikiserverclass
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1188217580000</creationDate>
<date>1191432783000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XAppClasses.XWikiApplicationClass</name>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClass
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1187881140000</creationDate>
<date>1192547854000</date>
-<contentUpdateDate>1195305639000</contentUpdateDate>
+<contentUpdateDate>1196173411000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<class>
<name>XWiki.XWikiServerClass</name>
<customClass></customClass>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassSheet
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1187881143000</creationDate>
<date>1195488803000</date>
-<contentUpdateDate>1195488803000</contentUpdateDate>
-<version>1.35</version>
+<contentUpdateDate>1196173411000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -53,72 +54,72 @@
<tags/>
</property>
</object>
-<content>#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#set($action = $request.getParameter("action"))
-#set($domain = $request.getParameter("domain"))
-
-#set($wiki = $WikiManager.getWikiFromDocumentName($doc.fullName))
-
-#############################################################################
-
-#if($action && ($action == "create") && $domain &&
($domain.trim().length() > 0))
- #set($alias = $wiki.getWikiAlias($domain))
- #if(!$alias)
- #set($alias = $wiki.newObject("XWiki.XWikiServerClass"))
- $alias.set("server", $domain)
- $wiki.save()
- #end
-#end
-
-#if($action && ($action == "delete") && $domain &&
($domain.trim().length() > 0))
- #set($alias = $wiki.getWikiAlias($domain))
- #if($alias)
- #set($removed = $wiki.removeObject($alias.objectApi))
- $wiki.save()
- #end
-#end
-
-#############################################################################
-
-#set($wikiAliasList = $wiki.wikiAliasList)
-
-#if($wikiAliasList.size() > 0)
- 1 Wiki "$wiki.wikiName"
-
- #if($context.action == "view")
- 1.1 Create new alias
-
- <form method="get" action="$doc.getURL("inline")">
- <input type="hidden" name="action" value="create"/>
- Create new alias: <input type="text" name="domain"
class="wikialiasinput"/>
- <input type="submit" class="button" value="$msg.get("create")"/>
- </form>
- #end
-
-
- #if($context.action == "view")
- 1.1 View aliases
- #end
-
- #foreach($wikiAlias in $wikiAliasList)
- 1.1.1 $wikiAlias.server
- #if($context.action == "view")
- <form method="get" action="$doc.getURL("view")">
- <input type="hidden" name="action" value="delete"/>
- <input type="hidden" name="domain" value="$wikiAlias.server"/>
- <input type="submit" class="button" value="$msg.get("delete")"/>
- </form>
- #end
-
- <dl>
- #set($class = $wikiAlias.objectApi.xWikiClass)
- #foreach($prop in $class.properties)
- <dt>${prop.prettyName}:</dt>
- <dd>$doc.display($prop.getName(),
$wikiAlias.objectApi)</dd>
- #end
- </dl>
- #end
+<content>#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#set($action = $request.getParameter("action"))
+#set($domain = $request.getParameter("domain"))
+
+#set($wiki = $WikiManager.getWikiFromDocumentName($doc.fullName))
+
+#############################################################################
+
+#if($action && ($action == "create") && $domain &&
($domain.trim().length() > 0))
+ #set($alias = $wiki.getWikiAlias($domain))
+ #if(!$alias)
+ #set($alias = $wiki.newObject("XWiki.XWikiServerClass"))
+ $alias.set("server", $domain)
+ $wiki.save()
+ #end
+#end
+
+#if($action && ($action == "delete") && $domain &&
($domain.trim().length() > 0))
+ #set($alias = $wiki.getWikiAlias($domain))
+ #if($alias)
+ #set($removed = $wiki.removeObject($alias.objectApi))
+ $wiki.save()
+ #end
+#end
+
+#############################################################################
+
+#set($wikiAliasList = $wiki.wikiAliasList)
+
+#if($wikiAliasList.size() > 0)
+ 1 Wiki "$wiki.wikiName"
+
+ #if($context.action == "view")
+ 1.1 Create new alias
+
+ <form method="get" action="$doc.getURL("inline")">
+ <input type="hidden" name="action" value="create"/>
+ Create new alias: <input type="text" name="domain"
class="wikialiasinput"/>
+ <input type="submit" class="button" value="$msg.get("create")"/>
+ </form>
+ #end
+
+
+ #if($context.action == "view")
+ 1.1 View aliases
+ #end
+
+ #foreach($wikiAlias in $wikiAliasList)
+ 1.1.1 $wikiAlias.server
+ #if($context.action == "view")
+ <form method="get" action="$doc.getURL("view")">
+ <input type="hidden" name="action" value="delete"/>
+ <input type="hidden" name="domain" value="$wikiAlias.server"/>
+ <input type="submit" class="button" value="$msg.get("delete")"/>
+ </form>
+ #end
+
+ <dl>
+ #set($class = $wikiAlias.objectApi.xWikiClass)
+ #foreach($prop in $class.properties)
+ <dt>${prop.prettyName}:</dt>
+ <dd>$doc.display($prop.getName(),
$wikiAlias.objectApi)</dd>
+ #end
+ </dl>
+ #end
#end</content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate
2007-11-28 14:01:22 UTC (rev 6109)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XWiki/XWikiServerClassTemplate
2007-11-28 14:02:10 UTC (rev 6110)
@@ -13,13 +13,14 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1187881143000</creationDate>
<date>1195470259000</date>
-<contentUpdateDate>1195470259000</contentUpdateDate>
-<version>1.2</version>
+<contentUpdateDate>1196173411000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
+<minorEdit>false</minorEdit>
<object>
<class>
<name>XWiki.TagClass</name>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications