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

[xlawrence]

Author: xlawrence
Date: Thu Jun 21 11:27:50 2007
New Revision: 17683

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17683&repname=
=3Djahia
Log:
Only display ignore checkbox when warnings are present.

JAHIA-2062

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

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/bigtext_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/bigtext_field.jsp&rev=3D17=
683&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/b=
igtext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp Thu Jun 21 11:27:50 2007
@@ -120,16 +120,9 @@
         </logic:iterate>
     </ul>
 </logic:present>
-<%
-    final JahiaSite site =3D ServicesRegistry.getInstance().
-            getJahiaSitesService().getSite(jParams.getSiteID());
-
-    if (site.getURLIntegrityCheck() + site.getWAIComplianceCheck() > 0) { =
%>
-<p><input type=3D"checkbox" name=3D"ignoreAllWarnings" />&nbsp;<jahia:engi=
neResourceBundle
-        resourceName=3D"org.jahia.engines.shared.BigText_Field.ignoreAllWa=
rning.label"/>
-</p>
-<% } %>
+<% boolean displayIgnoreCheckBox =3D false; %>
 <logic:present name=3D'<%=3DtheField.getID()+".warning.engineMessages"%>'>
+    <% displayIgnoreCheckBox =3D true; %>
     <p>
         <span class=3D"errorbold"><jahia:engineResourceBundle
                 resourceName=3D"org.jahia.engines.shared.BigText_Field.war=
ning.label"/>:</span>&nbsp;&nbsp;
@@ -142,6 +135,7 @@
     </p>
 </logic:present>
 <logic:present name=3D'<%=3DtheField.getID()+".WAIwarning.engineMessages"%=
>'>
+    <% displayIgnoreCheckBox =3D true; %>
     <p>
         <span class=3D"errorbold"><jahia:engineResourceBundle
             resourceName=3D"org.jahia.engines.shared.BigText_Field.WAIwarn=
ing.label"/>:</span>
@@ -154,6 +148,17 @@
     </ul>
     </p>
 </logic:present>
+<%
+    if (displayIgnoreCheckBox) {
+        final JahiaSite site =3D ServicesRegistry.getInstance().
+                getJahiaSitesService().getSite(jParams.getSiteID());
+
+        if (site.getURLIntegrityCheck() + site.getWAIComplianceCheck() > 0=
) { %>
+<p><input type=3D"checkbox" name=3D"ignoreAllWarnings"/>&nbsp;<jahia:engin=
eResourceBundle
+        resourceName=3D"org.jahia.engines.shared.BigText_Field.ignoreAllWa=
rning.label"/>
+</p>
+<% } %>
+<% } %>
 =

 <p>
     <select name=3D"htmlEditor" onchange=3D"changeHtmlEditor('<%=3DtheScre=
en%>');">

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