From 18819a1623948c5f907c556e339b0f5b1d335524 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Fri, 12 Jul 2013 10:44:05 +0000 Subject: 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 --- NEWS | 3 +++ config_default | 1 + static/treasurer.css | 12 ++++++++++++ tmpl/body_top.html | 5 +++++ tmpl/donations.html | 16 ++++++++++++++++ tmpl/donations_all.html | 6 ++++++ tmpl/donations_by_month.html | 6 ++++++ tmpl/donations_by_pa.html | 6 ++++++ tmpl/donations_by_year.html | 6 ++++++ tmpl/donations_who.html | 6 ++++++ tmpl/head.html | 3 +++ tmpl/index.html | 33 +++++++++++++++++++++++++++++---- tmpl/transactions_by_ac.html | 6 ++++++ tmpl/transactions_by_ca.html | 6 ++++++ tmpl/transactions_by_month.html | 6 ++++++ tmpl/transactions_by_pa.html | 6 ++++++ tmpl/transactions_by_year.html | 6 ++++++ 17 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 static/treasurer.css create mode 100644 tmpl/body_top.html create mode 100644 tmpl/head.html 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 @@ +

+ + 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 @@ [% config.sitename %] Donations + [%- INCLUDE head.html -%] [% INCLUDE head_chart.html %] + [%- INCLUDE body_top.html -%] +

treasurer » donations

+ +

[%- USE date(format='%Y/%m/%d') -%]

Mageia.Org donations

[% donations.total_30 %] Euros have been donated to Mageia.org in the last 30 days. +

[%- l = 10 -%]

Last [% l %] donations

[% don.who %] donated [% don.amount %] Euros on [% date.format(don.date) %]

Donations per year

@@ -50,14 +60,20 @@

[% year %]: [% donations.by_year.$year.total %] Euros

[%- END %] +

Donations list

The list of donations received is available on this page.

Last update: [% date.format(last_update, format => '%Y/%m/%d %H:%M:%S') %]

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 @@ [% config.sitename %]: Donations list + [%- INCLUDE head.html -%] + [%- INCLUDE body_top.html -%] +

treasurer » donations » all

+ +

Mageia.Org donations list

[% don.who %] donated [% don.amount %] Euros on [% date.format(don.date) %] ([% don.sc_name %])

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 @@ [% config.sitename %]: Donations for [% month %] + [%- INCLUDE head.html -%] + [%- INCLUDE body_top.html -%] +

treasurer » donations » month [% month %]

+ +

Mageia.Org donations for month [% month %]

Summary

[% don.who %] donated [% don.amount %] Euros on [% date.format(don.date) %] ([% don.sc_name %])

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 @@ [% config.sitename %]: Donations received from [% who %] + [%- INCLUDE head.html -%] + [%- INCLUDE body_top.html -%] +

treasurer » donations » who » [% who %]

+ +

Mageia.Org donations received from [% who %]

Summary

[% don.amount %] Euros on [% date.format(don.date) %] ([% don.sc_name %])

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 @@ [% config.sitename %]: Donations for [% year %] + [%- INCLUDE head.html -%] [% INCLUDE head_chart.html %] + [%- INCLUDE body_top.html -%] +

treasurer » donations » year [% year %]

+ +

Mageia.Org donations for year [% year %]

Summary

@@ -51,5 +56,6 @@ [%- END -%] [%- END -%] +

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 @@ List of people who donated money to Mageia.Org + [%- INCLUDE head.html -%] + [%- INCLUDE body_top.html -%] +

treasurer » donations » who

+ +

List of people who donated money to Mageia.Org

[% donations.by_pa.$pa.who %]: [% donations.by_pa.$pa.total %] Euros

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 @@ + + + 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 @@ [% config.sitename %] treasurer infos + [%- INCLUDE head.html -%] [% INCLUDE head_chart.html %] -

treasurer.mageia.og

- - This website provides some informations about Mageia.Org bank accounts - status. + [%- INCLUDE body_top.html -%] +

treasurer.mageia.og

Donations

@@ -26,7 +27,9 @@ See more about donations. +

Accounts status

[% transactions.by_ac.$ac.account %]: [% transactions.by_ac.$ac.balance %] Euros

Expenses and revenues by category

[%- @@ -119,7 +124,9 @@

[% transactions.by_ca.$ca.c_name %]: [% transactions.by_ca.$ca.revenues %] Euros

[%- END -%] +

Accounts history

@@ -160,15 +167,21 @@

[%- year -%] - Expenses: [% transactions.by_year.$year.expenses %] Revenues: [% transactions.by_year.$year.revenues %]

[%- END -%] +

Who donated money

You can find a list of people who donated to Mageia.Org. +

RSS Feeds

Donations RSS Feed

Transactions RSS Feed

JSON data

Some data is available in json format : @@ -179,7 +192,9 @@

donations_who.json: list of people who donated money to Mageia.Org.

Grisbi

Mageia.Org accounts are managed using grisbi. @@ -192,11 +207,15 @@ can subscribe to the treasurer-commits mailing list.

Questions

For any question related to Mageia.Org accounts or donations you can send an email to treasurer@mageia.org. +

Source code

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/ mga-treasurer

+ +

Summary

@@ -161,5 +166,6 @@ [%- INCLUDE tra_row.html %] [%- END -%] +

-- cgit v1.2.1