DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Replaced all <span class="glyphicon... with {% bootstrap_icon ...

Browse Source
This commit is contained in:
heinzel
2018-02-22 16:07:10 +01:00
parent e3cf540982
commit 2a5ec58c55
9 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dav_events/templates/dav_events/auth/login_form.html
View File

@@ -1,6 +1,6 @@
{% extends "dav_events/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load i18n %}
{% block head-title %}{% trans 'Login' %} - {{ block.super }}{% endblock head-title %}
@@ -17,11 +17,11 @@
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-success">
<span class="glyphicon glyphicon-log-in"></span>&thinsp;
{% bootstrap_icon 'log-in' %}&thinsp;
{% trans 'Login' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %}

6
dav_events/templates/dav_events/auth/set_password_form.html
View File

@@ -1,6 +1,6 @@
{% extends "dav_events/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load i18n %}
{% block head-title %}{% trans 'Neues Passwort setzen' %} - {{ user }} - {{ block.super }}{% endblock head-title %}
@@ -17,11 +17,11 @@
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-success">
<span class="glyphicon glyphicon-saved"></span>&thinsp;
{% bootstrap_icon 'saved' %}&thinsp;
{% trans 'Neues Passwort setzen' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:home' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %}

11
dav_events/templates/dav_events/event_create/SummaryForm.html
View File

@@ -1,19 +1,22 @@
{% extends "dav_events/event_create/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load i18n %}
{% block form-fields-visible %}
{{ event.render_as_html }}
{% endblock form-fields-visible %}
{% block form-buttons %}
{% buttons %}
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
<button type="submit" class="btn btn-success">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Einsenden' %}
</button>
<a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
<a class="btn btn-warning" href="?back">
{% bootstrap_icon 'repeat' %}&thinsp;
{% trans 'Zurück' %}
</a>
<a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
<a class="btn btn-danger" href="?abort">
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %}

11
dav_events/templates/dav_events/event_create/base.html
View File

@@ -1,6 +1,6 @@
{% extends "dav_events/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load i18n %}
{% block head-title %}{% block form-title %}{{ form.form_title }}{% endblock form-title %} - {{ block.super }}{% endblock head-title %}
@@ -27,13 +27,16 @@
{% endblock form-fields %}
{% block form-buttons %}
{% buttons %}
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
<button type="submit" class="btn btn-success">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Weiter' %}
</button>
<a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
<a class="btn btn-warning" href="?back">
{% bootstrap_icon 'repeat' %}&thinsp;
{% trans 'Zurück' %}
</a>
<a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
<a class="btn btn-danger" href="?abort">
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %}

11
dav_events/templates/dav_events/event_detail.html
View File

@@ -1,4 +1,5 @@
{% extends 'dav_events/base.html' %}
{% load bootstrap3 %}
{% load i18n %}
{% block head-title %}{{ event }} - {{ block.super }}{% endblock head-title %}
@@ -18,11 +19,11 @@
</div>
<div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">
<span class="glyphicon glyphicon-ok"></span>&thinsp;
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja, mach schon!' %}
</a>
<button type="button" class="btn btn-danger" data-dismiss="modal">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</button>
</div>
@@ -36,15 +37,17 @@
<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">
<span class="glyphicon glyphicon-check"></span>&thinsp;
{% bootstrap_icon 'check' %}&thinsp;
{% 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' %}">
<span class="glyphicon glyphicon-duplicate"></span>&thinsp;
{% bootstrap_icon 'duplicate' %}&thinsp;
{% trans 'Kopieren' %}
</a>
-->
</div>
<ul class="nav nav-tabs" role="tablist">
<li>

3
dav_events/templates/dav_events/event_list.html
View File

@@ -1,4 +1,5 @@
{% extends 'dav_events/base.html' %}
{% load bootstrap3 %}
{% load i18n %}
{% block page-container-fluid %}
@@ -6,7 +7,7 @@
<div class="pull-right">
<a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">
<span class="glyphicon glyphicon-plus"></span>
{% bootstrap_icon 'plus' %}
{% trans 'Neue Veranstaltung anlegen' %}
</a>
</div>

6
dav_events/templates/dav_events/event_list_export_form.html
View File

@@ -7,7 +7,7 @@
<div class="pull-right">
<a class="btn btn-primary"
href="{% url 'dav_events:event_create' %}">
<span class="glyphicon glyphicon-plus"></span>
{% bootstrap_icon 'plus' %}
{% trans 'Neue Veranstaltung anlegen' %}
</a>
</div>
@@ -26,11 +26,11 @@
<div class="row">&nbsp;</div>
{% buttons %}
<button type="submit" class="btn btn-success">
<span class="glyphicon glyphicon-download-alt"></span>&thinsp;
{% bootstrap_icon 'download-alt' %}&thinsp;
{% trans 'Herunterladen' %}
</button>
<a class="btn btn-danger" href="{% url 'dav_events:event_list' %}">
<span class="glyphicon glyphicon-remove"></span>&thinsp;
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Abbrechen' %}
</a>
{% endbuttons %}

4
dav_events/templates/dav_events/event_update_form.html
View File

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

3
dav_events/templates/dav_events/includes/login_widget.html
View File

@@ -1,3 +1,4 @@
{% load bootstrap3 %}
{% load i18n %}
{% if user.is_authenticated %}
<div class="dropdown">
@@ -12,7 +13,7 @@
</div>
{% else %}
<a class="btn btn-default btn-sm" href="{% url 'dav_events:login' %}">
<span class="glyphicon glyphicon-log-in"></span>&nbsp;
{% bootstrap_icon 'log-in' %}&nbsp;
{% trans 'Login' %}
</a>
{% endif %}