aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lallement <dams@mageia.org>2011-05-31 10:47:42 +0000
committerDamien Lallement <dams@mageia.org>2011-05-31 10:47:42 +0000
commit548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56 (patch)
tree3c14efa2c66abff616cf251616fb8f2f3ad2b485
parent5baa5b29e820e2bd72a4dee946640274c192ca62 (diff)
downloadwww-548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56.tar
www-548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56.tar.gz
www-548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56.tar.bz2
www-548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56.tar.xz
www-548a1e16e0c7cdd566691b5a97bb5e4f3ad70d56.zip
fix MLO URL and start updating reports
-rw-r--r--donators.inc.php5
-rw-r--r--en/about/reports/2010/index.php2
-rw-r--r--en/about/reports/2011/index.php8
3 files changed, 6 insertions, 9 deletions
diff --git a/donators.inc.php b/donators.inc.php
index 75e6d4ec5..eaa503d15 100644
--- a/donators.inc.php
+++ b/donators.inc.php
@@ -180,7 +180,8 @@ $donators = array(
'Robert J Greenwood',
'Mike Crecelius',
'Yevgeniy Palaus',
- 'Julio Geraldo'
+ 'Julio Geraldo',
+ 'Aymerich Munoz Jose Ignacio'
);
//$html .= '<img src="/g/images/mageia_0.svg" style="position: absolute; top: 180px; width: 300px; opacity: 0.2;" />';
@@ -191,7 +192,7 @@ $orgs = array(
array('http://www.gandi.net/', 'Gandi.net'),
array('http://www.kazar.net/', 'Kazar.net'),
array('http://www.lost-oasis.net/', 'Lost-Oasis'),
- array('http://www.mandrivalinux-online.org/', 'MLO'),
+ array('http://www.mageialinux-online.org/', 'MLO'),
array('http://nfrance.fr/', 'NFrance'),
array('http://www.spreadshirt.com/', 'Spreadshirt'),
array('http://zarb.org/', 'zarb.org'),
diff --git a/en/about/reports/2010/index.php b/en/about/reports/2010/index.php
index a7b41d59d..ce144bcba 100644
--- a/en/about/reports/2010/index.php
+++ b/en/about/reports/2010/index.php
@@ -21,8 +21,6 @@
<h2>Summary</h2>
<ul>
<li>Amount collected: EUR&nbsp;8 801.66</li>
- <li>Donators number: 149</li>
- <li>Average donation: EUR&nbsp;59.07</li>
<li>Amount spent: EUR&nbsp;1 277.77</li>
<li>Amount remaining: EUR&nbsp;7 523.96</li>
</ul>
diff --git a/en/about/reports/2011/index.php b/en/about/reports/2011/index.php
index 3cc3764c5..e1ecfe232 100644
--- a/en/about/reports/2011/index.php
+++ b/en/about/reports/2011/index.php
@@ -22,10 +22,8 @@
<ul>
<li>Outstanding amount of 2010: EUR&nbsp;7 523.96</li>
<li>Amount collected: EUR&nbsp;</li>
- <li>Donators number: </li>
- <li>Average donation: EUR&nbsp;</li>
<li>Amount spent: EUR&nbsp;</li>
- <li>Amount remaining: EUR&nbsp;6 006.53</li>
+ <li>Amount remaining: EUR&nbsp;6 227.51</li>
</ul>
<h2>Financial Report</h2>
<table id="fr-table"><thead><tr><th>Wording of the financial transaction</th><th>Income</th><th>Outgoing</th></tr></thead><tbody><tr>
@@ -46,8 +44,8 @@
</table>
<h2>Bank accounts situation</h2>
<ul>
- <li>Paypal (non-for-profit organisation account): EUR&nbsp;841.45</li>
- <li>Main account (with checkbook and no credit card): EUR&nbsp;1 262.02</li>
+ <li>Paypal (non-for-profit organisation account): EUR&nbsp;1 068.93</li>
+ <li>Main account (with checkbook and no credit card): EUR&nbsp;1 155.52</li>
<li>Savings account (between 2% and 4% of interest): EUR&nbsp;4 003.06</li>
</ul>
<h2>Forecast for 2011</h2>