Transformed some nav tabs into buttons for clearer UI/UX (tabs switch

between views while buttons trigger actions).
This commit is contained in:
2018-02-22 10:47:57 +01:00
parent 7ace955c39
commit 17f6d956e4
4 changed files with 18 additions and 26 deletions

View File

@@ -27,6 +27,15 @@
{% block page-container-fluid %} {% block page-container-fluid %}
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right">
<a class="btn {% if has_permission_accept %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
<!--
<a class="btn btn-warning"
href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
-->
</div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li> <li>
<a class="btn" <a class="btn"
@@ -36,24 +45,13 @@
<a class="btn" <a class="btn"
href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a> href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a>
</li> </li>
<li class="{% if not has_permission_accept %}disabled{% endif %}">
<a class="btn {% if has_permission_accept %}btn-success{% else %}disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
</li>
<li class="{% if not has_permission_update %}disabled{% endif %}"> <li class="{% if not has_permission_update %}disabled{% endif %}">
<a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}" <a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}"
href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a> href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a>
</li> </li>
<li class="disabled">
<a class="btn disabled"
href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
</li>
</ul> </ul>
</div> </div>
{% endblock page-container-fluid %}
{% block page-container %}
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
{{ event.render_as_html }} {{ event.render_as_html }}
@@ -96,4 +94,4 @@
</div> </div>
</div> </div>
</div> </div>
{% endblock page-container %} {% endblock page-container-fluid %}

View File

@@ -3,13 +3,14 @@
{% block page-container-fluid %} {% block page-container-fluid %}
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right">
<a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
</div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="active"> <li class="active">
<a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a> <a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
</li> </li>
<li>
<a class="btn-primary" href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung' %}</a>
</li>
<li class="{% if not has_permission_export %}disabled{% endif %}"> <li class="{% if not has_permission_export %}disabled{% endif %}">
<a class="btn {% if not has_permission_export %}disabled{% endif %}" <a class="btn {% if not has_permission_export %}disabled{% endif %}"
href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a> href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a>

View File

@@ -4,13 +4,14 @@
{% block page-container-fluid %} {% block page-container-fluid %}
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right">
<a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
</div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li> <li>
<a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a> <a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
</li> </li>
<li>
<a class="btn-primary" href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung' %}</a>
</li>
<li class="active"> <li class="active">
<a href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a> <a href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a>
</li> </li>

View File

@@ -13,17 +13,9 @@
<li> <li>
<a href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a> <a href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a>
</li> </li>
<li class="{% if not has_permission_accept or event.accepted %}disabled{% endif %}">
<a class="{% if has_permission_accept and not event.accepted %}btn-success{% endif %}"
href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Freigeben' %}</a>
</li>
<li class="active"> <li class="active">
<a href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a> <a href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a>
</li> </li>
<li class="disabled">
<a href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
</li>
</ul> </ul>
</div> </div>
<form action="" method="post"> <form action="" method="post">