Author: xlawrence
Date: Wed Sep 12 00:13:45 2007
New Revision: 18425
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18425&repname=
=3Djahia
Log:
Correctly close the div topmenu element
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/top=
menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.inc&rev=3D18425&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/webapp/jsp/jahia/topbar/topmenu.i=
nc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc Wed Sep 12 00:13:45 2007
@@ -110,12 +110,12 @@
<%
jData.gui().html().drawBeginActionMenu(pageBean , null, null, false, "=
", "jahiatemplates.common", "pageSettings", out);
}
-}
+}
=
-if (!jData.gui().isNormalMode() && !jData.getProcessingContext().settings(=
).isReadOnlyMode()){
+if (!jData.gui().isNormalMode() && !jData.getProcessingContext().settings(=
).isReadOnlyMode()){
=
if (jData.page().checkWriteAccess(user, true)
- || (jData.page().checkAdminAccess(user, true) && jData.page().checkR=
eadAccess(user))) {
+ || (jData.page().checkAdminAccess(user, true) && jData.page().checkR=
eadAccess(user))) {
=
Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs();
if (languageSettings.size() > 0) {
@@ -191,7 +191,7 @@
<span>|</span>
<img src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/esi_invali=
date_page.gif" alt=3D"<content:resourceBundle resourceBundle=3D'jahiatempla=
tes.common' resourceName=3D'esiInvalidatePage' defaultValue=3D'Regenerate t=
he current page in the ESI Cache Server'/>" border=3D"0" onClick=3D"esiGene=
ratePageInvalidationUrl()"/>
<%
-}
+}
=
if(jData.gui().isEditMode() && !jData.getProcessingContext().settings().is=
ReadOnlyMode()){
// clipboard display
@@ -201,7 +201,7 @@
<% } else { %>
<span><img id=3D"clipboard" name=3D"" src=3D"<content:serverHttpPath />/=
jsp/jahia/engines/images/pix.gif" width=3D"16" height=3D"16" alt=3D"Clipboa=
rd :vide" border=3D"0"/></span>
<% }
-}
+}
=
// ajax libs and advanced edit settings include
String path =3D request.getContextPath();//jahia path used in subsequent i=
ncludes
@@ -218,8 +218,6 @@
</tr>
</table>
</span>
+<% } %>
<!--end topmenu mods-->
</div>
-<%
-}
-%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
