Author: shuber
Date: Thu Oct 11 15:06:40 2007
New Revision: 18836
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18836&repname=
=3Djahia
Log:
JAHIA-2240 : SP3: bad ressource bundle deployment on second site with two v=
irtual sites using Corpv1 and corpv2.
http://www.jahia.net/jira/browse/JAHIA-2440
Must have been fixed, tried installing both first v1 then v2, and v2 then v=
1 and couldn't reproduce. Please reopen if I missed something. Also added a=
warning message in the administration when creating a new site.
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties
trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp
trunk/core/src/webapp/jsp/jahia/administration/site_choose_template_set=
.jsp
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D18836&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Thu Oc=
t 11 15:06:40 2007
@@ -484,6 +484,7 @@
org.jahia.admin.site.ManageSites.siteTitle.label =3D Site title
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Virtual Site=
s List
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D V=
irtual site where is the administrator
+org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DWa=
rning : if using a template set for the first time in a Jahia installation,=
you will have to restart your server before accessing the site.
org.jahia.admin.site.ManageSites.noImport.label =3D Empty site
org.jahia.admin.site.ManageSites.defaultImport.label =3D Default import
org.jahia.admin.site.ManageSites.fileImport.label =3D Import file =
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_en.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_en.properties&rev=3D18836&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources_en.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_en.properties Thu=
Oct 11 15:06:40 2007
@@ -484,6 +484,7 @@
org.jahia.admin.site.ManageSites.siteTitle.label =3D Site title
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Virtual Site=
s List
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D V=
irtual site where is the administrator
+org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DWa=
rning : if using a template set for the first time in a Jahia installation,=
you will have to restart your server before accessing the site.
org.jahia.admin.site.ManageSites.noImport.label =3D Empty site
org.jahia.admin.site.ManageSites.defaultImport.label =3D Default import
org.jahia.admin.site.ManageSites.fileImport.label =3D Import file =
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_fr.properties&rev=3D18836&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties Thu=
Oct 11 15:06:40 2007
@@ -646,6 +646,7 @@
org.jahia.admin.site.ManageSites.siteTitle.label =3D Titre du si=
te
org.jahia.admin.site.ManageSites.virtualSiteWhereAdministrator.label =3D S=
ite virtuel o=C3=B9 se trouve l'administrateur
org.jahia.admin.site.ManageSites.virtualSitesListe.label =3D Liste des sit=
es virtuels
+org.jahia.admin.site.ManageSites.warnToRestartForNewTemplateSet.label=3DAt=
tention : si vous utilisez un template set pour la premi=C3=A8re fois, il f=
aut red=C3=A9marrer le serveur avant d'acc=C3=A9der au site.
org.jahia.admin.site.label =3D site
org.jahia.admin.siteExtDepMsg.extractionDone.label =3D Extraction r=C3=A9u=
ssie
org.jahia.admin.siteExtDepMsg.failed.label =3D =C3=A9chou=C3=A9e
Modified: trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_add.jsp&rev=3D18836&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_add.jsp Thu Oct 11 =
15:06:40 2007
@@ -85,10 +85,12 @@
</tr>
<tr>
<td>
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.site.ManageSites.enforcePasswordPolicy.label"/>
+ <label for=3D"enforcePasswordPolicy">
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.a=
dmin.site.ManageSites.enforcePasswordPolicy.label"/>
+ </label>
</td>
<td>
- : <input class=3D"input" type=3D"checkbox" name=3D"en=
forcePasswordPolicy" value=3D"true" <c:if test=3D"${enforcePasswordPolicy}"=
>checked=3D"checked"</c:if>/>
+ : <input class=3D"input" type=3D"checkbox" name=3D"en=
forcePasswordPolicy" value=3D"true" <c:if test=3D"${enforcePasswordPolicy}"=
>checked=3D"checked"</c:if> id=3D"enforcePasswordPolicy"/>
</td>
</tr>
<tr >
@@ -100,17 +102,11 @@
</td>
</tr>
<tr>
- <td valign=3D"top">
-
+ <td valign=3D"top">
+ <label for=3D"setAsDefaultVirtualSite"><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.setAsDefaultVirtualSi=
te.label"/></label>
</td>
<td valign=3D"top">
-
- <table border=3D"0">
- <tr>
- <td><input type=3D"checkbox" name=3D"defaultSite" <% if =
(defaultSite.booleanValue()) { %>checked<% } %>></td>
- <td><jahia:adminResourceBundle resourceName=3D"org.jahia=
.admin.site.ManageSites.setAsDefaultVirtualSite.label"/></td>
- </tr>
- </table>
+ <input type=3D"checkbox" name=3D"defaultSite" <% if (defaultS=
ite.booleanValue()) { %>checked<% } %> id=3D"setAsDefaultVirtualSite" />
</td>
</tr>
</table>
@@ -119,14 +115,14 @@
</h2>
<table border=3D"0">
<tr>
- <td><input type=3D"radio" name=3D"siteAdmin" value=3D"0" checked=
></td>
- <td><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s=
ite.ManageSites.createNewUser.label"/>.</td>
+ <td><input type=3D"radio" name=3D"siteAdmin" value=3D"0" checked=
=3D"checked" id=3D"createNewSiteAdmin"/></td>
+ <td><label for=3D"createNewSiteAdmin"><jahia:adminResourceBundle=
resourceName=3D"org.jahia.admin.site.ManageSites.createNewUser.label"/>.</=
label></td>
</tr>
<% if ( !newAdminOnly.booleanValue() ){
%>
<tr>
- <td><input type=3D"radio" name=3D"siteAdmin" value=3D"1"></td>
- <td><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s=
ite.ManageSites.selectAdministrator.label"/></td>
+ <td><input type=3D"radio" name=3D"siteAdmin" value=3D"1" id=3D"u=
seExistingSiteAdmin"/></td>
+ <td><label for=3D"useExistingSiteAdmin"><jahia:adminResourceBund=
le resourceName=3D"org.jahia.admin.site.ManageSites.selectAdministrator.lab=
el"/></label></td>
</tr>
<% } %>
</table>
Modified: trunk/core/src/webapp/jsp/jahia/administration/site_choose_templa=
te_set.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_choose_template_set.jsp&rev=3D18836&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/administration/site_choose_template_set=
.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_choose_template_set=
.jsp Thu Oct 11 15:06:40 2007
@@ -132,6 +132,9 @@
</tr>
=
</table>
+ <p>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.site.ManageSites.warnToRestartForNewTemplateSet.label"/>
+ </p>
<% if(selectedTmplSet.intValue()>0) { %>
<div class=3D"buttonList" style=3D"text-align: right; padd=
ing-top: 10px">
<div class=3D"button">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
