Author: tmortagne
Date: 2007-12-04 10:44:22 +0100 (Tue, 04 Dec 2007)
New Revision: 6264
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
Log:
Fix xhtml validation.
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-12-03 15:26:54 UTC (rev 6263)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
2007-12-04 09:44:22 UTC (rev 6264)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676964000</creationDate>
-<date>1196346273000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
-<version>1.1</version>
+<date>1196761105000</date>
+<contentUpdateDate>1196761105000</contentUpdateDate>
+<version>2.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,100 +54,102 @@
<tags/>
</property>
</object>
-<content>#set($wikimanager = $xwiki.wikimanager)
-#set($Exception = $wikimanager.DefaultException)
-##
-#set($domainname = "localdomain.com")
-##
-#set($wikidocument = $wikimanager.createWikiDocument())
-#set($wikidocumentobject =
$wikidocument.updateObjectFromRequest("XWiki.XWikiServerClass"))
-##
-#set($action = $request.getParameter("action"))
-##
-#set($wikiname = $request.getParameter("wikiname"))
-#set($wikitemplate = $request.getParameter("wikitemplate"))
-#set($wikipackage = $request.getParameter("wikipackage"))
-#if ($wikidocument.owner == "")
- $wikidocument.set("owner", $context.user)
-#end
-#if ($wikidocument.server == "" && $wikiname && $wikiname !=
"")
- $wikidocument.set("server", "${wikiname}.${domainname}")
-#end
-##
-#############################################################################
-##
-1 $msg.get("wikimanager.createwiki")
-##
-#if ($action && $action == "create")
- #set($result = $wikimanager.createNewWiki($wikiname, $wikitemplate,
$wikipackage, $wikidocument, true))
-##
- #if ($result == $Exception.ERROR_NOERROR)
- #info($msg.get("wikimanager.successcreatewiki", [$wikiname,
$wikidocument.getHomePageUrl()]))
- #else
- #if ($result == $Exception.ERROR_WM_WIKIALREADYEXISTS)
-
#error($msg.get("wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS",
[$wikiname, $result]))
- #else
- #error($msg.get("wikimanager.errorcreatewiki", [$wikiname, $result]))
- #end
- #end
-#end
-##
-<form method="get" action="#">
- <fieldset>
- <input type="hidden" name="action" value="create" />
- <table width="100%">
- <tr>
- <td>$msg.get("wikimanager.wikiname")</td>
- <td><input size="30" id="wikiname" name="wikiname"
type="text" /></td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikidesc")</td>
- <td>$wikidocument.display("description", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikidomain")</td>
- <td>$wikidocument.display("server", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikiadmin")</td>
- <td>$wikidocument.display("owner", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikivisibility")</td>
- <td>$wikidocument.display("visibility", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikistate")</td>
- <td>$wikidocument.display("state", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikitemplate")</td>
- <td>
- <select name="wikitemplate" id="wikitemplate">
- <option value=""></option>
- #set($listtemplate=$wikimanager.getWikiTemplateList())
- #foreach ($template in $listtemplate)
- <option
value="$template.wikiName">$template.wikiName</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikipackage")</td>
- <td>
- <select name="wikipackage" id="wikipackage">
- <option value=""></option>
- #set($listpackage=$doc.getAttachmentList())
- #foreach ($package in $listpackage)
- <option
value="$package.getFilename()">$package.getFilename()</option>
- #end
- </select>
- </td>
- </tr>
- </table>
- </fieldset>
- <fieldset>
- <input type="submit" value="create" />
- </fieldset>
+<content>#set($wikimanager = $xwiki.wikimanager)
+#set($Exception = $wikimanager.DefaultException)
+##
+#set($domainname = "localdomain.com")
+##
+#set($wikidocument = $wikimanager.createWikiDocument())
+#set($wikidocumentobject =
$wikidocument.updateObjectFromRequest("XWiki.XWikiServerClass"))
+##
+#set($action = $request.getParameter("action"))
+##
+#set($wikiname = $request.getParameter("wikiname"))
+#set($wikitemplate = $request.getParameter("wikitemplate"))
+#set($wikipackage = $request.getParameter("wikipackage"))
+#if ($wikidocument.owner == "")
+ $wikidocument.set("owner", $context.user)
+#end
+#if ($wikidocument.server == "" && $wikiname && $wikiname !=
"")
+ $wikidocument.set("server", "${wikiname}.${domainname}")
+#end
+##
+#############################################################################
+##
+1 $msg.get("wikimanager.createwiki")
+##
+#if ($action && $action == "create")
+ #set($result = $wikimanager.createNewWiki($wikiname, $wikitemplate,
$wikipackage, $wikidocument, true))
+##
+ #if ($result == $Exception.ERROR_NOERROR)
+ #info($msg.get("wikimanager.successcreatewiki", [$wikiname,
$wikidocument.getHomePageUrl()]))
+ #else
+ #if ($result == $Exception.ERROR_WM_WIKIALREADYEXISTS)
+
#error($msg.get("wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS",
[$wikiname, $result]))
+ #else
+ #error($msg.get("wikimanager.errorcreatewiki", [$wikiname, $result]))
+ #end
+ #end
+#end
+##
+<form method="get" action="#">
+ <fieldset>
+ <legend>$msg.get("wikimanager.legend.wiki")</legend>
+ <input type="hidden" name="action" value="create" />
+ <table width="100%">
+ <tr>
+ <td>$msg.get("wikimanager.wikiname")</td>
+ <td><input size="30" id="wikiname" name="wikiname"
type="text" /></td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikidesc")</td>
+ <td>$wikidocument.display("description", "edit")</td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikidomain")</td>
+ <td>$wikidocument.display("server", "edit")</td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikiadmin")</td>
+ <td>$wikidocument.display("owner", "edit")</td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikivisibility")</td>
+ <td>$wikidocument.display("visibility", "edit")</td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikistate")</td>
+ <td>$wikidocument.display("state", "edit")</td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikitemplate")</td>
+ <td>
+ <select name="wikitemplate" id="wikitemplate">
+ <option value=""></option>
+ #set($listtemplate=$wikimanager.getWikiTemplateList())
+ #foreach ($template in $listtemplate)
+ <option
value="$template.wikiName">$template.wikiName</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>$msg.get("wikimanager.wikipackage")</td>
+ <td>
+ <select name="wikipackage" id="wikipackage">
+ <option value=""></option>
+ #set($listpackage=$doc.getAttachmentList())
+ #foreach ($package in $listpackage)
+ <option
value="$package.getFilename()">$package.getFilename()</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <fieldset>
+ <legend>$msg.get("wikimanager.legend.validate")</legend>
+ <input type="submit" value="create" />
+ </fieldset>
</form></content>
</xwikidoc>
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-12-03 15:26:54 UTC (rev 6263)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
2007-12-04 09:44:22 UTC (rev 6264)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186679007000</creationDate>
-<date>1196269098000</date>
-<contentUpdateDate>1196356923000</contentUpdateDate>
-<version>1.1</version>
+<date>1196761095000</date>
+<contentUpdateDate>1196761095000</contentUpdateDate>
+<version>2.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,75 +54,77 @@
<tags/>
</property>
</object>
-<content>{table}
-##
-# Wiki Manager translation page
-##
-wikimanager.wikimanager=Wiki Manager
-##
-wikimanager.wikinameneeded=A name for the wiki is necessary
-##
-# CONF
-##
-wikimanager.defaultdatetimeformat=yyyy MMMM dd 'at' HH:mm
-##
-# LABELS
-##
-wikimanager.createwiki=Create a new wiki
-wikimanager.totalnumberofwiki=Total number of wiki
-wikimanager.wikiname=Wiki name
-wikimanager.wikidesc=Description
-wikimanager.wikidomain=Domain
-wikimanager.wikiadmin=Administrator
-wikimanager.wikivisibility=Visibility
-wikimanager.wikistate=State
-wikimanager.wikitemplate=From wiki template
-wikimanager.wikipackage=From package (attached file)
-wikimanager.listwikiname=Name
-wikimanager.listwikirank=Rank
-wikimanager.listwikiadmin=Admin
-wikimanager.listwikicreation=Creation
-wikimanager.listwikistate=State
-wikimanager.listwikivisibility=Visibility
-##
-# WIDGETS
-##
-wikimanager.widget.lastcreatedwikis.title=Last created wikis
-wikimanager.widget.userwikisadmin.title=Wikis you administrate
-wikimanager.widget.userwikisuser.title=Wikis you view
-wikimanager.widget.userwikisowner.title=Wikis you own
-wikimanager.widget.lastmodifications.title=Recent modifications
-wikimanager.widget.mylastmodifications.title=My recent modifications
-##
-# ANSWERS
-##
-wikimanager.answer.deletewiki.title=Delete wiki
-wikimanager.answer.deletewiki.msg=Are you sure you wish to delete wiki \"{0}\"
?
-##
-# ACTIONS
-##
-wikimanager.listwikiactions=Actions
-wikimanager.listwikiactionspref=Pref
-wikimanager.listwikiactionsmembers=Members
-wikimanager.listwikiactionsrights=Rights
-wikimanager.listwikiactionsgroups=Groups
-wikimanager.listwikiactionsstat=Stat
-wikimanager.action.setvisibility.public=Set as public
-wikimanager.action.setvisibility.private=Set as private
-wikimanager.action.setvisibility.template=Set as template
-##
-# MESSAGES
-##
-wikimanager.successdeletewiki=Wiki \"{0}\" deleted.
-wikimanager.errordeletewiki=Wiki \"{0}\" delete failed with error code \"{1}\".
-wikimanager.successsetvisibility=Wiki \"{0}\" visibility changed to \"{1}\".
-wikimanager.errorsetvisibility=Wiki \"{0}' visibility changing failed with
error code \"{1}\".
-wikimanager.successcreatewiki=Your wiki \"{0}\" has been created. You can
access it at the following address: {1}.
-wikimanager.errorcreatewiki=Wiki \"{0}\" creation failed with error code
\"{1}\".
-wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS=This wiki \"{0}\"
already exist. Please choose another name.
-wikimanager.listwikiempty=There are no open wikis.
-##
-# MOVE IN STANDARD XWIKI
-error.ERROR_XWIKI_ACCESS_DENIED=You don't have permission to make this action.
+<content>{table}
+##
+# Wiki Manager translation page
+##
+wikimanager.wikimanager=Wiki Manager
+##
+wikimanager.wikinameneeded=A name for the wiki is necessary
+##
+# CONF
+##
+wikimanager.defaultdatetimeformat=yyyy MMMM dd 'at' HH:mm
+##
+# LABELS
+##
+wikimanager.createwiki=Create a new wiki
+wikimanager.totalnumberofwiki=Total number of wiki
+wikimanager.wikiname=Wiki name
+wikimanager.wikidesc=Description
+wikimanager.wikidomain=Domain
+wikimanager.wikiadmin=Administrator
+wikimanager.wikivisibility=Visibility
+wikimanager.wikistate=State
+wikimanager.wikitemplate=From wiki template
+wikimanager.wikipackage=From package (attached file)
+wikimanager.listwikiname=Name
+wikimanager.listwikirank=Rank
+wikimanager.listwikiadmin=Admin
+wikimanager.listwikicreation=Creation
+wikimanager.listwikistate=State
+wikimanager.listwikivisibility=Visibility
+wikimanager.legend.wiki=Wiki
+wikimanager.legend.validate=Validate
+##
+# WIDGETS
+##
+wikimanager.widget.lastcreatedwikis.title=Last created wikis
+wikimanager.widget.userwikisadmin.title=Wikis you administrate
+wikimanager.widget.userwikisuser.title=Wikis you view
+wikimanager.widget.userwikisowner.title=Wikis you own
+wikimanager.widget.lastmodifications.title=Recent modifications
+wikimanager.widget.mylastmodifications.title=My recent modifications
+##
+# ANSWERS
+##
+wikimanager.answer.deletewiki.title=Delete wiki
+wikimanager.answer.deletewiki.msg=Are you sure you wish to delete wiki \"{0}\"
?
+##
+# ACTIONS
+##
+wikimanager.listwikiactions=Actions
+wikimanager.listwikiactionspref=Pref
+wikimanager.listwikiactionsmembers=Members
+wikimanager.listwikiactionsrights=Rights
+wikimanager.listwikiactionsgroups=Groups
+wikimanager.listwikiactionsstat=Stat
+wikimanager.action.setvisibility.public=Set as public
+wikimanager.action.setvisibility.private=Set as private
+wikimanager.action.setvisibility.template=Set as template
+##
+# MESSAGES
+##
+wikimanager.successdeletewiki=Wiki \"{0}\" deleted.
+wikimanager.errordeletewiki=Wiki \"{0}\" delete failed with error code \"{1}\".
+wikimanager.successsetvisibility=Wiki \"{0}\" visibility changed to \"{1}\".
+wikimanager.errorsetvisibility=Wiki \"{0}' visibility changing failed with
error code \"{1}\".
+wikimanager.successcreatewiki=Your wiki \"{0}\" has been created. You can
access it at the following address: {1}.
+wikimanager.errorcreatewiki=Wiki \"{0}\" creation failed with error code
\"{1}\".
+wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS=This wiki \"{0}\"
already exist. Please choose another name.
+wikimanager.listwikiempty=There are no open wikis.
+##
+# MOVE IN STANDARD XWIKI
+error.ERROR_XWIKI_ACCESS_DENIED=You don't have permission to make this action.
{table}</content>
</xwikidoc>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
