pvollenweider 2004/10/26 17:30:47 CEST
Modified files:
src/view/jsp/include left_menu.inc main_menu.inc
Log:
Do not display the page title on preview or compare mode if the title is empty
Revision Changes Path
1.6 +6 -0 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.5&r2=1.6&f=h
1.10 +88 -72 corporate_portal_templates/src/view/jsp/include/main_menu.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/main_menu.inc.diff?r1=1.9&r2=1.10&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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- left_menu.inc 26 Oct 2004 15:16:03 -0000 1.5
+++ left_menu.inc 26 Oct 2004 15:30:46 -0000 1.6
@@ -230,6 +230,12 @@
</logic:notEmpty>
<logic:empty name="link" property="title">
<logic:equal name="currentRequest" property="editMode"
value="true">
+ <%
+ linkCount++;
+ if (linkCount == 1) {
+ %><table border="0" cellspacing="0" cellpadding="0"
width="100%"><%
+ }
+ %>
<tr>
<td class="leftpict"> </td>
<td class="left">
Index: main_menu.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/main_menu.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- main_menu.inc 26 Oct 2004 15:16:03 -0000 1.9
+++ main_menu.inc 26 Oct 2004 15:30:46 -0000 1.10
@@ -79,84 +79,100 @@
PageBean topLinkBean = (PageBean)
pageContext.findAttribute("topLink");
JahiaPage topLink = topLinkBean.getJahiaPage();
String myColorSet = (String)
pageContext.findAttribute("myColorSet");
-
- menuCount++;
- String onmouseover = "";
- String onmouseout = "";
- if (enablePopup) {
- onmouseover += "ypSlideOutMenu.showMenu('menu" + menuCount +
"');";
- onmouseout += "ypSlideOutMenu.hideMenu('menu" + menuCount +
"');";
- }
- if ( ! jData.gui().isPageInPath(topLink.getID()) ){
- onmouseover += "topOn" + myColorSet + "('menu" + menuCount +
"');";
- onmouseout += "topOff('menu" + menuCount + "');";
- }
- %>
- <td id="menu<%=menuCount%>" class="<bean:write
name="classpath"/><bean:write name="myColorSet"/>">
- <a href="<bean:write name='topLink' property='url'/>"<%
- if (! "".equals(onmouseover)) {
- %> onmouseover="<%=onmouseover%>"<%
- }
- if (! "".equals(onmouseout)) {
- %> onmouseout="<%=onmouseout%>"<%
- }
- %>><bean:write name="topLink" property="title" filter="false"/>
- <logic:empty name="topLink" property="title"><span
style="color:#ff0000;"><content:resourceBundle
- resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="noTitle"
- defaultValue="No title"/></span></logic:empty>
- </a>
- <jahiaHtml:actionMenu name="topMenuContainer" namePostFix=""
resourceBundle="jahiatemplates.Corporate_portal_templates" useFieldSet="false">
- </jahiaHtml:actionMenu>
-
- </td>
- <%
- if (enablePopup && topLink != null){
- div.append("<div
id=\"menu").append(menuCount).append("Container\">\n");
- div.append("<table onmouseover=\"topOn" + myColorSet + "('menu"
+ menuCount + "');\" ");
- div.append("onmouseout=\"topOff('menu" + menuCount + "');\"
cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n");
- div.append("<tr valign=\"top\">\n");
- div.append(" <td nowrap=\"nowrap\">\n");
- div.append(" <div
id=\"menu").append(menuCount).append("Content\" class=\"menu" + myColorSet + "\">\n");
- div.append(" <div class=\"options" + myColorSet +
"\">\n");
-
- int subMenuCount = 0;
- int subMenuWidth = 0;
- JahiaContainerList linkContainerList =
jData.containers().getAbsoluteContainerList( "linkContainer", topLink.getID() );
- if (linkContainerList != null) {
- Enumeration myContainerList =
linkContainerList.getContainers();
- while (myContainerList.hasMoreElements()) {
- JahiaContainer myContainer = (JahiaContainer)
myContainerList.nextElement();
- JahiaPage myLink = (JahiaPage)
myContainer.getFieldObject( "link" );
- if (myLink != null){
- subMenuCount++;
- div.append(" <a
href=\"").append(myLink.getURL(jData.params())).append("\">").append(myLink.getTitle()).append("</a>\n");
- if (myLink.getTitle() != null) {
- int w = myLink.getTitle().length() * 6 + 30;
- if (w > subMenuWidth) {
- subMenuWidth = w;
+ %>
+ <logic:notEmpty name="topLink" property="title">
+ <%
+ menuCount++;
+ String onmouseover = "";
+ String onmouseout = "";
+ if (enablePopup) {
+ onmouseover += "ypSlideOutMenu.showMenu('menu" + menuCount
+ "');";
+ onmouseout += "ypSlideOutMenu.hideMenu('menu" + menuCount +
"');";
+ }
+ if ( ! jData.gui().isPageInPath(topLink.getID()) ){
+ onmouseover += "topOn" + myColorSet + "('menu" + menuCount
+ "');";
+ onmouseout += "topOff('menu" + menuCount + "');";
+ }
+ %>
+ <td id="menu<%=menuCount%>" class="<bean:write
name="classpath"/><bean:write name="myColorSet"/>">
+ <a href="<bean:write name='topLink' property='url'/>"<%
+ if (! "".equals(onmouseover)) {
+ %> onmouseover="<%=onmouseover%>"<%
+ }
+ if (! "".equals(onmouseout)) {
+ %> onmouseout="<%=onmouseout%>"<%
+ }
+ %>><bean:write name="topLink" property="title"
filter="false"/>
+ <logic:empty name="topLink" property="title"><span
style="color:#ff0000;"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates" resourceName="noTitle"
+ defaultValue="No title"/></span></logic:empty>
+ </a>
+ <jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+
+ </td>
+ </logic:notEmpty>
+ <logic:empty name="topLink" property="title">
+ <logic:equal name="currentRequest" property="editMode"
value="true">
+ <%menuCount++;%>
+ <td id="menu<%=menuCount%>" class="topmenu<bean:write
name="myColorSet"/>">
+ <a href="<bean:write name='topLink' property='url'/>"
style="color:#ff0000;"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates" resourceName="noTitle"
+ defaultValue="No title"/></a>
+ <jahiaHtml:actionMenu name="topMenuContainer"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates"
useFieldSet="false">
+ </jahiaHtml:actionMenu>
+ </td>
+ </logic:equal>
+ </logic:empty>
+ <%
+ if (enablePopup && topLink != null){
+ div.append("<div
id=\"menu").append(menuCount).append("Container\">\n");
+ div.append("<table onmouseover=\"topOn" + myColorSet +
"('menu" + menuCount + "');\" ");
+ div.append("onmouseout=\"topOff('menu" + menuCount + "');\"
cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n");
+ div.append("<tr valign=\"top\">\n");
+ div.append(" <td nowrap=\"nowrap\">\n");
+ div.append(" <div
id=\"menu").append(menuCount).append("Content\" class=\"menu" + myColorSet + "\">\n");
+ div.append(" <div class=\"options" + myColorSet
+ "\">\n");
+
+ int subMenuCount = 0;
+ int subMenuWidth = 0;
+ JahiaContainerList linkContainerList =
jData.containers().getAbsoluteContainerList( "linkContainer", topLink.getID() );
+ if (linkContainerList != null) {
+ Enumeration myContainerList =
linkContainerList.getContainers();
+ while (myContainerList.hasMoreElements()) {
+ JahiaContainer myContainer = (JahiaContainer)
myContainerList.nextElement();
+ JahiaPage myLink = (JahiaPage)
myContainer.getFieldObject( "link" );
+ if (myLink != null){
+ subMenuCount++;
+ div.append(" <a
href=\"").append(myLink.getURL(jData.params())).append("\">").append(myLink.getTitle()).append("</a>\n");
+ if (myLink.getTitle() != null) {
+ int w = myLink.getTitle().length() * 6 + 30;
+ if (w > subMenuWidth) {
+ subMenuWidth = w;
+ }
}
}
}
}
+ div.append(" </div>\n");
+ div.append(" </div>\n");
+ div.append(" </td>\n");
+ div.append("</tr>\n");
+ div.append("</table>\n");
+ div.append("</div>\n");
+
+ callJs.append("new
ypSlideOutMenu(\"menu").append(menuCount);
+ callJs.append("\", \"down\", ");
+ callJs.append( "getX('menu" + menuCount + "')" ); // left
+ callJs.append(", ");
+ callJs.append( "getY('menu" + menuCount + "')" ); // top
+ callJs.append(", " + subMenuWidth + ", "); // width
+ callJs.append(subMenuCount * 50); //heigh
+ callJs.append(");\n");
+
}
- div.append(" </div>\n");
- div.append(" </div>\n");
- div.append(" </td>\n");
- div.append("</tr>\n");
- div.append("</table>\n");
- div.append("</div>\n");
-
- callJs.append("new ypSlideOutMenu(\"menu").append(menuCount);
- callJs.append("\", \"down\", ");
- callJs.append( "getX('menu" + menuCount + "')" ); // left
- callJs.append(", ");
- callJs.append( "getY('menu" + menuCount + "')" ); // top
- callJs.append(", " + subMenuWidth + ", "); // width
- callJs.append(subMenuCount * 50); //heigh
- callJs.append(");\n");
+ %>
- }
- %>
</logic:notEmpty>
</content:container>
