From 47c0ab4982cb9ee9c15ce0d055ad830b1ec9e5b6 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Mon, 5 Jul 2010 22:58:43 +0200 Subject: Add month navigation --- static/css/style.css | 14 +++++++++++--- static/images/arrow_left.png | Bin 0 -> 9190 bytes static/images/arrow_right.png | Bin 0 -> 7846 bytes static/js/show.js | 1 + templates/pages/show.mako | 23 ++++++++++++++++++++++- templates/root.mako | 2 +- 6 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 static/images/arrow_left.png create mode 100644 static/images/arrow_right.png diff --git a/static/css/style.css b/static/css/style.css index 56abd29..2ddf6f2 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -61,14 +61,22 @@ img { border: none; } -img.left { +#left { float: left; margin-right: 15px; + text-decoration: none; } -img.right { +#right { float: right; margin-left: 15px; + text-decoration: none; +} + +#left > img, #right > img { + width: 20px; + height: 20px; + vertical-align: middle; } div.detail > .heading { @@ -196,7 +204,7 @@ div.detail > .mark { .content { float: left; - width: 620px; + width: 663px; padding: 15px 0px; margin-bottom: 20px; } diff --git a/static/images/arrow_left.png b/static/images/arrow_left.png new file mode 100644 index 0000000..de740e7 Binary files /dev/null and b/static/images/arrow_left.png differ diff --git a/static/images/arrow_right.png b/static/images/arrow_right.png new file mode 100644 index 0000000..14922a9 Binary files /dev/null and b/static/images/arrow_right.png differ diff --git a/static/js/show.js b/static/js/show.js index 2c43015..333ce17 100644 --- a/static/js/show.js +++ b/static/js/show.js @@ -1,4 +1,5 @@ $(document).ready(function(){ + $(".detail > .heading").click(function() { $(this).prevAll(".mark:last").click(); }); diff --git a/templates/pages/show.mako b/templates/pages/show.mako index 054c287..cf14638 100644 --- a/templates/pages/show.mako +++ b/templates/pages/show.mako @@ -20,13 +20,34 @@
% endfor +<% + if e.date.month == 1: + date = "%s/12" % (e.date.year - 1) + else: + date = "%s/%s" % (e.date.year, e.date.month - 1) +%> + + + ${date} + + +<% + if e.date.month == 13 - len(exps): + date = "%s/1" % (e.date.year + 1) + else: + date = "%s/%s" % (e.date.year, e.date.month + len(exps)) +%> + + ${date} + + + <%def name="heading()"> % if len(exps) > 1: Current expenses % else: Expenses for ${get_d(exps[0])} % endif - <%def name="get_d(e)"> diff --git a/templates/root.mako b/templates/root.mako index 6092242..e789df5 100644 --- a/templates/root.mako +++ b/templates/root.mako @@ -27,7 +27,7 @@
${next.body()}
-
 
+