From b2dbe27069a1b873e606f8dd90e007acf2b4a7fb Mon Sep 17 00:00:00 2001 From: bmatt Date: Wed, 4 Mar 2020 21:53:05 +0000 Subject: [PATCH] Moved link back to proper place, in head tab, but added if to prevent loading CSS/JS for datatables outside of the dashboard. Also added eye icon to drill into list_billa API to be more consistent with the look and feel of the overall site. --- ihatemoney/static/css/main.css | 7 ++++++- ihatemoney/templates/dashboard.html | 7 +++---- ihatemoney/templates/layout.html | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ihatemoney/static/css/main.css b/ihatemoney/static/css/main.css index 135a6840..a646b175 100644 --- a/ihatemoney/static/css/main.css +++ b/ihatemoney/static/css/main.css @@ -333,7 +333,8 @@ footer .footer-left { } .project-actions > .delete, -.project-actions > .edit { +.project-actions > .edit, +.project-actions > .see { font-size: 0px; display: block; width: 16px; @@ -351,6 +352,10 @@ footer .footer-left { background: url("../images/edit.png") no-repeat right; } +.project-actions > .see { + background: url("../images/see.png") no-repeat right; +} + .balance .balance-value { text-align: right; } diff --git a/ihatemoney/templates/dashboard.html b/ihatemoney/templates/dashboard.html index c6c50581..b77a0ba8 100644 --- a/ihatemoney/templates/dashboard.html +++ b/ihatemoney/templates/dashboard.html @@ -1,13 +1,11 @@ {% extends "layout.html" %} {% block content %} {% if is_admin_dashboard_activated %} - - - {% for project in projects|sort(attribute='name') %} - + + {% if project.has_bills() %} @@ -18,6 +16,7 @@ {% endfor %} diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index 664182ae..dc3d32f6 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -12,6 +12,10 @@ + {%- if request.path == "/dashboard" %} + + + {%- endif %} {% block head %}{% endblock %}
{{ _("Project") }}{{ _("Number of members") }}{{ _("Number of bills") }}{{_("Newest bill")}}{{_("Oldest bill")}}{{_("Actions")}}
{{ project.name }}{{ project.members | count }}{{ project.get_bills().count() }}
{{ project.name }}{{ project.members | count }}{{ project.get_bills().count() }}{{ project.get_bills().all()[0].date }} {{ project.get_bills().all()[-1].date }} {{ _('edit') }} {{ _('delete') }} + {{ _('see') }}