svn commit: [jahia] r17356 - /trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp

[xlawrence]

Author: xlawrence
Date: Wed May 23 10:10:50 2007
New Revision: 17356

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

Modified:
    trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp

Modified: trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_edit.jsp&rev=3D17356&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_edit.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_edit.jsp Wed May 23=
 10:10:50 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
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list