Author: tmortagne
Date: 2007-09-28 13:26:46 +0200 (Fri, 28 Sep 2007)
New Revision: 5132
Added:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
Log:
XAWM-5: Cleaning Wiki Manager main page used to list wikis and doing some
actions on theses :
- moving actions in WikiCode space one action a page (ex :
WikiCode.DeleteWikiCode) included in WikiManager.WebHome
- use standard error and info message macros (#error("errorstring"),
#info("infostring"))
- add specific error message for all actions user does not have rights
Property changes on: xwiki-platform/xwiki-applications/trunk/wiki-manager
___________________________________________________________________
Name: svn:ignore
- target
*.iml
*.ipr
nbproject
.classpath
.eclipse
*.iws
+ target
*.iml
*.ipr
nbproject
.classpath
.eclipse
*.iws
.project
Added:
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-09-28 10:45:28 UTC (rev 5131)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
2007-09-28 11:26:46 UTC (rev 5132)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WikiCode</web>
+<name>DeleteWikiCode</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1190977558000</creationDate>
+<date>1190978284000</date>
+<contentUpdateDate>1190978284000</contentUpdateDate>
+<version>1.3</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WikiCode.DeleteWikiCode</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#if($action == "delete")
+ #if($confirm && $confirm == 1)
+ #set($result = $WikiManager.deleteWiki($wikiname))
+ #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>
Added:
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-09-28 10:45:28 UTC (rev 5131)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
2007-09-28 11:26:46 UTC (rev 5132)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>WikiCode</web>
+<name>SetWikiVisibilityCode</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1190977921000</creationDate>
+<date>1190978288000</date>
+<contentUpdateDate>1190978288000</contentUpdateDate>
+<version>1.2</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>WikiCode.SetWikiVisibilityCode</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#if($action == "delete")
+ #set($result = $WikiManager.setWikiVisibility($wikiname, $wikivisibility))
+ #if ($result == $Exception.ERROR_NOERROR)
+ #info("wikimanager.successsetvisibility", [$wikiname, $wikivisibility]))
+ #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
+ #error($msg.get("notallowed"))
+ #else
+ #error("wikimanager.errorsetvisibility", [$wikiname, $result]))
+ #end
+#end</content>
+</xwikidoc>
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-09-28 10:45:28 UTC (rev 5131)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
2007-09-28 11:26:46 UTC (rev 5132)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186669668000</creationDate>
-<date>1188486870000</date>
-<contentUpdateDate>1189614079000</contentUpdateDate>
-<version>1.1</version>
+<date>1190978279000</date>
+<contentUpdateDate>1190978279000</contentUpdateDate>
+<version>1.7</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -53,101 +53,79 @@
<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($wikivisibility = $request.getParameter("wikivisibility"))
-
-#############################################################################
-
-#if($action)
- #if($action == "delete")
- #if($confirm == 1)
- #set($result = $wikimanager.deleteWiki($wikiname))
- #if ($result == $Exception.ERROR_NOERROR)
- <font color=green>
- $msg.get("wikimanager.successdeletewiki", [$wikiname])
- </font>
- #else
- <font color=red>
- $msg.get("wikimanager.errordeletewiki", [$wikiname, $result])
- </font>
- #end
- #else
- #xwikimessagebox($msg.get("wikimanager.answer.deletewiki.title")
$msg.get("wikimanager.answer.deletewiki.msg", [$wikiname]) $doc.getURL("view",
"confirm=1&action=delete&wikiname=$wikiname") $doc.getURL("view")
$msg.get("yes") $msg.get("no"))
- #end
- #elseif($action == "setvisibility")
- #set($result = $wikimanager.setWikiVisibility($wikiname, $wikivisibility))
- #if ($result == $Exception.ERROR_NOERROR)
- <font color=green>
- $msg.get("wikimanager.successsetvisibility", [$wikiname,
$wikivisibility])
- </font>
- #else
- <font color=red>
- $msg.get("wikimanager.errorsetvisibility", [$wikiname, $result])
- </font>
- #end
- #end
-#end
-
-#############################################################################
-
-1 Wikis
-
-#############################################################################
-
-#if($context.user!="XWiki.XWikiGuest")
- #set($domainname = "localdomain.com")
- #set($port = ":"+$request.getServerPort())
- #set($created = 0)
-
- #if(!$wikidesc)
- #set($wikidesc = "")
- #end
-#end
-
-#set($list = $wikimanager.getWikiDocumentList())
-<div style="font-weight:bold;">
- $msg.get("wikimanager.totalnumberofwiki") : $list.size()<br />
- [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br />
-</div>
-
-#if($list.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($serverdoc in $list)
- <tr>
- <td>http://$serverdoc.server</td>
- <td>[$serverdoc.owner]</td>
-
<td>$xwiki.formatDate($serverdoc.creationDate,"dd/MM/yyyy")</td>
- <td>$serverdoc.state</td>
- <td>$serverdoc.visibility</td>
- <td>
- #if($serverdoc.visibility == "public")
-
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=private]
|
- #elseif($serverdoc.visibility == "private")
-
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=template]
|
- #elseif($serverdoc.visibility == "template")
-
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=public]
|
- #end
-
[$msg.get("delete")>?action=delete&wikiname=$serverdoc.WikiName] |
- <a
href="$serverdoc.getURL("inline")">$msg.get("edit")</a>
- </td>
- </tr>
- #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($wikivisibility = $request.getParameter("wikivisibility"))
+
+#############################################################################
+
+#if($action)
+ #if($action == "delete")
+ #includeInContext("WikiCode.DeleteWikiCode")
+ #elseif($action == "setvisibility")
+ #includeInContext("WikiCode.SetWikiVisibilityCode")
+ #end
+#end
+
+#############################################################################
+
+1 Wikis
+
+#############################################################################
+
+#if($context.user!="XWiki.XWikiGuest")
+ #set($domainname = "localdomain.com")
+ #set($port = ":"+$request.getServerPort())
+ #set($created = 0)
+
+ #if(!$wikidesc)
+ #set($wikidesc = "")
+ #end
+#end
+
+#set($list = $WikiManager.getWikiDocumentList())
+<div style="font-weight:bold;">
+ $msg.get("wikimanager.totalnumberofwiki") : $list.size()<br />
+ [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br />
+</div>
+
+#if($list.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($serverdoc in $list)
+ <tr>
+ <td>http://$serverdoc.server</td>
+ <td>[$serverdoc.owner]</td>
+
<td>$xwiki.formatDate($serverdoc.creationDate,"dd/MM/yyyy")</td>
+ <td>$serverdoc.state</td>
+ <td>$serverdoc.visibility</td>
+ <td>
+ #if($serverdoc.visibility == "public")
+
[$msg.get("WikiManager.action.setvisibility.private")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=private]
|
+ #elseif($serverdoc.visibility == "private")
+
[$msg.get("WikiManager.action.setvisibility.template")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=template]
|
+ #elseif($serverdoc.visibility == "template")
+
[$msg.get("WikiManager.action.setvisibility.public")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=public]
|
+ #end
+
[$msg.get("delete")>?action=delete&wikiname=$serverdoc.WikiName] |
+ <a
href="$serverdoc.getURL("inline")">$msg.get("edit")</a>
+ </td>
+ </tr>
+ #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/XApp/XWikiApplicationWikiManager
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-09-28 10:45:28 UTC (rev 5131)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-09-28 11:26:46 UTC (rev 5132)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1188210403000</creationDate>
-<date>1188464721000</date>
-<contentUpdateDate>1189614079000</contentUpdateDate>
-<version>1.1</version>
+<date>1190978504000</date>
+<contentUpdateDate>1190978504000</contentUpdateDate>
+<version>1.3</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -230,6 +230,8 @@
<value>WikiManager.CreateNewWiki</value>
<value>WikiManager.WebHome</value>
<value>WikiResources.Translations</value>
+<value>WikiCode.DeleteWikiCode</value>
+<value>WikiCode.SetWikiVisibilityCode</value>
</documents>
</property>
<property>
@@ -272,4 +274,4 @@
</property>
</object>
<content>#includeForm("XAppSheets.XWikiApplicationClassSheet")
-</content></xwikidoc>
+</content></xwikidoc>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
