Merge branch 'master' into proposal-dashboard

2019-04-04 14:08:30 +02:00
parent 2b1b05d9ed 0942ef3200
commit 94b8caffca
59 changed files with 1023 additions and 196 deletions
--- a/app/views/layouts/_officing_booth.html.erb
+++ b/app/views/layouts/_officing_booth.html.erb
@@ -0,0 +1,5 @@
+<% if current_user.poll_officer? %>
+  <div id="officing-booth" class="callout info">
+    <%= t("admin.officing_booth.title", booth: try(:current_booth).try(:location)) %>
+  </div>
+<% end %>
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -33,6 +33,7 @@

            <div class="admin-content small-12 medium-9 column" data-equalizer-watch>
              <%= render "layouts/flash" %>
+              <%= render "layouts/officing_booth" %>
              <%= yield %>
            </div>
          </div>