From 9994cf53190678e1843b8a0937a080f566a724e3 Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Thu, 16 Dec 2010 18:12:41 +0000
Subject:

---
 en/donate/index.php | 36 +++++++++++++++---------------------
 g/style/all.css     | 11 +++++++++++
 g/style/screen.css  | 11 +++++++++++
 langs.php           | 25 ++++++++++++-------------
 4 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/en/donate/index.php b/en/donate/index.php
index 9105cbfed..e0e10d59c 100644
--- a/en/donate/index.php
+++ b/en/donate/index.php
@@ -41,26 +41,23 @@
                     </ul>
 
                     <h2>How to track donation?</h2>
-                    <p>Currently, we have got <strong>{amount} &euro;<sup>[1]</sup></strong>
-                        thanks to all of our <a href="/en/thank-you/">donators</a>!</p>
+                    <p>Currently, we have got <strong>{amount} &euro;</strong>
+                        thanks to all of our <a href="/en/thank-you/">donators</a>! (updated weekly)</p>
 
                     <p>There will be a monthly report on the funds received and how they were used.
                         We believe public accountability is crucial. As stated in the minutes of
-                        The First General Constitutive Assembly, the treasurer of Mageia.Org is Damien Lallement.<br /><br /><sup>[1]</sup>: The amount of donation is updated every Thursday at 23:00 UTC+1.</p>
+                        The First General Constitutive Assembly, the treasurer of Mageia.Org is Damien Lallement.</p>
                 </div>
             </div>
             <div class="yui-g"><div class="para">
                 <h2>Donate via PayPal,</h2>
                 <?php include '../../paypal.inc.php'; echo html_paypal_form('en'); ?>
-                <p><strong>Beware: PayPal withdraws a commission from each donation
-                    (so we get less than you sent).</strong></p>
             </div></div>
             <div class="yui-g">
                 <div class="yui-u first"><div class="para" style="padding-right: 0;">
                     <h3>via bank transfer,</h3>
-                    <p>You can donate through bank transfer by using the following
+                    <p>using the following
                         Bank Identifier Code (IBAN-BIC):</p>
-
                     <pre class="donate-coord">
 <u>In favor of:</u>
 
@@ -71,26 +68,23 @@
 
 <?php echo $G_coord_assos_bank; ?>
 
-
-<u>Amount:</u>
-
-    Put here the amount of your donation
-    in EURO (&euro;) or US Dollar (US$)
-
-    /!\ The conversion rate bank
-        (if currency other than EURO)
-        will be charged for Mageia
 </pre>
                 </div></div>
                 <div class="yui-u"><div class="para">
-                    <h3>or via check.</h3>
-                    <p>You can then send your donation by check to (if the currency
-                        is not &euro;/EURO, thank you to prefer bank transfer or Paypal)</p>
-                        
+                    <h3>or via check (&euro; only).</h3>
+                    <p>You can send your donation by check to this address:</p>
                     <pre class="donate-coord">
 <?php echo $G_coord_assos; ?>
 </pre>
-            </div></div>
+                </div><div class="para">
+                    <p><strong>Please note that:</strong></p>
+                    <ul>
+                        <li>Paypal withdraws a small commission for each donation (about ...%) so we get a little bit less
+                            than you send;</li>
+                        <li>anyway, conversion rates are charged to Mageia.</li>
+                    </ul>
+                </div></div>
+            </div>
         </div>
     </div>
 </body>
diff --git a/g/style/all.css b/g/style/all.css
index bc7c03fe5..9d93f65db 100644
--- a/g/style/all.css
+++ b/g/style/all.css
@@ -75,4 +75,15 @@ ul.news li span.dt { font-weight: thin; font-size: 85%; color: #666;
 }
 #pp_form_btn {
     text-align: center;
+}
+
+ul.ty-ppl-list {
+    -moz-column-count: 3; -webkit-column-count: 3;
+    -moz-column-gap: 1em; -webkit-column-gap: 1em;
+    font-size: 90%;
+    margin: 1em 0 4em 1em;
+    padding: 0;
+}
+ul.ty-ppl-list li:before {
+    content: "\00BB \0020";
 }
\ No newline at end of file
diff --git a/g/style/screen.css b/g/style/screen.css
index 5cf55d290..ed0dd9b95 100644
--- a/g/style/screen.css
+++ b/g/style/screen.css
@@ -63,4 +63,15 @@ ul.news li span.dt { font-weight: thin; font-size: 85%; color: #666;
 }
 #pp_form_btn {
     text-align: center;
+}
+
+ul.ty-ppl-list {
+    -moz-column-count: 3; -webkit-column-count: 3;
+    -moz-column-gap: 1em; -webkit-column-gap: 1em;
+    font-size: 90%;
+    margin: 1em 0 4em 1em;
+    padding: 0;
+}
+ul.ty-ppl-list li:before {
+    content: "\00BB \0020";
 }
\ No newline at end of file
diff --git a/langs.php b/langs.php
index fb3642eff..1b0289925 100644
--- a/langs.php
+++ b/langs.php
@@ -6,22 +6,21 @@ $g_app_root = realpath(dirname(__FILE__));
 define('G_APP_ROOT', $g_app_root);
 
 $G_coord_assos = <<<T
-    Assocation Mageia.Org
-    8B rue de la Terrasse
-    75017 Paris
-    France
+  Assocation Mageia.Org
+  8B rue de la Terrasse
+  75017 Paris
+  France
 
 T;
 $G_coord_assos_bank = <<<T
-    CIC Paris Villiers
-    14 avenue de Villiers
-    75017 Paris
-    France
-
-
-    IBAN: FR7630066108760002006450123
-    BIC:  CMCIFRPP
-    RIB:  30066 10876 00020064501 23
+  CIC Paris Villiers
+  14 avenue de Villiers
+  75017 Paris
+  France
+
+  RIB:  30066 10876 00020064501 23
+  IBAN: FR76 3006 6108 7600 0200 6450 123
+  BIC:  CMCIFRPP
 
 T;
 
-- 
cgit v1.2.1