valentine banner on front page

svn path=/trunk/; revision=22394
2012-02-14 01:02:59 +00:00 · 2012-02-14 01:02:59 +00:00 · 3f6262d91e
--- a/graphics/valentine.png
+++ b/graphics/valentine.png
--- a/index.ar.xhtml
+++ b/index.ar.xhtml
@ -15,9 +15,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label/> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.bg.xhtml
+++ b/index.bg.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.ca.xhtml
+++ b/index.ca.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.cs.xhtml
+++ b/index.cs.xhtml
@ -15,9 +15,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.da.xhtml
+++ b/index.da.xhtml
@ -20,9 +20,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.de.xhtml
+++ b/index.de.xhtml
@ -16,11 +16,7 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>

    </div>

--- a/index.el.xhtml
+++ b/index.el.xhtml
@ -17,11 +17,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label/></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.en.xhtml
+++ b/index.en.xhtml
@ -19,11 +19,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.es.xhtml
+++ b/index.es.xhtml
@ -16,11 +16,7 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
      
    </div>

--- a/index.et.xhtml
+++ b/index.et.xhtml
@ -19,9 +19,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.fi.xhtml
+++ b/index.fi.xhtml
@ -20,9 +20,8 @@
        <p class="fellowship-box"><a href="https://fellowship.fsfe.org/index.fi.html"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.fr.xhtml
+++ b/index.fr.xhtml
@ -16,11 +16,7 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
    
    </div>

--- a/index.hr.xhtml
+++ b/index.hr.xhtml
@ -19,9 +19,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.hu.xhtml
+++ b/index.hu.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.it.xhtml
+++ b/index.it.xhtml
@ -16,11 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.ku.xhtml
+++ b/index.ku.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.mk.xhtml
+++ b/index.mk.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.nb.xhtml
+++ b/index.nb.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.nl.xhtml
+++ b/index.nl.xhtml
@ -16,11 +16,7 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
     
    </div>

--- a/index.nn.xhtml
+++ b/index.nn.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.pl.xhtml
+++ b/index.pl.xhtml
@ -16,11 +16,7 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="/campaigns/ilovefs/ilovefs.html"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
      
    </div>

--- a/index.pt.xhtml
+++ b/index.pt.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.ro.xhtml
+++ b/index.ro.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.ru.xhtml
+++ b/index.ru.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.sk.xhtml
+++ b/index.sk.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.sl.xhtml
+++ b/index.sl.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label/></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.sq.xhtml
+++ b/index.sq.xhtml
@ -16,9 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p><campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label /></a></p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.sr.xhtml
+++ b/index.sr.xhtml
@ -16,11 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.sv.xhtml
+++ b/index.sv.xhtml
@ -16,11 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.tr.xhtml
+++ b/index.tr.xhtml
@ -16,11 +16,8 @@
        <p class="fellowship-box"><a href="http://fellowship.fsfe.org/join"><join-label /></a></p>
      </div>

-      <div id="campaign-box-4">
-        <p>
-          <campaign4-label /> <a href="http://www.fsf.org/campaigns/secure-boot-vs-restricted-boot/statement"><campaign4link-label /></a>
-        </p>
-      </div>
+      <campaign-box4/>
+      
    </div>

    <div id="feeds">
--- a/index.xsl
+++ b/index.xsl
@ -111,18 +111,13 @@
    </xsl:element>
  </xsl:template>
  
-    <!-- display translated campaign box 4-->
-  <xsl:template match="campaign4-label">
-    <xsl:call-template name="gettext">
-      <xsl:with-param name="id" select="'campaign4'" />
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- display translated campaign box 4 link-->
-  <xsl:template match="campaign4link-label">
-    <xsl:call-template name="gettext">
-      <xsl:with-param name="id" select="'campaign4link'" />
-    </xsl:call-template>
+  <!-- display campaign box 4 -->
+  <xsl:template match="campaign-box4">
+    <div id="campaign-box-4">
+      <a href="/campaigns/ilovefs/ilovefs.html">
+        <img src="/graphics/valentine.png" />
+      </a>
+    </div>
  </xsl:template>
  
  
--- a/look/generic.css
+++ b/look/generic.css
@ -1251,6 +1251,14 @@ a.fn {
  display: none;
 }

+#campaign-box-4 {
+  float: left;
+  margin: 1.5em 0 0;
+  width: 98.7%;
+  text-align: center;
+}
+
+/*
 #campaign-box-4 {
  border: 4px solid rgb(224,248,89);
  border-radius: 7px;
@ -1268,6 +1276,7 @@ a.fn {
 #campaign-box-4 p a {
  color: rgb(82,97,0);
 }
+*/

 .donate-box,
 .fellowship-box {