Author: tmortagne
Date: 2007-11-12 16:07:44 +0100 (Mon, 12 Nov 2007)
New Revision: 5830
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
Log:
Move actions before title printing. Like that when application manager
applications translations pages are registered title will be correctly printed
and not need to refresh the page.
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XApp/XWikiApplicationXapp
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,9 +11,9 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<creationDate>1192218584000</creationDate>
+<date>1192218584000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/DeleteAppCode
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,9 +11,9 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<creationDate>1192218584000</creationDate>
+<date>1192218584000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ExportAppCode
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,9 +11,9 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<creationDate>1192218584000</creationDate>
+<date>1192218584000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ImportAppCode
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,9 +11,9 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<creationDate>1192218584000</creationDate>
+<date>1192218584000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppCode/ReloadAppCode
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,9 +11,9 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
+<creationDate>1192218584000</creationDate>
+<date>1192218584000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/CreateApplication
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,10 +11,10 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192542917000</date>
-<contentUpdateDate>1192542917000</contentUpdateDate>
-<version>1.3</version>
+<creationDate>1192218584000</creationDate>
+<date>1192550117000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -53,62 +53,62 @@
<tags/>
</property>
</object>
-<content>#set($AppManager = $xwiki.applicationmanager)
-#set($Exception = $AppManager.DefaultException)
-
-#set($appdocument = $AppManager.createApplicationDocument())
-#set($appdocumentobject =
$appdocument.updateObjectFromRequest("XAppClasses.XWikiApplicationClass"))
-
-#set($action = $request.getParameter("action"))
-
-#############################################################################
-
-1 $msg.get("xapp.createapplication")
-
-#if ($action)
- #if($action == "create")
- #set($result = $AppManager.createApplication($appdocument, true))
- #if ($result == $Exception.ERROR_NOERROR)
- <font color=green>
- $msg.get("xapp.successcreateapp", [$appdocument.appname,
$appdocument.getFullName()])
- </font>
- #else
- <font color=red>
- #if ($result == $Exception.ERROR_AM_APPDOCALREADYEXISTS)
- $msg.get("xapp.errorcreateapp.ERROR_AM_APPDOCALREADYEXISTS",
[$appdocument.appname])
- #else
- $msg.get("xapp.errorcreateapp", [$appdocument.appname, $result])
- #end
- </font>
- #end
- #end
-#end
-
-<style>
- .xem_userlisttable td {}
-</style>
-
-<form method="get" name="createapplication">
- <input type="hidden" name="action" value="create">
-
- <table width="100%">
- <tr>
- <td>$msg.get("xapp.appname")</td>
- <td>$appdocument.display("appname", "edit")</td>
- <td id="appnameerrormsg" width="40%"></td>
- </tr>
- <tr>
- <td>$msg.get("xapp.description")</td>
- <td>$appdocument.display("description", "edit")</td>
- <td id="appdescerrormsg" width="40%"></td>
- </tr>
- <tr>
- <td>$msg.get("version")</td>
- <td>$appdocument.display("appversion", "edit")</td>
- <td id="appversionerrormsg" width="40%"></td>
- </tr>
- </table>
-
- <input type="submit" value="$msg.get("create")">
+<content>#set($AppManager = $xwiki.applicationmanager)
+#set($Exception = $AppManager.DefaultException)
+
+#set($appdocument = $AppManager.createApplicationDocument())
+#set($appdocumentobject =
$appdocument.updateObjectFromRequest("XAppClasses.XWikiApplicationClass"))
+
+#set($action = $request.getParameter("action"))
+
+#############################################################################
+
+1 $msg.get("xapp.createapplication")
+
+#if ($action)
+ #if($action == "create")
+ #set($result = $AppManager.createApplication($appdocument, true))
+ #if ($result == $Exception.ERROR_NOERROR)
+ <font color=green>
+ $msg.get("xapp.successcreateapp", [$appdocument.appname,
$appdocument.getFullName()])
+ </font>
+ #else
+ <font color=red>
+ #if ($result == $Exception.ERROR_AM_APPDOCALREADYEXISTS)
+ $msg.get("xapp.errorcreateapp.ERROR_AM_APPDOCALREADYEXISTS",
[$appdocument.appname])
+ #else
+ $msg.get("xapp.errorcreateapp", [$appdocument.appname, $result])
+ #end
+ </font>
+ #end
+ #end
+#end
+
+<style>
+ .xem_userlisttable td {}
+</style>
+
+<form method="get" name="createapplication">
+ <input type="hidden" name="action" value="create">
+
+ <table width="100%">
+ <tr>
+ <td>$msg.get("xapp.appname")</td>
+ <td>$appdocument.display("appname", "edit")</td>
+ <td id="appnameerrormsg" width="40%"></td>
+ </tr>
+ <tr>
+ <td>$msg.get("xapp.description")</td>
+ <td>$appdocument.display("description", "edit")</td>
+ <td id="appdescerrormsg" width="40%"></td>
+ </tr>
+ <tr>
+ <td>$msg.get("version")</td>
+ <td>$appdocument.display("appversion", "edit")</td>
+ <td id="appversionerrormsg" width="40%"></td>
+ </tr>
+ </table>
+
+ <input type="submit" value="$msg.get("create")">
</form></content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppManager/WebHome
2007-11-12 15:07:44 UTC (rev 5830)
@@ -10,11 +10,11 @@
<creator></creator>
<author>XWiki.Admin</author>
<customClass></customClass>
-<contentAuthor></contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192211384000</date>
-<contentUpdateDate>1192211384000</contentUpdateDate>
-<version>1.1</version>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1192218584000</creationDate>
+<date>1194879690000</date>
+<contentUpdateDate>1194879690000</contentUpdateDate>
+<version>1.4</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -53,58 +53,58 @@
<tags/>
</property>
</object>
-<content>#set($Appmanager = $xwiki.applicationmanager)
-#set($Exception = $Appmanager.DefaultException)
-
-#set($action = $request.getParameter("action"))
-#set($confirm = $request.getParameter("confirm"))
-
-#set($appname = $request.getParameter("appname"))
-#set($packagename = $request.getParameter("packagename"))
-#set($recurse = $request.getParameter("recurse"))
-#set($withversion = $request.getParameter("withversion"))
-
-1 $msg.get("xapp.appmanager")
-
-#############################################################################
-
-#if($action)
- #if($action == "delete")
- #includeInContext("XAppCode.DeleteAppCode")
- #elseif($action == "export")
- #includeInContext("XAppCode.ExportAppCode")
- #elseif($action == "import")
- #includeInContext("XAppCode.ImportAppCode")
- #elseif($action == "reload")
- #includeInContext("XAppCode.ReloadAppCode")
- #end
-#end
-
-#############################################################################
-
-#set($listApp = $Appmanager.getApplicationDocumentList())
-
-$msg.get("xapp.totalnumberofapp") : $listApp.size()
-
-[$msg.get("xapp.createapplication")>CreateApplication]
-
-#if($listApp.size() > 0)
- {table}
- $msg.get("xapp.appname") | $msg.get("version") |
$msg.get("xapp.description") | $msg.get("more")
- #foreach($app in $listApp)
- [$app.appname>$app.getFullName()] | $app.appversion |
$app.description |
[$msg.get("delete")>?action=delete&appname=$app.appname]
[$msg.get("xapp.action.exportrecurse")>?action=export&appname=$app.appname]
[$msg.get("xapp.action.reloadapp")>?action=reload&appname=$app.appname]
<a href="$app.getURL("inline")">$msg.get("edit")</a>
- #end
- {table}
-#end
-
-#############################################################################
-
-#if($context.hasAdminRights())
- 1.1 $msg.get("xapp.availablefilestoimport")
-
- #set($listpackage=$doc.getAttachmentList())
- #foreach ($package in $listpackage)
- -
[$package.getFilename()>?action=import&packagename=$package.getFilename()]
- #end
+<content>#set($Appmanager = $xwiki.applicationmanager)
+#set($Exception = $Appmanager.DefaultException)
+
+#set($action = $request.getParameter("action"))
+#set($confirm = $request.getParameter("confirm"))
+
+#set($appname = $request.getParameter("appname"))
+#set($packagename = $request.getParameter("packagename"))
+#set($recurse = $request.getParameter("recurse"))
+#set($withversion = $request.getParameter("withversion"))
+
+#############################################################################
+
+#if($action)
+ #if($action == "delete")
+ #includeInContext("XAppCode.DeleteAppCode")
+ #elseif($action == "export")
+ #includeInContext("XAppCode.ExportAppCode")
+ #elseif($action == "import")
+ #includeInContext("XAppCode.ImportAppCode")
+ #elseif($action == "reload")
+ #includeInContext("XAppCode.ReloadAppCode")
+ #end
+#end
+
+#############################################################################
+
+1 $msg.get("xapp.appmanager")
+
+#set($listApp = $Appmanager.getApplicationDocumentList())
+
+$msg.get("xapp.totalnumberofapp") : $listApp.size()
+
+[$msg.get("xapp.createapplication")>CreateApplication]
+
+#if($listApp.size() > 0)
+ {table}
+ $msg.get("xapp.appname") | $msg.get("version") |
$msg.get("xapp.description") | $msg.get("more")
+ #foreach($app in $listApp)
+ [$app.appname>$app.getFullName()] | $app.appversion |
$app.description |
[$msg.get("delete")>?action=delete&appname=$app.appname]
[$msg.get("xapp.action.exportrecurse")>?action=export&appname=$app.appname]
[$msg.get("xapp.action.reloadapp")>?action=reload&appname=$app.appname]
<a href="$app.getURL("inline")">$msg.get("edit")</a>
+ #end
+ {table}
+#end
+
+#############################################################################
+
+#if($context.hasAdminRights())
+ 1.1 $msg.get("xapp.availablefilestoimport")
+
+ #set($listpackage=$doc.getAttachmentList())
+ #foreach ($package in $listpackage)
+ -
[$package.getFilename()>?action=import&packagename=$package.getFilename()]
+ #end
#end</content>
</xwikidoc>
Modified:
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
===================================================================
---
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
2007-11-12 15:05:12 UTC (rev 5829)
+++
xwiki-platform/xwiki-applications/trunk/application-manager/src/main/resources/XAppResources/Translations
2007-11-12 15:07:44 UTC (rev 5830)
@@ -11,10 +11,10 @@
<author>XWiki.Admin</author>
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
-<creationDate>1192211384000</creationDate>
-<date>1192542903000</date>
-<contentUpdateDate>1192542903000</contentUpdateDate>
-<version>1.2</version>
+<creationDate>1192218584000</creationDate>
+<date>1192550103000</date>
+<contentUpdateDate>1192719385000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -53,40 +53,40 @@
<tags/>
</property>
</object>
-<content>{table}
-xapp.appmanager=Applications manager
-
-# LABELS
-xapp.totalnumberofapp=Total number of applications
-xapp.appname=Application
-xapp.description=Description
-xapp.docname=Document Name
-xapp.availablefilestoimport=Available files to import
-
-# ACTIONS
-xapp.createapplication=Create new application
-xapp.action.reloadapp=Reload
-xapp.action.exportrecurse=Export
-xapp.action.exportnonrecurse=Export (non recursive)
-
-# ANSWER
-xapp.answer.deleteapp.title=Delete application \"{0}\"
-xapp.answer.deleteapp.msg=Are you sure you wish to delete application \"{0}\" ?
-xapp.answer.exportapp.title=Export application \"{0}\"
-xapp.answer.exportapp.recursive=Recursive
-xapp.answer.exportapp.withdetails=With history
-
-# MESSAGES
-xapp.successexportapp=Export application \"{0}\" succes.
-xapp.errorexportapp=An error occurred while exporting application \"{0}\"
(code \"{1}\").
-xapp.successimportapp=Import application package \"{0}\" succes.
-xapp.errorimportapp=An error occurred while importing application package
\"{0}\" (code \"{1}\").
-xapp.successdeleteapp=Delete application \"{0}\" succes.
-xapp.errordeleteapp=An error occurred while deleting application \"{0}\" (code
\"{1}\").
-xapp.successcreateapp=Application \"{0}\" has been created. You can access it
at [{1}].
-xapp.errorcreateapp=An error occurred while creating application \"{0}\" (code
\"{1}\").
-xapp.errorcreateapp.ERROR_AM_APPDOCALREADYEXISTS=Application \"{0}\" already
exists. Choose another name.
-xapp.successreloadapp=Reload application \"{0}\" succes.
-xapp.errorreloadapp=An error occurred while reloading application \"{0}\"
(code \"{1}\").
+<content>{table}
+xapp.appmanager=Applications manager
+
+# LABELS
+xapp.totalnumberofapp=Total number of applications
+xapp.appname=Application
+xapp.description=Description
+xapp.docname=Document Name
+xapp.availablefilestoimport=Available files to import
+
+# ACTIONS
+xapp.createapplication=Create new application
+xapp.action.reloadapp=Reload
+xapp.action.exportrecurse=Export
+xapp.action.exportnonrecurse=Export (non recursive)
+
+# ANSWER
+xapp.answer.deleteapp.title=Delete application \"{0}\"
+xapp.answer.deleteapp.msg=Are you sure you wish to delete application \"{0}\" ?
+xapp.answer.exportapp.title=Export application \"{0}\"
+xapp.answer.exportapp.recursive=Recursive
+xapp.answer.exportapp.withdetails=With history
+
+# MESSAGES
+xapp.successexportapp=Export application \"{0}\" succes.
+xapp.errorexportapp=An error occurred while exporting application \"{0}\"
(code \"{1}\").
+xapp.successimportapp=Import application package \"{0}\" succes.
+xapp.errorimportapp=An error occurred while importing application package
\"{0}\" (code \"{1}\").
+xapp.successdeleteapp=Delete application \"{0}\" succes.
+xapp.errordeleteapp=An error occurred while deleting application \"{0}\" (code
\"{1}\").
+xapp.successcreateapp=Application \"{0}\" has been created. You can access it
at [{1}].
+xapp.errorcreateapp=An error occurred while creating application \"{0}\" (code
\"{1}\").
+xapp.errorcreateapp.ERROR_AM_APPDOCALREADYEXISTS=Application \"{0}\" already
exists. Choose another name.
+xapp.successreloadapp=Reload application \"{0}\" succes.
+xapp.errorreloadapp=An error occurred while reloading application \"{0}\"
(code \"{1}\").
{table}</content>
</xwikidoc>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
