svn commit: [jahia] r18571 - /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp

[tdraier]

Author: tdraier
Date: Thu Sep 20 12:21:35 2007
New Revision: 18571

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18571&repname=
=3Djahia
Log:
fixed shared language switch button on page fields, behave the same way as =
other fields ( JAHIA-2252 )

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp&rev=3D18571=
&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/engines/shared/p=
age_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp Thu Sep 20 12:21:35 2007
@@ -136,22 +136,9 @@
 =

     boolean allSameTitles =3D false;
     if (pageBean.getTitles().size() > 0) {
-        final Iterator ite =3D pageBean.getTitles().values().iterator();
-        String oldTitle =3D null;
-        boolean no =3D false;
-        while (ite.hasNext()) {
-            final String tmp =3D ite.next().toString();
-            if (tmp.length() =3D=3D 0) {
-                no =3D true;
-                break;
-            }
-            if (oldTitle !=3D null && tmp.equals(oldTitle)) {
-                no =3D true;
-                break;
-            }
-            oldTitle =3D tmp;
-        }
-        allSameTitles =3D !no;
+        Set s =3D new HashSet(pageBean.getTitles().values());
+        s.remove("");
+        allSameTitles =3D s.size()<=3D1;
     }
 =

     if (sourceTitle !=3D null && "".equals(title)) {
@@ -451,10 +438,6 @@
 <h4 class=3D"page_type_big">
     <% if (jParams.getSite().getLanguageSettings(true).size() > 1 &&
             ServicesRegistry.getInstance().getJahiaACLManagerService().has=
WriteAccesOnAllLangs(jParams)) { %>
-    <% if (pageBean.isSharedTitle()) { %>
-    <span title=3D"<jahia:engineResourceBundle resourceName=3D'org.jahia.s=
ameInAllLanguage.label'/>"
-            class=3D"sharedLanguageYesDisabled">&nbsp;</span>
-    <% } else { %>
     <% if (allSameTitles) { %>
     <a id=3D"switchIcons_<%=3DpageBean.getID()%>" href=3D"javascript:switc=
hIcons('switchIcons_<%=3DpageBean.getID()%>');"
        title=3D'<jahia:engineResourceBundle resourceName=3D"org.jahia.appl=
yToAllLanguages.label"/>'
@@ -466,7 +449,6 @@
        class=3D"sharedLanguageNo">
         &nbsp;</a>
     <% } %>
-    <% } %>
     <input id=3D"shared_title" type=3D"hidden" name=3D"shared_title" value=
=3D"<%=3DallSameTitles || pageBean.isSharedTitle()%>"/>
     <% } %>
     <% if (isNewPage) { %>

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list