svn commit: [jahia] r17354 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: conf/java/ webapp/jsp/jahia/administration/

Wed, 23 May 2007 01:01:20 -0700 

Author: xlawrence
Date: Wed May 23 10:01:07 2007
New Revision: 17354

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17354&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-1931: Exception raised=
 when a site is deselected as default site

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_edit.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D17=
354&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Wed May 23 10:01:07 2007
@@ -435,6 +435,7 @@
 org.jahia.admin.site.ManageSites.enableVersioning.label =3D  Enable Versio=
ning
 org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D  Give me as a=
dministrator membership on this virtual site.
 org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Initial site=
 content
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D  This site is =
the default virtual site
 org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D  Manage virt=
ual sites
 org.jahia.admin.site.ManageSites.NoTemplatePreview.label =3D No template p=
review
 org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D  No tem=
plates set has been found.

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D17354&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Wed May 23 10:01:07 2007
@@ -435,6 +435,7 @@
 org.jahia.admin.site.ManageSites.enableVersioning.label =3D  Enable Versio=
ning
 org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D  Give me as a=
dministrator membership on this virtual site.
 org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Initial site=
 content
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D  This site is =
the default virtual site
 org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D  Manage virt=
ual sites
 org.jahia.admin.site.ManageSites.NoTemplatePreview.label =3D No template p=
review
 org.jahia.admin.site.ManageSites.noTemplatesHasbeenFound.label =3D  No tem=
plates set has been found.

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D17354&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Wed May 23 10:01:07 2007
@@ -597,6 +597,7 @@
 org.jahia.admin.site.ManageSites.giveMeAMembership.label =3D  Accordez-moi=
 des droits d'administrateur sur ce site virtuel.
 org.jahia.admin.site.ManageSites.import.wait =3D Vos donn=C3=A9es sont mai=
ntenant en cours d'importation. Cela peut prendre un certain temps, selon l=
a taille de votre fichier ...
 org.jahia.admin.site.ManageSites.initialSiteContent.label =3D Contenu du s=
ite initial
+org.jahia.admin.site.ManageSites.isTheDefaultSite.label =3D  Ce site est l=
e site virtuel par d=C3=A9faut
 org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D  G=C3=A9rer =
les sites virtuels
 org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Ou indiquez =
le chemin d'acc=C3=A8s d'un fichier sur le serveur
 org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Veuillez s=
=C3=A9lectionner le fichier =C3=A0 importer

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/site_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/site_edit.jsp&rev=3D17354&=
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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_edit.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ite_edit.jsp Wed May 23 10:01:07 2007
@@ -14,7 +14,7 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =

 See the License for the specific language governing permissions and =

 limitations under the License.
---%><[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
+--%>
 <[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
 =

 <%
@@ -25,8 +25,8 @@
     String  siteKey                =3D (String)request.getAttribute("siteKey");
     Integer siteID          =3D (Integer)request.getAttribute("siteID");
     Boolean defaultSite                =3D 
(Boolean)request.getAttribute("defaultSite");
-    Boolean versioningEnabled   =3D (Boolean)request.getAttribute("version=
ingEnabled");
-    Boolean stagingEnabled   =3D (Boolean)request.getAttribute("stagingEna=
bled");
+//    Boolean versioningEnabled   =3D (Boolean)request.getAttribute("versi=
oningEnabled");
+//    Boolean stagingEnabled   =3D (Boolean)request.getAttribute("stagingE=
nabled");
 =

     if(warningMsg !=3D null) {
         if(warningMsg.trim().length() > 0) {
@@ -48,7 +48,7 @@
 =

 <div id=3D"topTitle">
        <div id=3D"topTitleLogo">
-      <img name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons/admin/envi=
ronment.gif" width=3D"48" height=3D"48" border=3D"0" />
+      <img alt=3D"" name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons/a=
dmin/environment.gif" width=3D"48" height=3D"48" border=3D"0" />
   </div>
   <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.manageVirtualSites.label"/></h1>
 </div>
@@ -89,7 +89,11 @@
             <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.setAsDefaultSite.label"/>&nbsp;
         </td>
         <td>
-            :&nbsp;<input class=3D"input" type=3D"checkbox" name=3D"defaul=
tSite" <% if ( defaultSite.booleanValue() ) { %>checked<% } %>>
+            <% if (! defaultSite.booleanValue()) { %>
+            :&nbsp;<input class=3D"input" type=3D"checkbox" name=3D"defaul=
tSite">
+            <% } else { %>
+            :&nbsp;<jahia:adminResourceBundle resourceName=3D"org.jahia.ad=
min.site.ManageSites.isTheDefaultSite.label"/>
+            <% } %>
         </td>
     </tr>
     <% /*

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to