X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Ftemplates%2Fbase.mako;h=43db6e4246c1871b543fc69aa83ca5a6c66c3618;hb=fed6d11d2cbd6d617d18bc01a78196865da4155b;hp=38117c92a1c4526bebff6a4c48c2b6131661dce2;hpb=f50debcd4e8b1d8dba486c0ae08a2aedae1f3a54;p=bluechips.git diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako index 38117c9..43db6e4 100644 --- a/bluechips/templates/base.mako +++ b/bluechips/templates/base.mako @@ -4,8 +4,11 @@ ${self.title()} - ${h.stylesheet_link('/css/main.css')} - ${h.stylesheet_link('/js/jquery.date_input.css')} + ${h.stylesheet_link('%s/css/main.css' % request.script_name)} + ${h.stylesheet_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/themes/flick/jquery-ui.css')} + ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js')} + ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js')} + ${h.javascript_link('%s/js/admin.js' % request.script_name)} % if c.mobile_client: @@ -26,32 +29,32 @@ - - + + Dashboard - - + + Expense - - + + Transfer - - + + History - - + + User @@ -59,14 +62,11 @@ % for message in h.flash.pop_messages(): -
${message | n}
+
${str(message) | n}
% endfor
${next.body()}
- ${h.javascript_link('//ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js')} - ${h.javascript_link('/js/jquery.date_input.js')} - ${h.javascript_link('/js/admin.js')} @@ -84,7 +84,7 @@ % endif -<%def name="listExpenditures(es)"> +<%def name="listExpenditures(es, total=None, share=None)"> @@ -93,7 +93,6 @@ - % for e in es: <% @@ -109,9 +108,17 @@ - % endfor + % if total is not None and share is not None: + + + + + + + + % endif
DateAmount
${e.amount}
${total}${share}
@@ -124,7 +131,6 @@ Description Amount - % for t in ts: <% @@ -140,12 +146,19 @@ ${t.description} ${t.amount} ${h.link_to('Edit', h.url_for(controller='transfer', action='edit', id=t.id))} - ${h.link_to('Delete', h.url_for(controller='transfer', action='delete', id=t.id))} % endfor +<%def name="listTags()"> +<% +x = ',\n'.join([h.link_to(tag.name, h.url_for(controller='history', action='tag', id=tag.id)) for tag in c.tags]) +%> +${x|n} + + + <%def name="expenditureIcon()"> ←