From c0d70aa650fbe8b983f6c42ea20fd4bc294b0fd7 Mon Sep 17 00:00:00 2001
From: leobaillard <leobaillard@fsfe.org>
Date: Mon, 1 Oct 2012 10:24:20 +0000
Subject: [PATCH] Added a new navi item for the support portal.

Also changed the menu organisation.

svn path=/trunk/; revision=24498
---
 fsfe.xsl           | 31 ++++++++++++++++++++-----------
 look/generic.css   | 12 +++++++++++-
 tools/texts-en.xml |  1 +
 tools/texts-fr.xml |  1 +
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/fsfe.xsl b/fsfe.xsl
index ef53d9ae00..1d0da22d99 100644
--- a/fsfe.xsl
+++ b/fsfe.xsl
@@ -565,19 +565,15 @@
 
           </xsl:element> <!-- /li -->
 
-          <!-- Planet portal menu -->
+          <!-- Support portal menu item -->
           <xsl:element name="li">
-            <xsl:attribute name="class">planet</xsl:attribute>
+            <xsl:attribute name="class">support</xsl:attribute>
             <xsl:element name="a">
-              <xsl:attribute name="href">http://planet.fsfe.org/</xsl:attribute>
-              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template> 
+              <xsl:attribute name="href">/support/</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/support'" /></xsl:call-template> 
             </xsl:element>
-            <!-- causes validation errors, needs li to pass validator?
-            <xsl:element name="ul">
-            
-            </xsl:element>-->
-          </xsl:element>
-          
+          </xsl:element> <!-- /li -->
+
           <!-- Fellowship portal menu -->
           <xsl:element name="li">
             <xsl:attribute name="class">fellowship</xsl:attribute>
@@ -612,7 +608,20 @@
             </xsl:for-each>
               </xsl:element><!-- end li -->
             </xsl:element><!-- end ul -->          
-
+          
+          <!-- Planet portal menu -->
+          <xsl:element name="li">
+            <xsl:attribute name="class">planet</xsl:attribute>
+            <xsl:element name="a">
+              <xsl:attribute name="href">http://planet.fsfe.org/</xsl:attribute>
+              <xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'planet/blogs'" /></xsl:call-template> 
+            </xsl:element>
+            <!-- causes validation errors, needs li to pass validator?
+            <xsl:element name="ul">
+            
+            </xsl:element>-->
+          </xsl:element>
+          
           <!-- Wiki -->
           <xsl:element name="li">
             <xsl:attribute name="class">wiki</xsl:attribute>
diff --git a/look/generic.css b/look/generic.css
index 81c2d6d057..715c57a486 100644
--- a/look/generic.css
+++ b/look/generic.css
@@ -888,6 +888,7 @@ h4#subpages + ul li:nth-child(odd) {
 
 #menu ul li.fsfe ul li a,
 #menu ul li.fellowship ul li a,
+#menu ul li.support ul li a,
 #menu ul li.planet ul li a,
 #menu ul li.wiki ul li a {
   font-weight: normal;
@@ -895,6 +896,7 @@ h4#subpages + ul li:nth-child(odd) {
 
 #menu ul li.fsfe ul li a:hover,
 #menu ul li.fellowship ul li a:hover,
+#menu ul li.support ul li a:hover,
 #menu ul li.planet ul li a:hover,
 #menu ul li.wiki ul li a:hover {
   background-color: white;
@@ -918,7 +920,7 @@ h4#subpages + ul li:nth-child(odd) {
 }
 
 #menu ul li.planet a {
-  border-left: 15px solid rgb(74,160,240);
+  border-left: 15px solid rgb(112,208,85);
 }
 
 #menu ul li.planet ul {
@@ -937,6 +939,14 @@ h4#subpages + ul li:nth-child(odd) {
   border-left: 15px solid rgb(173,255,84);
 }
 
+#menu ul li.support a {
+  border-left: 15px solid rgb(74,160,240);
+}
+
+#menu ul li.support ul {
+  display: none;
+}
+
 #menu ul li.fellowship a {
   border-left: 15px solid rgb(107,200,0);
 }
diff --git a/tools/texts-en.xml b/tools/texts-en.xml
index 9aa786e14a..3c1a4398f5 100644
--- a/tools/texts-en.xml
+++ b/tools/texts-en.xml
@@ -77,6 +77,7 @@
   <text id="fsfe/lists">Mailing Lists</text>
   <text id="fsfe/press">Press</text>
   <text id="fsfe/thankgnus">Donors</text>
+  <text id="support/support">Support</text>
   <text id="fellowship/fellowship">Join</text>
   <text id="fellowship/card">Card</text>
   <text id="fellowship/communicate">Communicate</text>
diff --git a/tools/texts-fr.xml b/tools/texts-fr.xml
index 9bd93d4c12..32fb3b1327 100644
--- a/tools/texts-fr.xml
+++ b/tools/texts-fr.xml
@@ -70,6 +70,7 @@ permise sur tout support, pourvu que cette notice soit préservée.
   <text id="fsfe/lists">Listes de diffusion</text>
   <text id="fsfe/press">Presse</text>
   <text id="fsfe/thankgnus">Nos donateurs</text>
+  <text id="support/support">Nous soutenir</text>
   <text id="fellowship/fellowship">Rejoignez-nous</text>
   <text id="fellowship/card">Carte</text>
   <text id="fellowship/communicate">Communiquer</text>