diff --git a/AKPlan/locale/de_DE/LC_MESSAGES/django.po b/AKPlan/locale/de_DE/LC_MESSAGES/django.po index fbb174f50bca5dd2ea9236685ba72f39e014704c..90548ac627d125e89063c10ec3b35daebe623feb 100644 --- a/AKPlan/locale/de_DE/LC_MESSAGES/django.po +++ b/AKPlan/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-02 01:08+0000\n" +"POT-Creation-Date: 2020-03-02 22:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,7 +25,7 @@ msgstr "Tag" msgid "Event" msgstr "Veranstaltung" -#: templates/AKPlan/plan_index.html:66 templates/AKPlan/plan_screen.html:64 +#: templates/AKPlan/plan_index.html:66 templates/AKPlan/plan_wall.html:64 msgid "Room" msgstr "Raum" @@ -34,14 +34,14 @@ msgid "AK Plan" msgstr "AK-Plan" #: templates/AKPlan/plan_index.html:112 -msgid "screen view" -msgstr "Anzeigeansicht" +msgid "AK Wall" +msgstr "AK-Wall" -#: templates/AKPlan/plan_index.html:120 templates/AKPlan/plan_screen.html:99 +#: templates/AKPlan/plan_index.html:120 templates/AKPlan/plan_wall.html:99 msgid "Current AKs" msgstr "Aktuelle AKs" -#: templates/AKPlan/plan_index.html:127 templates/AKPlan/plan_screen.html:104 +#: templates/AKPlan/plan_index.html:127 templates/AKPlan/plan_wall.html:104 msgid "Next AKs" msgstr "Nächste AKs" diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html index 0559a096e6db43775b0d6a51a023b9389fbf5422..4d552e7be1c49b68f734a03ab676e9f64e5d3b2d 100644 --- a/AKPlan/templates/AKPlan/plan_index.html +++ b/AKPlan/templates/AKPlan/plan_index.html @@ -109,7 +109,7 @@ {% block content %} <div class="float-right"> - <a href="{% url 'plan:plan_screen' event_slug=event.slug %}" class="btn btn-success">{% fontawesome_icon 'desktop' %} {% trans "screen view" %}</a> + <a href="{% url 'plan:plan_wall' event_slug=event.slug %}" class="btn btn-success">{% fontawesome_icon 'desktop' %} {% trans "AK Wall" %}</a> </div> <h1>Plan: {{ event }}</h1> diff --git a/AKPlan/templates/AKPlan/plan_screen.html b/AKPlan/templates/AKPlan/plan_wall.html similarity index 100% rename from AKPlan/templates/AKPlan/plan_screen.html rename to AKPlan/templates/AKPlan/plan_wall.html diff --git a/AKPlan/urls.py b/AKPlan/urls.py index dacc519e74d282d546a10c4562ad41dcc5f07954..2206cd0ea862c163ff71f9b088be50581668aa3a 100644 --- a/AKPlan/urls.py +++ b/AKPlan/urls.py @@ -8,7 +8,7 @@ urlpatterns = [ '<slug:event_slug>/plan/', include([ path('', views.PlanIndexView.as_view(), name='plan_overview'), - path('screen/', views.PlanScreenView.as_view(), name='plan_screen'), + path('wall/', views.PlanScreenView.as_view(), name='plan_wall'), ]) ), ] diff --git a/AKPlan/views.py b/AKPlan/views.py index d82ffe43679a5e18b72609ca6fc2a21c80e8ee43..b1b598cc112ab1df3a615dd5831b2c8b5742df6b 100644 --- a/AKPlan/views.py +++ b/AKPlan/views.py @@ -50,12 +50,12 @@ class PlanIndexView(FilterByEventSlugMixin, ListView): class PlanScreenView(PlanIndexView): - template_name = "AKPlan/plan_screen.html" + template_name = "AKPlan/plan_wall.html" def get_queryset(self): # Determine interesting range (some hours ago until some hours in the future as specified in the settings) - self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_BEAMER_HOURS_RETROSPECT) - self.end = self.start + timedelta(hours=(settings.PLAN_BEAMER_HOURS_RETROSPECT + settings.PLAN_BEAMER_HOURS_FUTURE)) + self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT) + self.end = self.start + timedelta(hours=(settings.PLAN_WALL_HOURS_RETROSPECT + settings.PLAN_WALL_HOURS_FUTURE)) # Restrict AK slots to relevant ones # This will automatically filter all rooms not needed for the selected range in the orginal get_context method diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py index 40120d428f678318ac8de11afeb8b2a99beb38f3..bea3d55a718313ce153ae5d319076e97c2fbd921 100644 --- a/AKPlanning/settings.py +++ b/AKPlanning/settings.py @@ -160,7 +160,7 @@ FOOTER_INFO = { # How many AKs should be visible as next AKs PLAN_MAX_NEXT_AKS = 10 # Specify range of plan for screen/projector view -PLAN_SCREEN_HOURS_RETROSPECT = 3 -PLAN_SCREEN_HOURS_FUTURE = 18 +PLAN_WALL_HOURS_RETROSPECT = 3 +PLAN_WALL_HOURS_FUTURE = 18 include(optional("settings/*.py"))