Author: rfelden
Date: Wed Dec 19 16:57:04 2007
New Revision: 19384
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19384&repname=
=3Djahia
Log:
navMenu style addition
pagepath minor correction
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/links/CurrentPagePathTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/links/CurrentPagePathTag.=
java&rev=3D19384&repname=3Djahia
=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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
links/CurrentPagePathTag.java Wed Dec 19 16:57:04 2007
@@ -114,14 +114,14 @@
for (int i=3D0; i<hideBeginPages; i++) {
try {
vPath.removeElementAt(0);
- } catch (Exception e) {
+ } catch (ArrayIndexOutOfBoundsException e) {
break ; // vector is empty
}
}
for (int i=3D0; i<hideEndPages; i++) {
try {
vPath.removeElementAt(vPath.size()-1);
- } catch (Exception e) {
+ } catch (ArrayIndexOutOfBoundsException e) {
break ; // vector is empty
}
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/menus/NavMenuTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/menus/NavMenuTag.java&rev=
=3D19384&repname=3Djahia
=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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
menus/NavMenuTag.java Wed Dec 19 16:57:04 2007
@@ -127,10 +127,17 @@
}
=
try {
+ JspWriter out =3D pageContext.getOut();
createContainerList() ;
defaultSettings(jData.gui());
setCurrentPagePath(jData) ;
+ if (cssClassName =3D=3D null) {
+ out.print("<div class=3D\"navMenu\">\n");
+ } else {
+ out.print(new StringBuffer().append("<div class=3D\"").app=
end(cssClassName).append("\">\n").toString());
+ }
getPageSubTree(jData, jData.gui().getLevelID(startLevel), star=
tLevel);
+ out.print("</div>\n") ;
} catch (JahiaException e) {
logger.error("JahiaException rendering the menu", e);
} catch (IOException e) {
@@ -246,8 +253,8 @@
cssClass =3D " class=3D\"item inpath\"=
";
}
}
- StringBuffer sbf =3D new StringBuffer();
- sbf.append("<li").append(cssClass).append("><d=
iv><div>\n") ;
+ StringBuffer sbf =3D new StringBuffer() ;
+ sbf.append("<li").append(cssClass).append("><d=
iv").append(cssClass).append("><div").append(cssClass).append(">\n") ;
=
// HTML to cache
StringBuffer cacheSbf =3D new StringBuffer() ;
@@ -321,7 +328,6 @@
begin =3D false;
}
String cssClass =3D " class=3D\"item standard\"";
-
if (isInPath) {
if (level =3D=3D reqLevel - 1) {
cssClass =3D " class=3D\"item selected\"";
@@ -330,7 +336,7 @@
}
}
StringBuffer sbf =3D new StringBuffer();
- sbf.append("<li").append(cssClass).append("><div><=
div>\n") ;
+ sbf.append("<li").append(cssClass).append("><div")=
.append(cssClass).append("><div").append(cssClass).append(">\n") ;
sbf.append(cacheEntry.getBodyContent()) ;
out.println(sbf.toString());
if (debug) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/tag=
libs/jahia-components.tld
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/jahia-components.tld&rev=
=3D19384&repname=3Djahia
=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-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld Wed Dec 19 16:57:04 2007
@@ -62,6 +62,11 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <name>cssClassName</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<name>startLevel</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
