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.

This commit is contained in:
bmatt 2020-03-04 21:53:05 +00:00
parent a9f9fec25f
commit b2dbe27069
3 changed files with 13 additions and 5 deletions

View file

@ -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;
}

View file

@ -1,13 +1,11 @@
{% extends "layout.html" %}
{% block content %}
{% if is_admin_dashboard_activated %}
<link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/datatables.min.css') }}">
<script src="{{ url_for("static", filename="js/datatables.min.js") }}"></script>
<table id="bill_table" class="table table-striped">
<thead><tr><th>{{ _("Project") }}</th><th>{{ _("Number of members") }}</th><th>{{ _("Number of bills") }}</th><th>{{_("Newest bill")}}</th><th>{{_("Oldest bill")}}</th><th>{{_("Actions")}}</th></tr></thead>
<tbody>{% for project in projects|sort(attribute='name') %}
<tr><td><a class="list_bills btn btn-secondary" href="{{ url_for(".list_bills", project_id=project.id) }}" title="{{ project.name }}">{{ project.name }}</a></td><td>{{ project.members | count }}</td><td>{{ project.get_bills().count() }}</td>
<tr>
<td><a href="{{ url_for(".list_bills", project_id=project.id) }}" title="{{ project.name }}">{{ project.name }}</a></td><td>{{ project.members | count }}</td><td>{{ project.get_bills().count() }}</td>
{% if project.has_bills() %}
<td>{{ project.get_bills().all()[0].date }}</td>
<td>{{ project.get_bills().all()[-1].date }}</td>
@ -18,6 +16,7 @@
<td class="project-actions">
<a class="edit" href="{{ url_for(".edit_project", project_id=project.id) }}" title="{{ _("edit") }}">{{ _('edit') }}</a>
<a class="delete" href="{{ url_for(".delete_project", project_id=project.id) }}" title="{{ _("delete") }}">{{ _('delete') }}</a>
<a class="see" href="{{ url_for(".list_bills", project_id=project.id) }}" title="{{ _("see") }}">{{ _('see') }}</a>
</td>
</tr>
{% endfor %}

View file

@ -12,6 +12,10 @@
<script src="{{ url_for("static", filename="js/popper.min.js") }}"></script>
<script src="{{ url_for("static", filename="js/tagsinput.js") }}"></script>
<script src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
{%- if request.path == "/dashboard" %}
<link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/datatables.min.css') }}">
<script src="{{ url_for("static", filename="js/datatables.min.js") }}"></script>
{%- endif %}
{% block head %}{% endblock %}
<script type="text/javascript" charset="utf-8">
$(document).ready(function(){