You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/09/03 18:23:58 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/resources/css menu.css
andreas 2003/09/03 09:23:58
Modified: src/webapp/lenya/xslt/info sitetree2tree.xsl root.xsl
src/webapp/lenya/xslt/menu menu.xsl
src/webapp/lenya/resources/css menu.css
Log:
updated menu layout
Revision Changes Path
1.24 +2 -2 cocoon-lenya/src/webapp/lenya/xslt/info/sitetree2tree.xsl
Index: sitetree2tree.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/sitetree2tree.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sitetree2tree.xsl 3 Sep 2003 10:55:53 -0000 1.23
+++ sitetree2tree.xsl 3 Sep 2003 16:23:57 -0000 1.24
@@ -59,7 +59,7 @@
<xsl:with-param name="parentPath"><xsl:value-of select="$parentPath"/>/<xsl:value-of select="@id"/></xsl:with-param>
<xsl:with-param name="lenyaarea"><xsl:value-of select="$lenyaarea"/></xsl:with-param>
</xsl:apply-templates>
-</xsl:template>
+</xsl:template>
<xsl:template name="getLabels">
<xsl:choose>
1.25 +4 -5 cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl
Index: root.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- root.xsl 3 Sep 2003 10:55:53 -0000 1.24
+++ root.xsl 3 Sep 2003 16:23:57 -0000 1.25
@@ -31,7 +31,6 @@
// (Highlights selection if highlight is available.)
function loadSynchPage(srclink)
{
-
var docObj;
var linkID;
linkID = findIDbyLink(srclink);
@@ -55,7 +54,6 @@
(indexOfEntries[i].hreference == undefined || indexOfEntries[i].hreference.split('?')[0] != srclink)
;
i++) {
-// alert(indexOfEntries[i].link);
}
//FIXME: extend to allow for mapping of index.html to index_defaultlanguage.html
if (i >= nEntries) {
@@ -111,7 +109,8 @@
</div>
<script>
initializeDocument();
- loadSynchPage('<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documenturl"/>');
+ <xsl:variable name="language-suffix"><xsl:if test="$chosenlanguage != $defaultlanguage">_<xsl:value-of select="$chosenlanguage"/></xsl:if></xsl:variable>
+ loadSynchPage('<xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documentid"/><xsl:value-of select="$language-suffix"/>.html');
</script>
</div>
</div>
@@ -133,7 +132,7 @@
<xsl:template name="activate">
<xsl:param name="tablanguage"/>
<xsl:variable name="docidwithoutlanguage"><xsl:value-of select="substring-before($documentid, '_')"/></xsl:variable>
- <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/>/<xsl:value-of select="$documentid"/>_<xsl:value-of select="$tablanguage"/>.html?lenya.usecase=info-overview&lenya.step=showscreen</xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documentid"/>_<xsl:value-of select="$tablanguage"/>.html?lenya.usecase=info-overview&lenya.step=showscreen</xsl:attribute>
<xsl:attribute name="class">lenya-tablink<xsl:choose><xsl:when test="$chosenlanguage = $tablanguage">-active</xsl:when><xsl:otherwise/></xsl:choose></xsl:attribute><xsl:value-of select="$tablanguage"/>
</xsl:template>
1.28 +6 -4 cocoon-lenya/src/webapp/lenya/xslt/menu/menu.xsl
Index: menu.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/menu/menu.xsl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- menu.xsl 3 Sep 2003 12:36:10 -0000 1.27
+++ menu.xsl 3 Sep 2003 16:23:57 -0000 1.28
@@ -110,7 +110,7 @@
<div style="float:left; width:10px"> </div>
<div id="nav{@label}" class="click" style="float:left; width:46px">
- <font size="-1" face="verdana"><b> <xsl:value-of select="@name"/></b></font>
+ <b> <xsl:value-of select="@name"/></b>
</div>
<div style="float:left; width:46px"> </div>
@@ -119,7 +119,9 @@
<xsl:template match="menu" mode="menu">
+
<div id="menu{@label}" class="menuOutline">
+
<div class="menuBg">
<xsl:for-each select="block">
<xsl:for-each select="item">
@@ -138,13 +140,13 @@
</xsl:for-each>
<xsl:if test="position() != last()">
- <div style="height: 2px; background-color: #EEEEEE; background-repeat: repeat; background-attachment: scroll; background-image: url('/lenya/lenya/menu/images/dotted.gif'); background-position: 0% 50%">
- <div style="background:#EEEEEE"><img src="/lenya/lenya/menu/images/pixel.gif" height="1" alt="" />
- </div>
+ <div class="lenya-menubar-separator">
+ <img src="/lenya/lenya/menu/images/pixel.gif" height="1" alt="" />
</div>
</xsl:if>
</xsl:for-each>
</div>
+
</div>
</xsl:template>
1.3 +96 -32 cocoon-lenya/src/webapp/lenya/resources/css/menu.css
Index: menu.css
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/resources/css/menu.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- menu.css 3 Sep 2003 09:14:27 -0000 1.2
+++ menu.css 3 Sep 2003 16:23:57 -0000 1.3
@@ -1,51 +1,115 @@
-table.menu a {color: #3360AA; text-decoration:none; background-color: transparent;}
-table.menu a:hover {color: #FF3333; background-color: transparent;}
-table.menu a:visited{color: #6688AA; background-color: transparent;}
-table.menu a:visited:hover {color: #FF3333; background-color: transparent;}
+table.menu a { color: #3360AA; text-decoration:none; background-color: transparent; }
+table.menu a:hover { color: #FF3333; background-color: transparent; }
+table.menu a:visited { color: #6688AA; background-color: transparent; }
+table.menu a:visited:hover { color: #FF3333; background-color: transparent; }
table.menu img {border:0px}
-#navTopBG { height: 21px; background-image:
- url('/lenya/lenya/menu/images/menu-bg.gif');
- background-repeat: repeat-x; padding-top: 1px }
-#navBlue { height: 6px; background-image:
- url('/lenya/lenya/menu/images/unten.gif');
- background-repeat: repeat-x; padding-top: 1px }
-#menuSearch, #menuHelp, #menuFile, #menuDebug {position:absolute; display:block; visibility:hidden; width:100px; top:55px;}
- #menuFile {left:14px;}
- #menuSearch {left:117px;}
- #menuHelp {left:220px;}
- #menuDebug {left:323px;}
-
-
-table.menu .menuOutline {border:1px #999999 solid; border-bottom:2px #999999 solid; background:#EEEEEE; color: black;}
-table.menu .menuBg { background-color: #EEEEEE; background-repeat: repeat; background-attachment:
- scroll; background-image:
- url('/lenya/lenya/menu/images/bottombg.gif');
- border: 1px solid #FFFFFF; background-position: 0%; color: black;}
-table.menu .mI, .mI:visited {
- display:block;
- padding:4px;
+#navTopBG {
+ height: 21px;
+ background-image: url('/lenya/lenya/menu/images/menu-bg.gif');
+ background-repeat: repeat-x;
+ padding-top: 1px;
+ font-size: 10pt;
+}
+
+#navBlue {
+ height: 6px;
+ background-image: url('/lenya/lenya/menu/images/unten.gif');
+ background-repeat: repeat-x;
+ padding-top: 1px
+}
+
+#menuSearch, #menuHelp, #menuFile, #menuDebug {
+ position:absolute;
+ display:block;
+ visibility:hidden;
+ width:170px;
+ top:56px;
+ overflow: hidden;
+}
+
+#menuFile {left:14px;}
+#menuSearch {left:117px;}
+#menuHelp {left:220px;}
+#menuDebug {left:323px;}
+
+/*
+.menuOutline {
+ border: 1px #999999 solid;
+ border-bottom: 2px #999999 solid;
+ background:#EEEEEE;
+ color: black;
+}
+*/
+
+.menuOutline {
+ border: 1px solid #999999;
+ padding: 2px;
+ border-top: 0px;
+ background-color: #EEEEEE;
+
+/*
+ background-image: url('/lenya/lenya/menu/images/transparent_background_2.gif');
+ background-position: 3px 3px;
+ background-repeat: no-repeat;
+*/
+}
+
+.menuBg {
+
+/* width: 150; */
+ padding: 2px;
+ background-color: #EEEEEE;
+ background-repeat: repeat;
+ background-attachment: scroll;
+ background-image: url('/lenya/lenya/menu/images/bottombg.gif');
+
+/* border: 1px solid #FFFFFF; */
+ background-position: 0%;
+ color: black;
+}
+
+.menuBg .mI, .menuBg .mI:visited {
+ display:block;
+ padding: 2px 4px;
font:11px verdana, arial, sans-serif;
color:#444444;
- padding-top:2px;
- padding-bottom:2px;
background-color: transparent;
}
-table.menu .mI:hover {background:#FFFFFF; color: black;}
+.lenya-menubar-separator {
+ height: 1px;
+ margin: 3px 0px;
+ background-color: #EEEEEE;
+ background-repeat: repeat;
+ background-attachment: scroll;
+ background-image: url('/lenya/lenya/menu/images/dotted.gif');
+ background-position: 0% 50%;
+}
+
+.menuBg .mI:hover {
+ background:#FFFFFF;
+ color: black;
+}
-table.menu span.mI { color: #AAAAAA; background-color: transparent;}
+.menuBg span.mI {
+ color: #AAAAAA;
+ background-color: transparent;
+}
+
+.menuBg .click {
+ cursor:pointer
+}
-table.menu .click {cursor:pointer}
-table.menu .alenya {
+.menuBg a {
color: #0066FF;
text-decoration: none;
background-color: transparent;
}
-table.menu .alenya:visited {
+.menuBg a:visited {
color: #0066FF;
text-decoration: none;
background-color: transparent;
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org