aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-07-12 10:44:05 +0000
committerNicolas Vigier <boklm@mageia.org>2013-07-12 10:44:05 +0000
commit18819a1623948c5f907c556e339b0f5b1d335524 (patch)
tree98bf741ecf94d6c4623abc859ad97ed173ffb657
parent7da2c3ecb808c2f47e79d233109fc59657b417a7 (diff)
downloadmgatres-18819a1623948c5f907c556e339b0f5b1d335524.tar
mgatres-18819a1623948c5f907c556e339b0f5b1d335524.tar.gz
mgatres-18819a1623948c5f907c556e339b0f5b1d335524.tar.bz2
mgatres-18819a1623948c5f907c556e339b0f5b1d335524.tar.xz
mgatres-18819a1623948c5f907c556e339b0f5b1d335524.zip
Add stylesheet and mageia navigation bar
git-svn-id: svn+ssh://svn.mageia.org/svn/soft/mga-treasurer/trunk@8609 5b7c3c08-40e5-403b-9995-ace06908e4af
-rw-r--r--NEWS3
-rw-r--r--config_default1
-rw-r--r--static/treasurer.css12
-rw-r--r--tmpl/body_top.html5
-rw-r--r--tmpl/donations.html16
-rw-r--r--tmpl/donations_all.html6
-rw-r--r--tmpl/donations_by_month.html6
-rw-r--r--tmpl/donations_by_pa.html6
-rw-r--r--tmpl/donations_by_year.html6
-rw-r--r--tmpl/donations_who.html6
-rw-r--r--tmpl/head.html3
-rw-r--r--tmpl/index.html33
-rw-r--r--tmpl/transactions_by_ac.html6
-rw-r--r--tmpl/transactions_by_ca.html6
-rw-r--r--tmpl/transactions_by_month.html6
-rw-r--r--tmpl/transactions_by_pa.html6
-rw-r--r--tmpl/transactions_by_year.html6
17 files changed, 129 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 3c65ab3..d260485 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+
+- add stylesheet and mageia navigation bar
+
Version 0.8
- remove empty line at the top of donations.rss
diff --git a/config_default b/config_default
index adea3d8..af942b4 100644
--- a/config_default
+++ b/config_default
@@ -8,3 +8,4 @@ out_dir: /var/www/mga-treasurer
sitename: Mageia.Org
siteurl: http://treasurer.mageia.org
staticdir_url: http://treasurer.mageia.org/static
+links_protocol: //
diff --git a/static/treasurer.css b/static/treasurer.css
new file mode 100644
index 0000000..462a148
--- /dev/null
+++ b/static/treasurer.css
@@ -0,0 +1,12 @@
+.content {
+ background: #fff;
+ padding: 1em 2em;
+ text-align: left;
+ float: left;
+ min-width: 60%;
+}
+
+.section {
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
diff --git a/tmpl/body_top.html b/tmpl/body_top.html
new file mode 100644
index 0000000..b730e7b
--- /dev/null
+++ b/tmpl/body_top.html
@@ -0,0 +1,5 @@
+<header class='about' id='hmgn'></header>
+<script src="[% config.links_protocol %]static.mageia.org/g/js/jquery-1.10.1.min.js"></script>
+<script>
+ $("#hmgn").load("[% config.links_protocol %]nav.mageia.org/html/").delay(10).slideDown();
+</script>
diff --git a/tmpl/donations.html b/tmpl/donations.html
index d0766e1..ab53424 100644
--- a/tmpl/donations.html
+++ b/tmpl/donations.html
@@ -2,13 +2,21 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %] Donations</title>
+ [%- INCLUDE head.html -%]
[% INCLUDE head_chart.html %]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » donations</h1>
+
+ <div class="content">
+ <div class="section">
[%- USE date(format='%Y/%m/%d') -%]
<h1>Mageia.Org donations</h1>
[% donations.total_30 %] Euros have been donated to Mageia.org in the last 30 days.
+ </div>
+ <div class="section">
[%- l = 10 -%]
<h2>Last [% l %] donations <a href="donations.rss"><img src="[% config.staticdir_url %]/feed-16x16.png" alt="RSS feed" /></a></h2>
<ul>
@@ -19,7 +27,9 @@
<li><b><a href="donations_p_[% don.pa %].html">[% don.who %]</a></b> donated <b>[% don.amount %]</b> Euros on [% date.format(don.date) %]</li>
[%- END -%]
</ul>
+ </div>
+ <div class="section">
<h2>Donations per year</h2>
<canvas id="donations_history_bar_chart" height="250" width="[% 80 + donations.by_year.keys.size * 65 %]"></canvas>
@@ -50,14 +60,20 @@
<li><a href="donations_y_[% year %].html">[% year %]: [% donations.by_year.$year.total %] Euros</a></li>
[%- END %]
</ul>
+ </div>
+ <div class="section">
<h2>Donations list</h2>
<p>
The list of donations received is available <a href="donations_all.html">on this page</a>.
</p>
+ </div>
+ <div class="section">
<p>
<small>Last update: [% date.format(last_update, format => '%Y/%m/%d %H:%M:%S') %]</small>
</p>
+ </div>
+ </div>
</body>
</html>
diff --git a/tmpl/donations_all.html b/tmpl/donations_all.html
index f08fc9e..fbd9c2c 100644
--- a/tmpl/donations_all.html
+++ b/tmpl/donations_all.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Donations list</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » <a href="donations.html">donations</a> » all</h1>
+
+ <div class="content">
<h1>Mageia.Org donations list</h1>
<ul>
[%- USE date(format='%Y/%m/%d') -%]
@@ -11,5 +16,6 @@
<li><b><a href="donations_p_[% don.pa %].html">[% don.who %]</a></b> donated <b>[% don.amount %]</b> Euros on [% date.format(don.date) %] ([% don.sc_name %])</li>
[%- END -%]
</ul>
+ </div>
</body>
</html>
diff --git a/tmpl/donations_by_month.html b/tmpl/donations_by_month.html
index afba727..4e93fff 100644
--- a/tmpl/donations_by_month.html
+++ b/tmpl/donations_by_month.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Donations for [% month %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » <a href="donations.html">donations</a> » month [% month %]</h1>
+
+ <div class="content">
<h1>Mageia.Org donations for month [% month %]</h1>
<h2>Summary</h2>
<ul>
@@ -23,5 +28,6 @@
<li><b><a href="donations_p_[% don.pa %].html">[% don.who %]</a></b> donated <b>[% don.amount %]</b> Euros on [% date.format(don.date) %] ([% don.sc_name %])</li>
[%- END -%]
</ul>
+ </div>
</body>
</html>
diff --git a/tmpl/donations_by_pa.html b/tmpl/donations_by_pa.html
index 2c6f2ad..faddf48 100644
--- a/tmpl/donations_by_pa.html
+++ b/tmpl/donations_by_pa.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Donations received from [% who %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » <a href="donations.html">donations</a> » <a href="donations_who.html">who</a> » [% who %]</h1>
+
+ <div class="content">
<h1>Mageia.Org donations received from [% who %]</h1>
<h2>Summary</h2>
<ul>
@@ -23,5 +28,6 @@
<li><b>[% don.amount %]</b> Euros on [% date.format(don.date) %] ([% don.sc_name %])</li>
[%- END -%]
</ul>
+ </div>
</body>
</html>
diff --git a/tmpl/donations_by_year.html b/tmpl/donations_by_year.html
index be41454..7d26e7c 100644
--- a/tmpl/donations_by_year.html
+++ b/tmpl/donations_by_year.html
@@ -2,9 +2,14 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Donations for [% year %]</title>
+ [%- INCLUDE head.html -%]
[% INCLUDE head_chart.html %]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » <a href="donations.html">donations</a> » year [% year %]</h1>
+
+ <div class="content">
<h1>Mageia.Org donations for year [% year %]</h1>
<h2>Summary</h2>
<ul>
@@ -51,5 +56,6 @@
[%- END -%]
[%- END -%]
</ul>
+ </div>
</body>
</html>
diff --git a/tmpl/donations_who.html b/tmpl/donations_who.html
index aa5208e..3d1f6e0 100644
--- a/tmpl/donations_who.html
+++ b/tmpl/donations_who.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>List of people who donated money to Mageia.Org</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » <a href="donations.html">donations</a> » who</h1>
+
+ <div class="content">
<h1>List of people who donated money to Mageia.Org</h1>
<ul>
@@ -11,5 +16,6 @@
<li><a href="donations_p_[% pa %].html">[% donations.by_pa.$pa.who %]</a>: [% donations.by_pa.$pa.total %] Euros</li>
[%- END -%]
</ul>
+ </div>
</body>
</html>
diff --git a/tmpl/head.html b/tmpl/head.html
new file mode 100644
index 0000000..dab892b
--- /dev/null
+++ b/tmpl/head.html
@@ -0,0 +1,3 @@
+<link rel="stylesheet" type="text/css" href="[% config.links_protocol %]static.mageia.org/g/style/all.css">
+<link rel="stylesheet" type="text/css" href="[% config.links_protocol %]nav.mageia.org/css/">
+<link rel="stylesheet" type="text/css" href="[% config.staticdir_url %]/treasurer.css">
diff --git a/tmpl/index.html b/tmpl/index.html
index d5c482a..e6f4f4b 100644
--- a/tmpl/index.html
+++ b/tmpl/index.html
@@ -3,14 +3,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %] treasurer infos</title>
+ [%- INCLUDE head.html -%]
[% INCLUDE head_chart.html %]
</head>
<body>
- <h1>treasurer.mageia.og</h1>
-
- This website provides some informations about Mageia.Org bank accounts
- status.
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'>treasurer.mageia.og</h1>
+ <div class="content">
+ <div class="section">
<h2>Donations</h2>
<a href="donations.rss"><img src="[% config.staticdir_url %]/feed-16x16.png" alt="RSS feed" /></a>
@@ -26,7 +27,9 @@
</ul>
<a href="donations.html">See more about donations</a>.
+ </div>
+ <div class="section">
<h2>Accounts status</h2>
<ul>
@@ -35,7 +38,9 @@
<li><a href="a_[% ac %].html">[% transactions.by_ac.$ac.account %]</a>: [% transactions.by_ac.$ac.balance %] Euros</li>
[%- END -%]
</ul>
+ </div>
+ <div class="section">
<h2>Expenses and revenues by category</h2>
[%-
@@ -119,7 +124,9 @@
<li><b><a href="c_[% ca %].html">[% transactions.by_ca.$ca.c_name %]</a></b>: [% transactions.by_ca.$ca.revenues %] Euros</li>
[%- END -%]
</ul>
+ </div>
+ <div class="section">
<h2>Accounts history</h2>
<canvas id="accounts_history_bar_chart" height="250" width="[% 80 + transactions.by_year.keys.size * 100 %]"></canvas>
@@ -160,15 +167,21 @@
<li><a href="y_[% year %].html">[%- year -%]</a> - Expenses: [% transactions.by_year.$year.expenses %] Revenues: [% transactions.by_year.$year.revenues %]</li>
[%- END -%]
</ul>
+ </div>
+ <div class="section">
<h2>Who donated money</h2>
You can find <a href="donations_who.html">a list of people who donated to Mageia.Org</a>.
+ </div>
+ <div class="section">
<h2>RSS Feeds</h2>
<p><a href="donations.rss">Donations RSS Feed <img src="[% config.staticdir_url %]/feed-16x16.png" alt="RSS feed" /></a></p>
<p><a href="transactions.rss">Transactions RSS Feed <img src="[% config.staticdir_url %]/feed-16x16.png" alt="RSS feed" /></a></p>
+ </div>
+ <div class="section">
<h2>JSON data</h2>
Some data is available in json format :
@@ -179,7 +192,9 @@
<li><a href="donations_who.json">donations_who.json</a>: list of people
who donated money to Mageia.Org.</li>
</ul>
+ </div>
+ <div class="section">
<h2>Grisbi</h2>
<p>
Mageia.Org accounts are managed using <a href="http://grisbi.org/">grisbi</a>.
@@ -192,11 +207,15 @@
can subscribe to the <a href="https://ml.mageia.org/l/info/treasurer-commits">treasurer-commits</a>
mailing list.
</p>
+ </div>
+ <div class="section">
<h2>Questions</h2>
For any question related to Mageia.Org accounts or donations you can
send an email to <a href="mailto:treasurer@mageia.org">treasurer@mageia.org</a>.
+ </div>
+ <div class="section">
<h2>Source code</h2>
Source code for the tools used to generate this website is available on
Mageia svn repository :
@@ -207,6 +226,12 @@
svn://svn.mageia.org/svn/soft/mga-treasurer/trunk/</a> mga-treasurer
</code>
</p>
+ </div>
+
+ <div class="section">
<small>Last update: [% date.format(last_update, format => '%Y/%m/%d %H:%M:%S') %]</small>
+ </div>
+
+ </div>
</body>
</html>
diff --git a/tmpl/transactions_by_ac.html b/tmpl/transactions_by_ac.html
index 63cd62c..caf0cbb 100644
--- a/tmpl/transactions_by_ac.html
+++ b/tmpl/transactions_by_ac.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Transactions for [% account %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » [% account %]</h1>
+
+ <div class="content">
<h1>Mageia.Org transactions for [% account %]</h1>
<h2>Summary</h2>
<ul>
@@ -26,5 +31,6 @@
[%- INCLUDE tra_row.html %]
[%- END -%]
</table>
+ </div>
</body>
</html>
diff --git a/tmpl/transactions_by_ca.html b/tmpl/transactions_by_ca.html
index 12ae583..4e28cda 100644
--- a/tmpl/transactions_by_ca.html
+++ b/tmpl/transactions_by_ca.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Transactions for [% c_name %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » category : [% c_name %]</h1>
+
+ <div class="content">
<h1>Mageia.Org transactions for category [% c_name %]</h1>
<h2>Summary</h2>
<ul>
@@ -29,5 +34,6 @@
[%- INCLUDE tra_row.html %]
[%- END -%]
</table>
+ </div>
</body>
</html>
diff --git a/tmpl/transactions_by_month.html b/tmpl/transactions_by_month.html
index 2b8c7f7..926b9de 100644
--- a/tmpl/transactions_by_month.html
+++ b/tmpl/transactions_by_month.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Transactions for [% month %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » month : [% month %]</h1>
+
+ <div class="content">
<h1>Mageia.Org accounts transactions for month [% month %]</h1>
<h2>Summary</h2>
<ul>
@@ -41,5 +46,6 @@
[%- INCLUDE tra_row.html %]
[%- END -%]
</table>
+ </div>
</body>
</html>
diff --git a/tmpl/transactions_by_pa.html b/tmpl/transactions_by_pa.html
index 7880ac1..9611515 100644
--- a/tmpl/transactions_by_pa.html
+++ b/tmpl/transactions_by_pa.html
@@ -2,8 +2,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Transactions for [% who %]</title>
+ [%- INCLUDE head.html -%]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » who : [% who %]</h1>
+
+ <div class="content">
<h1>Mageia.Org transactions for [% who %]</h1>
<h2>Summary</h2>
<ul>
@@ -29,5 +34,6 @@
[%- INCLUDE tra_row.html %]
[%- END -%]
</table>
+ </div>
</body>
</html>
diff --git a/tmpl/transactions_by_year.html b/tmpl/transactions_by_year.html
index abe7e58..d82127b 100644
--- a/tmpl/transactions_by_year.html
+++ b/tmpl/transactions_by_year.html
@@ -2,9 +2,14 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>[% config.sitename %]: Transactions for [% year %]</title>
+ [%- INCLUDE head.html -%]
[% INCLUDE head_chart.html %]
</head>
<body>
+ [%- INCLUDE body_top.html -%]
+ <h1 id='mgnavt'><a href="index.html">treasurer</a> » year : [% year %]</h1>
+
+ <div class="content">
<h1>Mageia.Org accounts transactions for year [% year %]</h1>
<h2>Summary</h2>
<ul>
@@ -161,5 +166,6 @@
[%- INCLUDE tra_row.html %]
[%- END -%]
</table>
+ </div>
</body>
</html>