pvollenweider 2004/11/01 16:50:06 CET
Modified files:
src/view/jsp/include left_menu.inc
Log:
- Fix bug on left menu when subpages have no title on a mandatory language
Revision Changes Path
1.9 +11 -3 corporate_portal_templates/src/view/jsp/include/left_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/left_menu.inc.diff?r1=1.8&r2=1.9&f=h
Index: left_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/left_menu.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- left_menu.inc 28 Oct 2004 15:25:26 -0000 1.8
+++ left_menu.inc 1 Nov 2004 15:50:06 -0000 1.9
@@ -26,14 +26,22 @@
if (linkBean != null) {
int truncSize = editMode ? 30 - (currentLevel * 3) : 40 -
(currentLevel * 3);
String pageTitle =
jData.gui().glueTitle(linkBean.getTitle(),truncSize);
+ logger.debug("pageTitle is " + pageTitle + " for pid " +
linkBean.getId());
boolean displayLine = false;
- if (pageTitle.length() == 0) {
+ if (pageTitle != null) {
+ if (pageTitle.length() == 0) {
+ if (editMode) {
+ pageTitle = "<span style='color:#ff0000;'>" +
getResourceBundle("noTitle","No title",jData) + "</span>";
+ displayLine = true;
+ }
+ } else {
+ displayLine = true;
+ }
+ } else {
if (editMode) {
pageTitle = "<span style='color:#ff0000;'>" +
getResourceBundle("noTitle","No title",jData) + "</span>";
displayLine = true;
}
- } else {
- displayLine = true;
}
if (displayLine) {
// displays page info
