Author: sshyrkov Date: Fri Oct 12 13:19:06 2007 New Revision: 18851 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18851&repname= =3Djahia Log: JAHIA-2512: ACL differences icons are not displayed =
http://www.jahia.net/jira/browse/JAHIA-2512 Resolution: fix the ACL icon positioning 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=3D18851&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 Fri Oct 12 13:19:06 2007 @@ -1293,9 +1293,11 @@ final JspWriter out) throws IOException { = - logger.debug("beginAjaxMenu: " + contentObject + ", " + actionIcon= + + if (logger.isDebugEnabled()) { + logger.debug("beginAjaxMenu: " + contentObject + ", " + action= Icon + ", " + useFieldSet + ", " + resourceBundle + ", " + labelKey); + } = final int objectID =3D contentObject.getID(); final String objectType =3D contentObject.getBeanType(); @@ -1360,7 +1362,7 @@ String realObjectKey =3D objectKey; boolean tbpCheckForPageLink =3D false; if (showWorkflow && (! PageBean.TYPE.equals(objectType))) { - logger.debug("displaying workflow state"); + //logger.debug("displaying workflow state"); = if (ContainerBean.TYPE.equals(objectType)) { final ContentContainer cont =3D (ContentContainer) content= Object.getContentObject(); @@ -1377,7 +1379,7 @@ if (dest =3D=3D null) continue; = jahiaPageID =3D dest.getID(); - logger.debug("PageField page ID: " + jahiaPage= ID); + //logger.debug("PageField page ID: " + jahiaPa= geID); if (jahiaPageID > 0) break; } } @@ -1436,7 +1438,7 @@ if (dest =3D=3D null) continue; = jahiaPageID =3D dest.getID(); - logger.debug("PageField page ID: " + j= ahiaPageID); + //logger.debug("PageField page ID: " += jahiaPageID); if (jahiaPageID > 0) break; } } @@ -1476,7 +1478,7 @@ logger.debug("Error handling time based publishing for= page link, use local rule",t); } } - logger.debug("displaying TBP state"); + //logger.debug("displaying TBP state"); = //todo port the code in ajax action here final String actionURL =3D contextPath + "/ajaxaction/GetTimeB= asedPublishingState?params=3D/op/edit/pid/" + @@ -1506,9 +1508,9 @@ 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("<span title=3D\""); out.print(title); - out.print("\" class=3D\"differentACL\"> </div>"); + out.print("\" class=3D\"differentACL\"> </span>"); } = final String ajaxFunction =3D buildAjaxCall(objectType, objectID, = definitionID, parentID, pageID, uniqueID, _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
