Added icons to buttons.

This commit is contained in:
2018-02-22 11:55:20 +01:00
parent 17f6d956e4
commit c45297e2e8
9 changed files with 83 additions and 27 deletions

View File

@@ -6,18 +6,24 @@
{% block page-container %} {% block page-container %}
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-2">
&nbsp; &nbsp;
</div> </div>
<div class="col-sm-6"> <div class="col-sm-8">
<h3>{% trans 'Login' %}</h3> <h3>{% trans 'Login' %}</h3>
<div class="well"> <div class="well">
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-success">{% trans 'Login' %}</button> <button type="submit" class="btn btn-success">
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">{% trans 'Abbrechen' %}</a> <span class="glyphicon glyphicon-log-in"></span>&thinsp;
{% trans 'Login' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %} {% endbuttons %}
</form> </form>
</div> </div>

View File

@@ -6,18 +6,24 @@
{% block page-container %} {% block page-container %}
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-2">
&nbsp; &nbsp;
</div> </div>
<div class="col-sm-6"> <div class="col-sm-8">
<h3>{% trans 'Neues Passwort setzen' %}</h3> <h3>{% trans 'Neues Passwort setzen' %}</h3>
<div class="well"> <div class="well">
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-success">{% trans 'Neues Passwort setzen' %}</button> <button type="submit" class="btn btn-success">
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">{% trans 'Abbrechen' %}</a> <span class="glyphicon glyphicon-saved"></span>&thinsp;
{% trans 'Neues Passwort setzen' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %} {% endbuttons %}
</form> </form>
</div> </div>

View File

@@ -7,8 +7,14 @@
{% endblock form-fields-visible %} {% endblock form-fields-visible %}
{% block form-buttons %} {% block form-buttons %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-success">{% trans 'Einsenden' %}</button> <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
<a class="btn btn-warning" href="?back">{% trans 'Zurück' %}</a> {% trans 'Einsenden' %}
<a class="btn btn-danger" href="?abort">{% trans 'Abbrechen' %}</a> </button>
<a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
{% trans 'Zurück' %}
</a>
<a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %} {% endbuttons %}
{% endblock form-buttons %} {% endblock form-buttons %}

View File

@@ -27,9 +27,15 @@
{% endblock form-fields %} {% endblock form-fields %}
{% block form-buttons %} {% block form-buttons %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-success">{% trans 'Weiter' %}</button> <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
<a class="btn btn-warning" href="?back">{% trans 'Zurück' %}</a> {% trans 'Weiter' %}
<a class="btn btn-danger" href="?abort">{% trans 'Abbrechen' %}</a> </button>
<a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
{% trans 'Zurück' %}
</a>
<a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %} {% endbuttons %}
{% endblock form-buttons %} {% endblock form-buttons %}
{% endblock form-content %} {% endblock form-content %}

View File

@@ -17,8 +17,14 @@
</p> </p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Ja, mach schon!' %}</a> <a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">
<button type="button" class="btn btn-danger" data-dismiss="modal">{% trans 'Abbrechen' %}</button> <span class="glyphicon glyphicon-ok"></span>&thinsp;
{% trans 'Ja, mach schon!' %}
</a>
<button type="button" class="btn btn-danger" data-dismiss="modal">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -29,12 +35,16 @@
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right"> <div class="pull-right">
<a class="btn {% if has_permission_accept %}btn-success{% else %}btn-default disabled{% endif %}" <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> data-toggle="modal" data-target="#modal-accept-dialog">
<!-- <span class="glyphicon glyphicon-check"></span>&thinsp;
{% trans 'Freigeben' %}
</a>
<a class="btn btn-warning" <a class="btn btn-warning"
href="{% url 'dav_events:event_detail' event.pk %}" href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a> title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">
--> <span class="glyphicon glyphicon-duplicate"></span>&thinsp;
{% trans 'Kopieren' %}
</a>
</div> </div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li> <li>

View File

@@ -5,7 +5,10 @@
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-primary" <a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a> href="{% url 'dav_events:event_create' %}">
<span class="glyphicon glyphicon-plus"></span>
{% trans 'Neue Veranstaltung anlegen' %}
</a>
</div> </div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="active"> <li class="active">

View File

@@ -6,7 +6,10 @@
<div class="action-tabs"> <div class="action-tabs">
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-primary" <a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a> href="{% url 'dav_events:event_create' %}">
<span class="glyphicon glyphicon-plus"></span>
{% trans 'Neue Veranstaltung anlegen' %}
</a>
</div> </div>
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li> <li>
@@ -20,9 +23,16 @@
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
<div class="row">&nbsp;</div>
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-success">{% trans 'Exportieren' %}</button> <button type="submit" class="btn btn-success">
<a class="btn btn-danger" href="{% url 'dav_events:event_list' %}">{% trans 'Abbrechen' %}</a> <span class="glyphicon glyphicon-download-alt"></span>&thinsp;
{% trans 'Herunterladen' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:event_list' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %} {% endbuttons %}
</form> </form>
{% endblock page-container-fluid %} {% endblock page-container-fluid %}

View File

@@ -35,8 +35,14 @@
{% bootstrap_form form layout='horizontal' %} {% bootstrap_form form layout='horizontal' %}
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<button type="submit" class="btn btn-success">{% trans 'Speichern' %}</button> <button type="submit" class="btn btn-success">
<a class="btn btn-danger" href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Abbrechen' %}</a> <span class="glyphicon glyphicon-hdd"></span>&thinsp;
{% trans 'Speichern' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:event_detail' event.pk %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% trans 'Abbrechen' %}
</a>
</div> </div>
</div> </div>
</form> </form>

View File

@@ -11,5 +11,8 @@
</ul> </ul>
</div> </div>
{% else %} {% else %}
<a class="btn btn-default btn-sm" href="{% url 'dav_events:login' %}">{% trans 'Login' %}</a> <a class="btn btn-default btn-sm" href="{% url 'dav_events:login' %}">
<span class="glyphicon glyphicon-log-in"></span>&nbsp;
{% trans 'Login' %}
</a>
{% endif %} {% endif %}