Author: tmortagne
Date: 2007-11-15 10:45:37 +0100 (Thu, 15 Nov 2007)
New Revision: 5878

Modified:
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
   
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
Log:
XEM-64: Register translations informations is not needed anymore in install 
page.

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
===================================================================
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
       2007-11-14 19:34:01 UTC (rev 5877)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/Main/WebHome
       2007-11-15 09:45:37 UTC (rev 5878)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1166007764000</creationDate>
-<date>1192959680000</date>
-<contentUpdateDate>1194862755000</contentUpdateDate>
-<version>1.1</version>
+<date>1195043882000</date>
+<contentUpdateDate>1195043882000</contentUpdateDate>
+<version>1.4</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,51 +53,52 @@
 <tags/>
 </property>
 </object>
-<content>1 Welcome to your wiki administrator
-
-Welcome to the wiki administrator of your wiki farm! It is a space that will 
allow you to create as many wikis as you want and manage them. Each wiki is a 
shared workspace that will allow you to collaborate effectively with others. 
You will be able to use it for many purposes:
-
-* Project Management
-* Collaborative Writing
-* Efficient Document Sharing
-* Knowledge Management
-
-1 One farm, 3 types of XWiki
-
-* Wiki administrator: this is the current wiki and it's used to manage your 
wiki farm
-* Wiki templates: models of wikis used when you create a new wiki instance
-* Wiki instances: a wiki created from a wiki template and on which users will 
work
-
-1 News and information from your wikis
-
-#############################################################################
-
-#includeMacros("WikiCode.Macros")
-#set($WikiManager = $xwiki.wikimanager)
-
-#set($nb = 5)
-#set($wikilist = $WikiManager.getWikiDocumentList())
-#sortDocumentByCreationDate($wikilist $creationsortedwikilist false)
-
-#############################################################################
-
-#displayPanelLayout(2, ["WikiCode.UserWikisIsAdminWidget", 
"WikiCode.UserWikisIsUserWidget", "WikiCode.UserWikisIsOwnerWidget", 
"WikiCode.MyLastWikiModificationsWidget", 
"WikiCode.LastWikiModificationsWidget", "WikiCode.LastCreatedWikisWidget"])
-
-#############################################################################
-
-1 How to start
-
-Because you are on the wiki administrator, the steps that you may want to go 
through are:
-
-* Go to the [Installation&gt;XemManager.Install] page to check if your 
installation is correct.
-* Create a new wiki on your farm by clicking on the [Create a new 
wiki&gt;WikiManager.CreateNewWiki] link
-* Manage the existing wikis of your farms by clicking on the [Wiki 
Farm&gt;WikiManager.WebHome] link
-* Change your general farm settings by clicking on the "Administration" link
-
-For more information you can visit the documentation on 
[xwiki.org&gt;http://xwiki.org].
-
-This XWiki is yours, we hope you'll enjoy it ...
-
-Congratulations,
+<content>1 Welcome to your wiki administrator
+
+Welcome to the wiki administrator of your wiki farm! It is a space that will 
allow you to create as many wikis as you want and manage them. Each wiki is a 
shared workspace that will allow you to collaborate effectively with others. 
You will be able to use it for many purposes:
+
+* Project Management
+* Collaborative Writing
+* Efficient Document Sharing
+* Knowledge Management
+
+1 One farm, 3 types of XWiki
+
+* Wiki administrator: this is the current wiki and it's used to manage your 
wiki farm
+* Wiki templates: models of wikis used when you create a new wiki instance
+* Wiki instances: a wiki created from a wiki template and on which users will 
work
+
+1 News and information from your wikis
+
+#############################################################################
+
+#includeMacros("WikiCode.Macros")
+#set($WikiManager = $xwiki.wikimanager)
+
+#set($nb = 5)
+#set($wikilist = $WikiManager.getWikiDocumentList())
+#sortDocumentByCreationDate($wikilist $creationsortedwikilist false)
+
+#############################################################################
+
+#displayPanelLayout(2, ["WikiCode.UserWikisIsAdminWidget", 
"WikiCode.UserWikisIsUserWidget", "WikiCode.UserWikisIsOwnerWidget", 
"WikiCode.MyLastWikiModificationsWidget", 
"WikiCode.LastWikiModificationsWidget", "WikiCode.LastCreatedWikisWidget"])
+
+#############################################################################
+
+
+1 How to start
+
+Because you are on the wiki administrator, the steps that you may want to go 
through are:
+
+* Go to the [Installation&gt;XemManager.Install] page to check if your 
installation is correct.
+* Create a new wiki on your farm by clicking on the [Create a new 
wiki&gt;WikiManager.CreateNewWiki] link
+* Manage the existing wikis of your farms by clicking on the [Wiki 
Farm&gt;WikiManager.WebHome] link
+* Change your general farm settings by clicking on the "Administration" link
+
+For more information you can visit the documentation on 
[xwiki.org&gt;http://xwiki.org].
+
+This XWiki is yours, we hope you'll enjoy it ...
+
+Congratulations,
 The XWiki Team</content>
 </xwikidoc>

Modified: 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
===================================================================
--- 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
 2007-11-14 19:34:01 UTC (rev 5877)
+++ 
xwiki-products/xwiki-enterprise-manager/trunk/wikis/xem-administrator/src/main/resources/XemManager/Install
 2007-11-15 09:45:37 UTC (rev 5878)
@@ -12,14 +12,14 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1187017247000</creationDate>
-<date>1194874778000</date>
-<contentUpdateDate>1194874778000</contentUpdateDate>
-<version>1.5</version>
+<date>1195119330000</date>
+<contentUpdateDate>1195119330000</contentUpdateDate>
+<version>1.7</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
-<comment>Upload new attachment &lt;a 
href="/xwiki/bin/downloadrev/XemManager/Install/template%2Dxe.xar?rev=1.4"&gt;template-xe.xar&lt;/a&gt;</comment>
+<comment></comment>
 <attachment>
 <filename>template-xe.xar</filename>
 <filesize>316988</filesize>
@@ -62,33 +62,30 @@
 <tags/>
 </property>
 </object>
-<content>#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#set($confirm = $request.getParameter("confirm"))
-
-###############################################
-
-#set($templateList = $WikiManager.getWikiTemplateList())
-
-#if($templateList.size() == 0)
-
-  ## Make sure all translations documents are referenced in XWikiPreferences.
-  #set($Appmanager = $xwiki.applicationmanager)
-  #set($result = $Appmanager.reloadAllApplications())
-
-  #if($confirm &amp;&amp; $confirm == 1)
-    #set($result = $WikiManager.createWikiTemplate("templatexe", "XWiki 
Entreprise (default xwiki)", "template-xe.xar"))
-    #if ($result == $Exception.ERROR_NOERROR)
-      #info($msg.get("xem.install.success"))
-    #else
-      #error($msg.get("xem.install.error", [$context.lastexception]))
-    #end
-  #else
-    #set($fullmessage = 
$msg.get("xem.answer.install.actions")+$msg.get("xem.answer.install.actions.template"))
-    #xwikimessagebox($msg.get("xem.answer.install.title") $fullmessage 
$doc.getURL("view", "confirm=1") $doc.getURL("view") $msg.get("yes") 
$msg.get("no"))
-  #end
-#else
-  #info($msg.get("xem.install.noneed"))
+<content>#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#set($confirm = $request.getParameter("confirm"))
+
+###############################################
+
+#set($templateList = $WikiManager.getWikiTemplateList())
+
+#if($templateList.size() == 0)
+  #if($confirm &amp;&amp; $confirm == 1)
+    #set($result = $WikiManager.createWikiTemplate("templatexe", "XWiki 
Entreprise (default xwiki)", "template-xe.xar"))
+    #if ($result == $Exception.ERROR_NOERROR)
+      #info($msg.get("xem.install.success"))
+    #elseif ($result == $Exception.ERROR_XWIKI_ACCESS_DENIED)
+      #error($msg.get("notallowed"))
+    #else
+      #error($msg.get("xem.install.error", [$context.lastexception]))
+    #end
+  #else
+    #set($fullmessage = 
$msg.get("xem.answer.install.actions")+$msg.get("xem.answer.install.actions.template"))
+    #xwikimessagebox($msg.get("xem.answer.install.title") $fullmessage 
$doc.getURL("view", "confirm=1") $doc.getURL("view") $msg.get("yes") 
$msg.get("no"))
+  #end
+#else
+  #info($msg.get("xem.install.noneed"))
 #end</content>
 </xwikidoc>

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to