Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make overview lists more visually consisten

Roland Geider03c804142da0
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 16d2ac4f1..ca9649354 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -252,35 +252,33 @@
{% endif %}
</table>
-
-
-{# #}
-{# Admin notes #}
-{# #}
-{% if perms.gym.add_adminusernote %}
+{# #}
+{# Contract #}
+{# #}
+{% if perms.gym.add_contract %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'gym:admin_note:list' current_user.pk %}">{% trans "Overview" %}</a>
- </li>
- <li>
- <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog">{% trans "Add"%}</a>
+ <a href="{% url 'gym:contract:add' current_user.pk %}">{% trans "Add"%}</a>
</li>
</ul>
</div>
-<h4>{% trans "Notes" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>
+<h4>{% trans "Contracts" %}</h4>
<table class="table">
- {% for note in admin_notes %}
+ {% for contract in current_user.contract_member.all %}
<tr>
<td>
- {{ note.timestamp_created }}
+ {{ contract }}
</td>
<td>
- {{ note.note|truncatewords:10 }}
+ <a href="{{ contract.get_absolute_url }}">{{ contract.date_start }}</a>
+ </td>
+ <td>
+ {{ contract.amount }}
</td>
</tr>
{% empty %}
@@ -294,34 +292,33 @@
{% endif %}
-
-{# #}
-{# Contract #}
-{# #}
-{% if perms.gym.add_contract %}
+{# #}
+{# Admin notes #}
+{# #}
+{% if perms.gym.add_adminusernote %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'gym:contract:add' current_user.pk %}">{% trans "Add"%}</a>
+ <a href="{% url 'gym:admin_note:list' current_user.pk %}">{% trans "Overview" %}</a>
+ </li>
+ <li>
+ <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog">{% trans "Add"%}</a>
</li>
</ul>
</div>
-<h4>{% trans "Contracts" %}</h4>
+<h4>{% trans "Notes" %} <small>({% blocktrans with number=5 %}last {{ number }}{% endblocktrans %})</small></h4>
<table class="table">
- {% for contract in current_user.contract_member.all %}
+ {% for note in admin_notes %}
<tr>
<td>
- {{ contract }}
- </td>
- <td>
- <a href="{{ contract.get_absolute_url }}">{{ contract.date_start }}</a>
+ {{ note.timestamp_created }}
</td>
<td>
- {{ contract.amount }}
+ {{ note.note|truncatewords:10 }}
</td>
</tr>
{% empty %}
diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.html
index 4cf2d55df..2b13fbffb 100644
--- a/wger/gym/templates/admin_notes/list.html
+++ b/wger/gym/templates/admin_notes/list.html
@@ -21,19 +21,27 @@
<ul class="list-group">
{% for note in adminusernote_list %}
<li class="list-group-item ">
- <div class="pull-right">
- {% if perms.gym.delete_adminusernote %}
- <a href="{% url 'gym:admin_note:delete' note.pk %}"
- class="btn btn-danger btn-xs wger-modal-dialog">
- {% trans 'Delete' %}
- </a>
- {% endif %}
- {% if perms.gym.change_adminusernote %}
- <a href="{% url 'gym:admin_note:edit' note.pk %}"
- class="btn btn-default btn-xs wger-modal-dialog">
- {% trans 'Edit' %}
- </a>
- {% endif %}
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <span class="glyphicon glyphicon-cog"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ {% if perms.gym.change_adminusernote %}
+ <li>
+ <a href="{% url 'gym:admin_note:edit' note.pk %}" class="wger-modal-dialog">
+ {% trans 'Edit' %}
+ </a>
+ </li>
+ {% endif %}
+
+ {% if perms.gym.delete_adminusernote %}
+ <li>
+ <a href="{% url 'gym:admin_note:delete' note.pk %}" class="wger-modal-dialog">
+ {% trans 'Delete' %}
+ </a>
+ <li>
+ {% endif %}
+ </ul>
</div>
<h4 class="list-group-item-heading">{{ note.timestamp_created }} - {{ note.user|format_username }}</h4>
@@ -52,17 +60,8 @@
{% block sidebar %}
{% if perms.gym.add_adminusernote %}
-<h4>{% trans "Options" %}</h4>
-<p>
- <a href="{% url 'gym:admin_note:add' member.pk %}"
- {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/new.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Add' %}"
- title="{% trans 'Add' %}">
- {% trans "Add" %}
- </a>
-</p>
+ <a href="{% url 'gym:admin_note:add' member.pk %}" class="wger-modal-dialog btn btn-success">
+ {% trans "Add" %}
+ </a>
{% endif %}
{% endblock %}
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 96c2f002a..6cfb6ce26 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -21,26 +21,34 @@
<ul class="list-group">
{% for document in userdocument_list %}
<li class="list-group-item ">
- <div class="pull-right">
- <a href="{{ document.document.url }}"
- class="btn btn-default btn-xs"
- download="{{ document.original_name }}">
- <span class="glyphicon glyphicon-download"></span>
- {% trans 'Download' %}
- </a>
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <span class="glyphicon glyphicon-cog"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{{ document.document.url }}" download="{{ document.original_name }}">
+ <span class="glyphicon glyphicon-download"></span>
+ {% trans 'Download' %}
+ </a>
+ </li>
+ {% if perms.gym.change_userdocument %}
+ <li>
+ <a href="{% url 'gym:document:edit' document.pk %}">
+ {% trans 'Edit' %}
+ </a>
+ </li>
+ {% endif %}
- {% if perms.gym.delete_userdocument %}
- <a href="{% url 'gym:document:delete' document.pk %}"
- class="btn btn-danger btn-xs wger-modal-dialog">
- {% trans 'Delete' %}
- </a>
- {% endif %}
- {% if perms.gym.change_userdocument %}
- <a href="{% url 'gym:document:edit' document.pk %}"
- class="btn btn-default btn-xs">
- {% trans 'Edit' %}
- </a>
- {% endif %}
+ {% if perms.gym.delete_userdocument %}
+ <li>
+ <a href="{% url 'gym:document:delete' document.pk %}" class="wger-modal-dialog">
+ {% trans 'Delete' %}
+ </a>
+ </li>
+ {% endif %}
+
+ </ul>
</div>
<h4 class="list-group-item-heading">{{ document.name }}</h4>
@@ -63,16 +71,8 @@
{% block sidebar %}
{% if perms.gym.add_userdocument %}
-<h4>{% trans "Options" %}</h4>
-<p>
- <a href="{% url 'gym:document:add' member.pk %}" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/new.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Add' %}"
- title="{% trans 'Add' %}">
+ <a href="{% url 'gym:document:add' member.pk %}" class="btn btn-success" %}>
{% trans "Add" %}
- </a>
-</p>
+ </a>
{% endif %}
{% endblock %}