Merge pull request #307 from Katharineum/bugfix/mobile-plan

Bugfix/mobile plan

schoolapps/faq/templates/faq/faq.html

@@ -10,35 +10,43 @@
             <ul class="collapsible">
                 {% for question in section.questions.all %}
                     {% if question.show %}
-                    <li>
-                        <div class="collapsible-header flow-text">
-                            <i class="material-icons">
-                                {% if question.icon %}
-                                    {{ question.icon }}
-                                {% else %}
-                                    question_answer
-                                {% endif %}
-                            </i>
-                            {{ question.question_text }}
-                        </div>
-                        <div class="collapsible-body">
-                            {{ question.answer_text|safe }}
-                        </div>
-                    </li>
+                        <li>
+                            <div class="collapsible-header flow-text">
+                                <i class="material-icons">
+                                    {% if question.icon %}
+                                        {{ question.icon }}
+                                    {% else %}
+                                        question_answer
+                                    {% endif %}
+                                </i>
+                                {{ question.question_text }}
+                            </div>
+                            <div class="collapsible-body">
+                                {{ question.answer_text|safe }}
+                            </div>
+                        </li>
                     {% endif %}
                 {% endfor %}
             </ul>
         </section>
     {% endfor %}
 
+
     <p class="flow-text">
         Deine Frage war nicht dabei?
     </p>
     <p>
-        <a class="btn  blue waves-effect waves-green" href="{% url "ask-faq" %}">
-            <i class="material-icons left">chat</i>
-            Deine Frage stellen
-        </a>
+        {% if user.is_authenticated %}
+            <a class="btn  blue waves-effect waves-green" href="{% url "ask-faq" %}">
+                <i class="material-icons left">chat</i>
+                Deine Frage stellen
+            </a>
+        {% else %}
+            Schreibe uns an
+            <a href="mailto:support@katharineum.de">support@katharineum.de</a> und wir versuchen, deine Frage zu
+            beantworten.
+        {% endif %}
     </p>
+
 </main>
 {% include 'partials/footer.html' %}

schoolapps/support/views.py

+from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 
 from mailer import send_mail_with_template
@@ -12,6 +13,7 @@ def add_arrows(array: list):
     return " → ".join([item for item in array if item != ""])
 
 
+@login_required
 def rebus(request):
     if request.method == 'POST':
         form = REBUSForm(request.POST)
@@ -50,6 +52,7 @@ def rebus(request):
     return render(request, 'support/rebus.html', {'form': form, "props": {"rooms": rooms}})
 
 
+@login_required
 def feedback(request):
     if request.method == 'POST':
         form = FeedbackForm(request.POST)

schoolapps/timetable/templates/timetable/plan.html

@@ -200,6 +200,10 @@
                     <span class="card-title">
                         {{ day.0.0 }}
                     </span>
+                    {% if day.1 %}
+                        <span class="badge new blue center-align holiday-badge">{{ day.1.0 }}</span>
+                    {% endif %}
+                    &nbsp;
                 </div>
             </div>
             {% for row, time in plan|deepcopy %}

schoolapps/timetable/views.py

@@ -198,8 +198,8 @@ def plan(request, plan_type, plan_id, regular="", year=None, calendar_week=None)
         "weeks": get_calendar_weeks(year=year),
         "selected_week": calendar_week,
         "selected_year": year,
-        "short_week_days": zip(SHORT_WEEK_DAYS, holidays),
-        "long_week_days": zip(LONG_WEEK_DAYS, holidays),
+        "short_week_days": zip(SHORT_WEEK_DAYS, holidays) if smart else zip(SHORT_WEEK_DAYS),
+        "long_week_days": zip(LONG_WEEK_DAYS, holidays) if smart else zip(LONG_WEEK_DAYS),
         "holidays": holidays,
         "hints": hints,
         "hints_b": hints_b,