diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html index c7d9b53ab75945f695188fa31347347c6dc0ed24..f680603db326ae2e7ccbe5ee3c204805af7e5a87 100644 --- a/AKSubmission/templates/AKSubmission/ak_detail.html +++ b/AKSubmission/templates/AKSubmission/ak_detail.html @@ -8,9 +8,9 @@ {% block title %}{% trans "AKs" %}: {{ ak.event.name }} - {% trans "AK" %}: {{ ak.name }}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ ak.event.slug }}</li> - <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=ak.event.slug %}">{% trans "AK Submission" %}</a></li> + {% include "AKSubmission/submission_breadcrumbs.html" %} + <li class="breadcrumb-item"><a + href="{% url 'submit:submission_overview' event_slug=ak.event.slug %}">{% trans "AK Submission" %}</a></li> <li class="breadcrumb-item active">{{ ak.name }}</li> {% endblock %} @@ -19,15 +19,19 @@ <div class="float-right"> {% if ak.link != "" %} - <a href="{{ ak.link }}" class="btn btn-info">{% fontawesome_icon 'external-link-alt' %}</a> + <a href="{{ ak.link }}" class="btn btn-info">{% fontawesome_icon 'external-link-alt' %}</a> {% endif %} - <a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a> + <a href="{% url 'submit:ak_edit' event_slug=ak.event.slug pk=ak.pk %}" + class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a> </div> <h2>{% if ak.wish %}{% trans "AK Wish" %}: {% endif %}{{ ak.name }}</h2> <table class="table table-borderless"> - <tr><td>{% trans "Who?" %}</td><td>{{ ak.owners_list }}</td></tr> + <tr> + <td>{% trans "Who?" %}</td> + <td>{{ ak.owners_list }}</td> + </tr> <tr> <td>{% trans 'Category' %}</td> <td> @@ -58,32 +62,35 @@ <table class="table"> <thead> - <tr> - <th>{% trans "When?" %}</th> - <th>{% trans "Duration" %}</th> - <th>{% trans "Room" %}</th> - <th></th> - </tr> + <tr> + <th>{% trans "When?" %}</th> + <th>{% trans "Duration" %}</th> + <th>{% trans "Room" %}</th> + <th></th> + </tr> </thead> <tbody> - {% for slot in ak.akslot_set.all %} - <tr> - <td>{{ slot.start_simplified }}</td> - <td>{{ slot.duration }}</td> - <td>{{ slot.room }}</td> - <td> - {% if not slot.start %} - <a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}" class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a> - <a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}" class="btn btn-danger">{% fontawesome_icon 'times' %}</a> - {% endif %} - </td> - </tr> - {% endfor %} + {% for slot in ak.akslot_set.all %} + <tr> + <td>{{ slot.start_simplified }}</td> + <td>{{ slot.duration }}</td> + <td>{{ slot.room }}</td> + <td> + {% if not slot.start %} + <a href="{% url 'submit:akslot_edit' event_slug=ak.event.slug pk=slot.pk %}" + class="btn btn-success">{% fontawesome_icon 'pencil-alt' %}</a> + <a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}" + class="btn btn-danger">{% fontawesome_icon 'times' %}</a> + {% endif %} + </td> + </tr> + {% endfor %} </tbody> </table> <div class=""> - <a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}" class="btn btn-success">{% fontawesome_icon 'plus' %} {% trans "Add another slot" %}</a> + <a href="{% url 'submit:akslot_add' event_slug=ak.event.slug pk=ak.pk %}" + class="btn btn-success">{% fontawesome_icon 'plus' %} {% trans "Add another slot" %}</a> </div> {% endblock %} diff --git a/AKSubmission/templates/AKSubmission/ak_edit.html b/AKSubmission/templates/AKSubmission/ak_edit.html index 9c6077ece628f8f949e4cfb35b7fdc70821d531f..a5e0b1c6771102ef617e9c7eebad65966a622936 100644 --- a/AKSubmission/templates/AKSubmission/ak_edit.html +++ b/AKSubmission/templates/AKSubmission/ak_edit.html @@ -8,11 +8,11 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "Edit AK" %}: {{ ak.name }}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> - <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> + <li class="breadcrumb-item"><a + href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> <li class="breadcrumb-item active">{% trans "Edit" %}</li> {% endblock %} diff --git a/AKSubmission/templates/AKSubmission/ak_list.html b/AKSubmission/templates/AKSubmission/ak_list.html index 808604411166a75449e2fe4672426d62a59e97c0..5749910b7d3895615593f6c6380b10e3cc3e2ec4 100644 --- a/AKSubmission/templates/AKSubmission/ak_list.html +++ b/AKSubmission/templates/AKSubmission/ak_list.html @@ -8,18 +8,18 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AKs" %}{% endblock %} {% block imports %} -<style> -/* Prevent wrapping of buttons in AK table */ -.table td:nth-child(5) { - white-space: nowrap; -} -</style> + <style> + /* Prevent wrapping of buttons in AK table */ + .table td:nth-child(5) { + white-space: nowrap; + } + </style> {% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> - <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> + {% include "AKSubmission/submission_breadcrumbs.html" %} + <li class="breadcrumb-item"><a + href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> <li class="breadcrumb-item active">{% trans "AKs" %}</li> {% endblock %} diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html index 7ebfc25f72450f66b2498d236c70d8725118333b..34981892548cf44be922aae100eea28f3a35e21a 100644 --- a/AKSubmission/templates/AKSubmission/akowner_create_update.html +++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html @@ -7,8 +7,7 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Owner" %}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> <li class="breadcrumb-item active">{% trans "AK Owner" %}</li> diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html index 2a479dbdbce2695c8ea5613d8d0607ee5c2a20aa..d525626a087e8c2bf947ba96f160020562c41ef9 100644 --- a/AKSubmission/templates/AKSubmission/akslot_add_update.html +++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html @@ -7,11 +7,11 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> - <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> + <li class="breadcrumb-item"><a + href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> <li class="breadcrumb-item active">{% trans "AK Duration(s)" %}</li> {% endblock %} diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html index fb69c140127bf25251be8c952539ddfc50e4d7c8..4e9933e4d6e9cb20806bdd0656ec16357366a190 100644 --- a/AKSubmission/templates/AKSubmission/akslot_delete.html +++ b/AKSubmission/templates/AKSubmission/akslot_delete.html @@ -7,11 +7,11 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Duration(s)" %}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> - <li class="breadcrumb-item"><a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> + <li class="breadcrumb-item"><a + href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}">{{ ak.short_name }}</a></li> <li class="breadcrumb-item active">{% trans "AK Duration(s)" %}</li> {% endblock %} @@ -27,8 +27,14 @@ <table class="table"> <tbody> - <tr><td>{% trans "AK" %}</td><td>{{ akslot.ak }}</td></tr> - <tr><td>{% trans "Duration" %}</td><td>{{ akslot.duration }}</td></tr> + <tr> + <td>{% trans "AK" %}</td> + <td>{{ akslot.ak }}</td> + </tr> + <tr> + <td>{% trans "Duration" %}</td> + <td>{{ akslot.duration }}</td> + </tr> </tbody> </table> {% buttons %} diff --git a/AKSubmission/templates/AKSubmission/base_submission.html b/AKSubmission/templates/AKSubmission/base_submission.html index 9d9115d0e3f424c665b834f92877523c3ae3e89f..3318366813b326ea7097ef164e7b58bcbc2dc7f5 100644 --- a/AKSubmission/templates/AKSubmission/base_submission.html +++ b/AKSubmission/templates/AKSubmission/base_submission.html @@ -3,8 +3,14 @@ {% load fontawesome %} {% load i18n %} +{% block breadcrumbs %} + {% include "AKSubmission/submission_breadcrumbs.html" %} +{% endblock %} + {% block footer_custom %} {% if event.contact_email %} - <h4><a href="mailto://{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a></h4> + <h4> + <a href="mailto://{{ event.contact_email }}">{% fontawesome_icon "envelope" %} {% trans "Write to organizers of this event for questions and comments" %}</a> + </h4> {% endif %} {% endblock %} diff --git a/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html b/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html new file mode 100644 index 0000000000000000000000000000000000000000..0800d580d41a22dfd8fd700321f7495533c6fd17 --- /dev/null +++ b/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html @@ -0,0 +1,2 @@ +<li class="breadcrumb-item">AKPlanning</li> +<li class="breadcrumb-item">{{ event.slug }}</li> diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html index 4581297910e7cecf9a1d6572476c17d0a7a8952f..04426377e60edc5768b84ebc651066f6358eae5b 100644 --- a/AKSubmission/templates/AKSubmission/submission_overview.html +++ b/AKSubmission/templates/AKSubmission/submission_overview.html @@ -6,17 +6,16 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "AK Submission" %}{% endblock %} {% block imports %} -<style> -/* Prevent wrapping of buttons in AK table */ -.table td:nth-child(5) { - white-space: nowrap; -} -</style> + <style> + /* Prevent wrapping of buttons in AK table */ + .table td:nth-child(5) { + white-space: nowrap; + } + </style> {% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item active">{% trans "AK Submission" %}</li> {% endblock %} @@ -30,7 +29,7 @@ <div class="jumbotron" style="margin-top:20px;"> <form method="POST" action="#" class="form-row"> {% csrf_token %} - <a href="{% url 'submit:submit_ak_wish' event_slug=event.slug %}" class="btn btn-info"> + <a href="{% url 'submit:submit_ak_wish' event_slug=event.slug %}" class="btn btn-info"> {% trans "New AK Wish" %} </a> <span style="font-size: 1.5em"> @@ -67,9 +66,10 @@ <ul class="nav nav-tabs" style="margin-bottom:15px"> {% for category, _ in categories %} - <li class="nav-item"> - <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" href="#category_{{ category.pk }}">{{ category.name }}</a> - </li> + <li class="nav-item"> + <a class="nav-link {% if forloop.first %}active{% endif %}" data-toggle="tab" + href="#category_{{ category.pk }}">{{ category.name }}</a> + </li> {% endfor %} </ul> diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html index 3e0815cb17472946a41fa3ba8a41d0c37ce17c26..cf0dabdf966e8eb4620c4ca23a20ce53b3d42443 100644 --- a/AKSubmission/templates/AKSubmission/submit_new.html +++ b/AKSubmission/templates/AKSubmission/submit_new.html @@ -13,11 +13,11 @@ {% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> + {% include "AKSubmission/submission_breadcrumbs.html" %} <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> - <li class="breadcrumb-item"><a href="{% url 'submit:akowner_edit' event_slug=event.slug slug=owner.slug %}">{{ owner.slug }}</a></li> + <li class="breadcrumb-item"><a + href="{% url 'submit:akowner_edit' event_slug=event.slug slug=owner.slug %}">{{ owner.slug }}</a></li> <li class="breadcrumb-item active">{% trans "New AK" %}</li> {% endblock %} @@ -47,8 +47,8 @@ {% block bottom_script %} <script src="{% static 'common/vendor/chosen-js/chosen.jquery.js' %}"></script> <script> - $(function() { - $('.chosen-select').chosen(); - }); + $(function () { + $('.chosen-select').chosen(); + }); </script> {% endblock %} \ No newline at end of file diff --git a/AKSubmission/templates/AKSubmission/submit_new_wish.html b/AKSubmission/templates/AKSubmission/submit_new_wish.html index 5bd54e7b718a88734217c8d14aa4c6d8bcfe9af1..6896c00a6e9a4e7b2f8a54c264d43ab718232d7c 100644 --- a/AKSubmission/templates/AKSubmission/submit_new_wish.html +++ b/AKSubmission/templates/AKSubmission/submit_new_wish.html @@ -5,9 +5,9 @@ {% block title %}{% trans "AKs" %}: {{ event.name }} - {% trans "New AK Wish" %}{% endblock %} {% block breadcrumbs %} - <li class="breadcrumb-item">AKPlanning</li> - <li class="breadcrumb-item">{{ event.slug }}</li> - <li class="breadcrumb-item"><a href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> + {% include "AKSubmission/submission_breadcrumbs.html" %} + <li class="breadcrumb-item"><a + href="{% url 'submit:submission_overview' event_slug=event.slug %}">{% trans "AK Submission" %}</a></li> <li class="breadcrumb-item active">{% trans "New AK Wish" %}</li> {% endblock %}