Skip to content
Snippets Groups Projects
Commit c4836caa authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Rename screen view to AK wall

Adapt filenames, references and URLs
Adapt settings keys
Adapt translations
Fix wrong settings keys in wall view
parent ff119c0d
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -25,7 +25,7 @@ msgstr "Tag" ...@@ -25,7 +25,7 @@ msgstr "Tag"
msgid "Event" msgid "Event"
msgstr "Veranstaltung" 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" msgid "Room"
msgstr "Raum" msgstr "Raum"
...@@ -34,14 +34,14 @@ msgid "AK Plan" ...@@ -34,14 +34,14 @@ msgid "AK Plan"
msgstr "AK-Plan" msgstr "AK-Plan"
#: templates/AKPlan/plan_index.html:112 #: templates/AKPlan/plan_index.html:112
msgid "screen view" msgid "AK Wall"
msgstr "Anzeigeansicht" 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" msgid "Current AKs"
msgstr "Aktuelle 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" msgid "Next AKs"
msgstr "Nächste AKs" msgstr "Nächste AKs"
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
{% block content %} {% block content %}
<div class="float-right"> <div class="float-right">
<a href="{% url 'plan:plan_screen' event_slug=event.slug %}" class="btn btn-success">{% fontawesome_icon 'desktop' %}&nbsp;&nbsp;{% trans "screen view" %}</a> <a href="{% url 'plan:plan_wall' event_slug=event.slug %}" class="btn btn-success">{% fontawesome_icon 'desktop' %}&nbsp;&nbsp;{% trans "AK Wall" %}</a>
</div> </div>
<h1>Plan: {{ event }}</h1> <h1>Plan: {{ event }}</h1>
......
...@@ -8,7 +8,7 @@ urlpatterns = [ ...@@ -8,7 +8,7 @@ urlpatterns = [
'<slug:event_slug>/plan/', '<slug:event_slug>/plan/',
include([ include([
path('', views.PlanIndexView.as_view(), name='plan_overview'), 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'),
]) ])
), ),
] ]
...@@ -50,12 +50,12 @@ class PlanIndexView(FilterByEventSlugMixin, ListView): ...@@ -50,12 +50,12 @@ class PlanIndexView(FilterByEventSlugMixin, ListView):
class PlanScreenView(PlanIndexView): class PlanScreenView(PlanIndexView):
template_name = "AKPlan/plan_screen.html" template_name = "AKPlan/plan_wall.html"
def get_queryset(self): def get_queryset(self):
# Determine interesting range (some hours ago until some hours in the future as specified in the settings) # 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.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
self.end = self.start + timedelta(hours=(settings.PLAN_BEAMER_HOURS_RETROSPECT + settings.PLAN_BEAMER_HOURS_FUTURE)) self.end = self.start + timedelta(hours=(settings.PLAN_WALL_HOURS_RETROSPECT + settings.PLAN_WALL_HOURS_FUTURE))
# Restrict AK slots to relevant ones # Restrict AK slots to relevant ones
# This will automatically filter all rooms not needed for the selected range in the orginal get_context method # This will automatically filter all rooms not needed for the selected range in the orginal get_context method
......
...@@ -160,7 +160,7 @@ FOOTER_INFO = { ...@@ -160,7 +160,7 @@ FOOTER_INFO = {
# How many AKs should be visible as next AKs # How many AKs should be visible as next AKs
PLAN_MAX_NEXT_AKS = 10 PLAN_MAX_NEXT_AKS = 10
# Specify range of plan for screen/projector view # Specify range of plan for screen/projector view
PLAN_SCREEN_HOURS_RETROSPECT = 3 PLAN_WALL_HOURS_RETROSPECT = 3
PLAN_SCREEN_HOURS_FUTURE = 18 PLAN_WALL_HOURS_FUTURE = 18
include(optional("settings/*.py")) include(optional("settings/*.py"))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment