Author: dpillot
Date: Tue Jul 24 10:44:35 2007
New Revision: 752
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D752&repname=
=3Dcorporate_portal_templates_v2
Log:
http://www.jahia.net/jira/browse/TEMPLATES-181 homogeneize leftmenu
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/nav/menu.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/nav/menu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/nav/menu.jsp&rev=3D752&repname=3Dcorporate_portal_templates=
_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/nav/menu.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/nav/menu.jsp Tue Jul 24 10:44:35 2=
007
@@ -7,6 +7,7 @@
<%@ page import=3D"org.jahia.data.containers.JahiaContainerList"%>
<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
<%@ page import=3D"java.util.Enumeration"%>
+<%@ page import=3D"java.util.*"%>
<%@ page import=3D"org.apache.log4j.Logger"%>
<%--
Copyright 2002-2006 Jahia Ltd
@@ -27,6 +28,21 @@
--%><!--%@ include file=3D"../common/declarations.inc"%-->
<!--%@ include file=3D"../common/common_vars.inc"%-->
<%!
+public String getResourceBundle (String resourceName, String defaultValue,=
JahiaData jData){
+ String resourceBundle =3D "jahiatemplates.Corporate_portal_templates_v=
2";
+ ResourceBundle res =3D null;
+ String resValue =3D null;
+ try {
+ res =3D ResourceBundle.getBundle(resourceBundle,jData.params().g=
etLocale());
+ resValue =3D res.getString(resourceName);
+ } catch ( MissingResourceException mre ) {
+ }
+ if ( resValue =3D=3D null ){
+ resValue =3D defaultValue;
+ }
+ return resValue;
+} // getResourceBundle
+
public void getPageSubTree( JahiaData jData,
int rootPageId,
int currentPageId,
@@ -60,7 +76,13 @@
if (navigationLink.getID() =3D=3D jData.page().getID()=
) out.print(" class=3D'current link" + level + "'");
else out.print(" class=3D'link" + level + "'");
=
- out.print(">" + navigationLink.getHighLightDiffTitle(j=
Data.params())+"</a>");
+ out.print(">");
+ if(navigationLink.getTitle()!=3Dnull && !navigationLin=
k.getTitle().equals("")){
+ out.print(navigationLink.getHighLightDiffTitle(jData.p=
arams()));
+ } else {
+ out.print("<font color=3D\"#FF0000\">"+getResource=
Bundle("noTitle","No title",jData)+"</font>");
+ }
+ out.print("</a>");
if (editMode && isNotALink) {
jData.gui().html().drawBeginActionMenu(new Contain=
erBean(navigationContainer,jData.params()),
null, null, false, ".navigationLink", "jahiate=
mplates.Corporate_portal_templates_v2", null, out);
@@ -84,7 +106,8 @@
if (editMode) {
out.print("<div class=3D'level" + level + "'>");
out.print("<a href=3D'' class=3D'link" + level + "'");
- out.print(">n.d.</a>");
+
+ out.print("<font color=3D\"#FF0000\">"+getResourceBund=
le("noTitle","No title",jData)+"</font></a>");
=
jData.gui().html().drawBeginActionMenu(new Contain=
erBean(navigationContainer,jData.params()),
null, null, false, ".navigationLink", "jahiate=
mplates.Corporate_portal_templates_v2", null, out);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
