Author: sshyrkov Date: Wed Sep 26 15:27:55 2007 New Revision: 18670 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18670&repname= =3Djahia Log: JAHIA-2286: Sp3: ACL AJAX icon: could we display it near to the timebased p= ublishing and workflow status icons before the action menu in order to keep= coherency? =
http://www.jahia.net/jira/browse/JAHIA-2286 Resolution: the icon displayed after time-based publishing and before actio= n menu Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja= va Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLTool= Box.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.java&rev=3D18670&repname=3D= jahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/java/org/jahia/gui/HTMLToolBox.ja= va (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/gui/HTMLToolBox.ja= va Wed Sep 26 15:27:55 2007 @@ -1506,6 +1506,18 @@ out.print(cmdBuffer.toString()); out.print("\" />\n"); } + final ContentObject obj =3D contentObject.getContentObject(); + if (aclDifferenceParam.booleanValue() && ! + obj.getObjectKey().toString().equals("ContentPage_" + jPar= ams.getSite().getHomePageID()) && + ! obj.isAclSameAsParent()) { + String title =3D getResource(resourceBundle, "differentACLTitl= e"); + if (title =3D=3D null || title.length() =3D=3D 0) { + title =3D "This object and its parent have different ACLs"; + } + out.print("<div title=3D\""); + out.print(title); + out.print("\" class=3D\"differentACL\"> </div>"); + } = final String ajaxFunction =3D buildAjaxCall(objectType, objectID, = definitionID, parentID, pageID, uniqueID, jParams.getLocale().toString()); @@ -1558,16 +1570,6 @@ buff.append(" src=3D\"").append(picto).append("\" alt=3D\"= ").append(resource). append("\"").append(" title=3D\"").append(resource= ).append("\" border=3D\"0\"/>"); } - final ContentObject obj =3D contentObject.getContentObject(); - if (aclDifferenceParam.booleanValue() && ! - obj.getObjectKey().toString().equals("ContentPage_" + = jParams.getSite().getHomePageID()) && - ! obj.isAclSameAsParent()) { - String title =3D getResource(resourceBundle, "differentACL= Title"); - if (title =3D=3D null || title.length() =3D=3D 0) { - title =3D "This object and its parent have different A= CLs"; - } - buff.append("<div title=3D\"").append(title).append("\" cl= ass=3D\"differentACL\"> </div>"); - } } catch (JahiaException e) { logger.debug(e); // standard objects _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
