Author: tmortagne Date: 2007-11-12 15:08:11 +0100 (Mon, 12 Nov 2007) New Revision: 5828
Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki Log: Add default date format use when default time format can't be retrieved from translations pages. 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-12 13:50:19 UTC (rev 5827) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-11-12 14:08:11 UTC (rev 5828) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191500546000</creationDate> -<date>1192966731000</date> -<contentUpdateDate>1192966731000</contentUpdateDate> -<version>1.3</version> +<date>1194872334000</date> +<contentUpdateDate>1194872334000</contentUpdateDate> +<version>1.6</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -78,6 +78,9 @@ #if(!$formatDate) #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat")) #end + #if($formatDate == "wikimanager.defaultdatetimeformat") + #set($formatDate = "yyyy MMMM dd 'at' HH:mm") + #end #set($username = $xwiki.getUserName($user)) #if ($username == "XWikiGuest") 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-12 13:50:19 UTC (rev 5827) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode 2007-11-12 14:08:11 UTC (rev 5828) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1190985121000</creationDate> -<date>1194018866000</date> -<contentUpdateDate>1194018866000</contentUpdateDate> -<version>1.4</version> +<date>1194019884000</date> +<contentUpdateDate>1194019884000</contentUpdateDate> +<version>1.5</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> 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-12 13:50:19 UTC (rev 5827) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki 2007-11-12 14:08:11 UTC (rev 5828) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1186676964000</creationDate> -<date>1192549813000</date> -<contentUpdateDate>1192719385000</contentUpdateDate> -<version>1.1</version> +<date>1194019961000</date> +<contentUpdateDate>1194019961000</contentUpdateDate> +<version>1.2</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,108 +53,108 @@ <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 - -<style> - .xem_userlisttable td {} -</style> - -<form method="get" name="createwiki"> - <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> - <td id="wikinameerrormsg" width="40%"></td> - </tr> - <tr> - <td>$msg.get("wikimanager.wikidesc")</td> - <td>$wikidocument.display("description", "edit")</td> - <td id="wikidescerrormsg" width="40%"></td> - </tr> - <tr> - <td>$msg.get("wikimanager.wikidomain")</td> - <td>$wikidocument.display("server", "edit")</td> - <td id="wikidomainerrormsg" width="40%"></td> - </tr> - <tr> - <td>$msg.get("wikimanager.wikiadmin")</td> - <td>$wikidocument.display("owner", "edit")</td> - <td id="wikiadminerrormsg" width="40%"></td> - </tr> - <tr> - <td>$msg.get("wikimanager.wikivisibility")</td> - <td>$wikidocument.display("visibility", "edit")</td> - <td id="wikivisibilityerrormsg" width="40%"></td> - </tr> - <tr> - <td>$msg.get("wikimanager.wikistate")</td> - <td>$wikidocument.display("state", "edit")</td> - <td id="wikistateerrormsg" width="40%"></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> - <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> - <td id="wikitemplateerrormsg" width="40%"></td> - </tr> - </table> - - <input type="submit" value="create"> +<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 &amp;&amp; $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 + +<style> + .xem_userlisttable td {} +</style> + +<form method="get" name="createwiki"> + <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> + <td id="wikinameerrormsg" width="40%"></td> + </tr> + <tr> + <td>$msg.get("wikimanager.wikidesc")</td> + <td>$wikidocument.display("description", "edit")</td> + <td id="wikidescerrormsg" width="40%"></td> + </tr> + <tr> + <td>$msg.get("wikimanager.wikidomain")</td> + <td>$wikidocument.display("server", "edit")</td> + <td id="wikidomainerrormsg" width="40%"></td> + </tr> + <tr> + <td>$msg.get("wikimanager.wikiadmin")</td> + <td>$wikidocument.display("owner", "edit")</td> + <td id="wikiadminerrormsg" width="40%"></td> + </tr> + <tr> + <td>$msg.get("wikimanager.wikivisibility")</td> + <td>$wikidocument.display("visibility", "edit")</td> + <td id="wikivisibilityerrormsg" width="40%"></td> + </tr> + <tr> + <td>$msg.get("wikimanager.wikistate")</td> + <td>$wikidocument.display("state", "edit")</td> + <td id="wikistateerrormsg" width="40%"></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> + <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> + <td id="wikitemplateerrormsg" width="40%"></td> + </tr> + </table> + + <input type="submit" value="create"> </form></content> </xwikidoc> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications