diff --git a/biscuit/apps/mensa/templates/menu/index.html b/biscuit/apps/mensa/templates/menu/index.html index 002b33184c4eb84417fff8b95c0cd1bee7d76cb8..e019f7c1f3b4a69023ecdf5ae2f4aeef5a4c8b2e 100755 --- a/biscuit/apps/mensa/templates/menu/index.html +++ b/biscuit/apps/mensa/templates/menu/index.html @@ -2,21 +2,22 @@ <main> {% if msg == "success" %} - {% msg_box "Der Speiseplan wurde erfolgreich hochgeladen." "success" %} + {% msg_box "Der Speiseplan wurde erfolgreich hochgeladen." "success" "check_circle" %} {% elif msg == "delete_success" %} - {% msg_box "Der Speiseplan wurde erfolgreich gelöscht." "success" %} + {% msg_box "Der Speiseplan wurde erfolgreich gelöscht." "success" "check_circle" %} {% endif %} <script type="text/javascript"> - $('#alert_close').click(function () { $("#alert_box").fadeOut("slow", function () { }); }); </script> <a class="waves-effect waves-light btn green" href="{% url "menu_upload" %}"><i class="material-icons left">add</i> - Neuen Speiseplan hochladen</a> + Neuen Speiseplan hochladen + </a> <a class="waves-effect waves-light btn orange" href="{% url "menu_show_current" %}"><i class="material-icons left">picture_as_pdf</i> - Aktuellen Speiseplan anzeigen</a> + Aktuellen Speiseplan anzeigen + </a> <h5>Übersicht der hochgeladenen Speisepläne</h5> <ul class="collection"> {% for menu in menus %} diff --git a/biscuit/apps/mensa/templates/menu/upload.html b/biscuit/apps/mensa/templates/menu/upload.html index f838228e87d668cabf24ca5dabc1c8c2587920f3..5e1c539a04afcc6ee8b1d6ec6f506a6c8e938c57 100755 --- a/biscuit/apps/mensa/templates/menu/upload.html +++ b/biscuit/apps/mensa/templates/menu/upload.html @@ -5,11 +5,10 @@ {% csrf_token %} - {% msg_box form.non_field_errors "red" "" %} + {% msg_box form.non_field_errors "error" "error" %} <div class="row"> <div class="input-field col s5"> - {% msg_box form.calendar_week.errors "red" "" %} - {# <label for="{{ form.calendar_week.id_for_label }}">Kalenderwoche</label>#} + {% msg_box form.calendar_week.errors "error" "error" %} <small>Kalenderwoche</small> {{ form.calendar_week }} </div> @@ -18,18 +17,15 @@ <h4>/</h4> </div> <div class="input-field col s5"> - {% msg_box form.year.errors "red" "" %} - {# <label for="{{ form.year.id_for_label }}">Jahr</label>#} + {% msg_box form.year.errors "error" "error" %} <small>Jahr</small> {{ form.year }} </div> </div> <div class="file-field input-field"> - <div class="red-text"> - {% msg_box form.pdf.errors "red" "" %} - </div> + {% msg_box form.pdf.errors "error" "error" %} <div class="btn"> - <span><i class="material-icons center">cloud_upload</i> </span> + <span><i class="material-icons center">cloud_upload</i></span> <input type="file" name="{{ form.pdf.html_name }}"> </div> <div class="file-path-wrapper"> @@ -42,6 +38,8 @@ </button> </form> - <p><a href="{% url 'menu_index' %}" class="waves-effect waves-teal btn-flat">Zurück zur Übersicht</a></p> + <p> + <a href="{% url 'menu_index' %}" class="waves-effect waves-teal btn-flat">Zurück zur Übersicht</a> + </p> </main> {% include 'partials/footer.html' %} \ No newline at end of file