diff --git a/chezbetty/templates/macro_buttons.jinja2 b/chezbetty/templates/macro_buttons.jinja2 index 45d7678..6cf90ac 100644 --- a/chezbetty/templates/macro_buttons.jinja2 +++ b/chezbetty/templates/macro_buttons.jinja2 @@ -19,8 +19,8 @@ will be removed and banner displayed. If failure, button will stay and error will be displayed. #} -{% macro ajax_singleuse_button(button_text, ajax_url, id) %} - +{% macro ajax_singleuse_button(button_text, ajax_url, klass) %} + {% endmacro %} {% macro ajax_saveable_input(object, type, field) %} diff --git a/chezbetty/templates/terminal/base.jinja2 b/chezbetty/templates/terminal/base.jinja2 index 58add3d..477c608 100644 --- a/chezbetty/templates/terminal/base.jinja2 +++ b/chezbetty/templates/terminal/base.jinja2 @@ -1,4 +1,5 @@ {% import "../macro_alerts.jinja2" as alerts %} +{% import "macro_buttons.jinja2" as button %} diff --git a/chezbetty/templates/terminal/macro_buttons.jinja2 b/chezbetty/templates/terminal/macro_buttons.jinja2 new file mode 100644 index 0000000..8589cc3 --- /dev/null +++ b/chezbetty/templates/terminal/macro_buttons.jinja2 @@ -0,0 +1,3 @@ +{% set role = 'terminal' %} +{% extends "../macro_buttons.jinja2" %} + diff --git a/chezbetty/templates/terminal/terminal.jinja2 b/chezbetty/templates/terminal/terminal.jinja2 index 075acbe..1032f1e 100644 --- a/chezbetty/templates/terminal/terminal.jinja2 +++ b/chezbetty/templates/terminal/terminal.jinja2 @@ -25,13 +25,10 @@
{# Sidebar with logo, user name, and balance #} -
-
- -
- +
-

{{ user.name }}

+ +

{{ user.name }}

@@ -55,10 +52,114 @@ {% for pool in purchase_pools %} {% endfor %} + + + {# Deposit Box #} +
+
+

{{ _('Cash Deposit') }}

+
+
+ +
+ +
+
+
+
{{ _('To make a cash deposit, put money in the bill acceptor. It will automatically be added to your account.') }}
+
+
+ {#
+
+ +
+
#} +
+ + + + + +
+
+
+ +
+ {{ _("Thank you!") }} +
+ +

+ + {% if deposit %} + {{ _("You successfully deposited %(amount)s into your account.")| + format(amount=''~deposit.amount|format_currency~'')|safe }} + {% else %} + {{ _("You successfully deposited %(amount)s into your account.")| + format(amount='')|safe }} + {% endif %} + +

+ +

+ You can continue to insert bills into the bill acceptor. + They will be added to your deposit. +

+ + + + +
+
+
+ + + +
+
+
{# Purchase panel #} -
+
@@ -205,112 +306,6 @@
- {# Deposit Panel #} -
- -
-
-

{{ _('Cash Deposit') }}

-
-
- -
- -
-
-
-
{{ _('To make a cash deposit, put money in the bill acceptor. It will automatically be added to your account.') }}
-
-
- {#
-
- -
-
#} -
- - - - - -
-
-
- -
- {{ _("Thank you!") }} -
- -

- - {% if deposit %} - {{ _("You successfully deposited %(amount)s into your account.")| - format(amount=''~deposit.amount|format_currency~'')|safe }} - {% else %} - {{ _("You successfully deposited %(amount)s into your account.")| - format(amount='')|safe }} - {% endif %} - -

- -

- You can continue to insert bills into the bill acceptor. - They will be added to your deposit. -

- - - - -
-
-
- - - -
-
- -
-
{% endblock %}