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 2007/04/16 15:46:38 UTC
svn commit: r529244 - in /lenya/trunk/src:
modules/languageselector/xslt/languageselector.xsl
pubs/default/resources/shared/css/page.xml
pubs/default/resources/shared/images/bullet.png
Author: andreas
Date: Mon Apr 16 06:46:37 2007
New Revision: 529244
URL: http://svn.apache.org/viewvc?view=rev&rev=529244
Log:
Update layout of default publication menu
Added:
lenya/trunk/src/pubs/default/resources/shared/images/bullet.png (with props)
Modified:
lenya/trunk/src/modules/languageselector/xslt/languageselector.xsl
lenya/trunk/src/pubs/default/resources/shared/css/page.xml
Modified: lenya/trunk/src/modules/languageselector/xslt/languageselector.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/languageselector/xslt/languageselector.xsl?view=diff&rev=529244&r1=529243&r2=529244
==============================================================================
--- lenya/trunk/src/modules/languageselector/xslt/languageselector.xsl (original)
+++ lenya/trunk/src/modules/languageselector/xslt/languageselector.xsl Mon Apr 16 06:46:37 2007
@@ -33,9 +33,11 @@
<xsl:template match="/">
<div id="languageselector">
- <xsl:call-template name="enumLangs">
- <xsl:with-param name="list" select="$publication-languages-csv"/>
- </xsl:call-template>
+ <ul>
+ <xsl:call-template name="enumLangs">
+ <xsl:with-param name="list" select="$publication-languages-csv"/>
+ </xsl:call-template>
+ </ul>
</div>
</xsl:template>
@@ -72,8 +74,6 @@
<!-- if there are more items in the list, handle them recursively: -->
<xsl:if test="$tail">
- <!-- spacer: -->
- <xsl:text> </xsl:text>
<xsl:call-template name="enumLangs">
<xsl:with-param name="list" select="$tail"/>
</xsl:call-template>
@@ -82,59 +82,61 @@
<xsl:template name="handleLanguage">
<xsl:param name="lang"/>
- <xsl:choose>
-
- <xsl:when test="$lang = $currentLanguage">
- <a class="lenya-language-isCurrent"
- i18n:attr="title"
- title="{$lang}-isCurrent"
- >
- <xsl:call-template name="text">
- <xsl:with-param name="lang" select="$lang"/>
- </xsl:call-template>
- <xsl:call-template name="flag">
- <xsl:with-param name="lang" select="$lang"/>
- <xsl:with-param name="flagsize" select="$flagsize"/>
- </xsl:call-template>
- </a>
- </xsl:when>
-
- <!-- this test is a little sloppy and can lead to spurious substring matches if
- both two and three letter language codes (ISO 639-2) are being used. -->
+ <li>
+ <xsl:choose>
- <xsl:when test="contains($document-languages-csv, $lang)">
- <!-- aren't these new lenya-document links lovely? relative links to languages! -->
- <a class="lenya-language-isAvailable"
- i18n:attr="title"
- title="{$lang}-isAvailable"
- href="lenya-document:,lang={$lang}"
- >
- <xsl:call-template name="text">
- <xsl:with-param name="lang" select="$lang"/>
- </xsl:call-template>
- <xsl:call-template name="flag">
- <xsl:with-param name="lang" select="$lang"/>
- <xsl:with-param name="flagsize" select="$flagsize"/>
- </xsl:call-template>
- </a>
- </xsl:when>
-
- <xsl:otherwise>
- <a class="lenya-language-isUnavailable"
- i18n:attr="title"
- title="{$lang}-isUnavailable"
- >
- <xsl:call-template name="text">
- <xsl:with-param name="lang" select="$lang"/>
- </xsl:call-template>
- <xsl:call-template name="flag">
- <xsl:with-param name="lang" select="$lang"/>
- <xsl:with-param name="flagsize" select="$flagsize"/>
- </xsl:call-template>
- </a>
- </xsl:otherwise>
-
- </xsl:choose>
+ <xsl:when test="$lang = $currentLanguage">
+ <a class="lenya-language-isCurrent"
+ i18n:attr="title"
+ title="{$lang}-isCurrent"
+ >
+ <xsl:call-template name="text">
+ <xsl:with-param name="lang" select="$lang"/>
+ </xsl:call-template>
+ <xsl:call-template name="flag">
+ <xsl:with-param name="lang" select="$lang"/>
+ <xsl:with-param name="flagsize" select="$flagsize"/>
+ </xsl:call-template>
+ </a>
+ </xsl:when>
+
+ <!-- this test is a little sloppy and can lead to spurious substring matches if
+ both two and three letter language codes (ISO 639-2) are being used. -->
+
+ <xsl:when test="contains($document-languages-csv, $lang)">
+ <!-- aren't these new lenya-document links lovely? relative links to languages! -->
+ <a class="lenya-language-isAvailable"
+ i18n:attr="title"
+ title="{$lang}-isAvailable"
+ href="lenya-document:,lang={$lang}"
+ >
+ <xsl:call-template name="text">
+ <xsl:with-param name="lang" select="$lang"/>
+ </xsl:call-template>
+ <xsl:call-template name="flag">
+ <xsl:with-param name="lang" select="$lang"/>
+ <xsl:with-param name="flagsize" select="$flagsize"/>
+ </xsl:call-template>
+ </a>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <a class="lenya-language-isUnavailable"
+ i18n:attr="title"
+ title="{$lang}-isUnavailable"
+ >
+ <xsl:call-template name="text">
+ <xsl:with-param name="lang" select="$lang"/>
+ </xsl:call-template>
+ <xsl:call-template name="flag">
+ <xsl:with-param name="lang" select="$lang"/>
+ <xsl:with-param name="flagsize" select="$flagsize"/>
+ </xsl:call-template>
+ </a>
+ </xsl:otherwise>
+
+ </xsl:choose>
+ </li>
</xsl:template>
<xsl:template name="text">
Modified: lenya/trunk/src/pubs/default/resources/shared/css/page.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/resources/shared/css/page.xml?view=diff&rev=529244&r1=529243&r2=529244
==============================================================================
--- lenya/trunk/src/pubs/default/resources/shared/css/page.xml (original)
+++ lenya/trunk/src/pubs/default/resources/shared/css/page.xml Mon Apr 16 06:46:37 2007
@@ -104,24 +104,46 @@
#menu, #languageselector {
font-family: Verdana, Arial, Sans-serif;
- background-color: #DDBBBB;
border: solid 1px #BB9999;
border-left: none;
border-top: none;
color: Maroon;
- padding: 0px 0px 5px 25px;
+ padding: 5px 0px 5px 0px;
+ background-color: #FFCCCC;
+}
+
+#menu {
+ border-bottom: none;
}
#languageselector {
font-size: 80%;
- padding-top: 8px;
+ padding-top: 10px;
+ padding-left: 15px;
+ /*
+ border: none;
+ background: url('<context-prefix/>/modules/svg/tab-bottomRight-5-FFCCCC-BB9999.png') right bottom no-repeat;
+ */
+}
+
+#languageselector ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+#languageselector ul li {
+ display: inline;
}
-
+
#languageselector a img {
border: none;
margin: 0;
- padding: 0;
- border: solid 5px #DDBBBB;
+ padding: 1px;
+ border: solid 5px #FFCCCC;
+ /*
+ border: solid 1px #000000;
+ */
vertical-align: middle;
}
@@ -131,7 +153,6 @@
}
#languageselector a {
- padding: 2px;
}
#languageselector a:hover {
@@ -161,43 +182,57 @@
.menublock-1, .menublock-selected-1 {
padding: 0px;
+ /*
border-top: solid 1px #DDBBBB;
background: #FFCCCC;
+ */
+}
+
+.menublock-1, .menublock-2, .menublock-2 {
}
.menublock-1 a { }
.menublock-1 a:visited { }
.menublock-1 .menublock-2 { display: none; }
+.menublock-2 .menublock-3 { display: none; }
+
+.menublock-1 .menuitem-1 { }
-.menublock-1 .menuitem-1 { }
-
-.menuitem-1 { padding: 5px 5px 5px 5px; font-size: 80%; }
-.menuitem-2 { padding: 2px 5px 2px 25px; font-size: 80%; }
-
-.menuitem-2 a { }
-
-.menuitem-selected-1 {
- background-color: #FFEEEE;
- padding: 5px 5px 5px 5px;
+.menuitem-1, .menuitem-selected-1,
+.menuitem-2, .menuitem-selected-2,
+.menuitem-3, .menuitem-selected-3 {
font-size: 80%;
}
+
+.menuitem-1, .menuitem-selected-1 {
+ margin: 10px 0px 0px 0px;
+ padding: 2px 5px 2px 30px;
+ background: url('<context-prefix/>/default/live/images/bullet.png') 16px .4em no-repeat;
+}
-.menuitem-selected-2 {
- padding: 2px 5px 2px 25px;
- font-size: 80%;
- background-color: #FFEEEE;
+.menuitem-2, .menuitem-selected-2 {
+ padding: 2px 5px 2px 50px;
+ background: url('<context-prefix/>/default/live/images/bullet.png') 36px .4em no-repeat;
}
-
+
.menuitem-3, .menuitem-selected-3 {
- padding: 2px 5px 2px 45px;
- font-size: 80%;
+ padding: 2px 5px 2px 70px;
+ background: url('<context-prefix/>/default/live/images/bullet.png') 56px .4em no-repeat;
}
+
+
+.menuitem-2 a { }
-.menuitem-selected-3 {
+.menuitem-selected-1, .menuitem-selected-2, .menuitem-selected-3 {
background-color: #FFEEEE;
+/*
+ color: black;
+ background-color: #BB9999;
+ font-weight: bold;
+*/
}
-
+
/* breadcrumb */
#breadcrumb {
Added: lenya/trunk/src/pubs/default/resources/shared/images/bullet.png
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/resources/shared/images/bullet.png?view=auto&rev=529244
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/src/pubs/default/resources/shared/images/bullet.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org