Merge branch 'master' into polls

2017-04-06 14:16:49 +02:00
parent 06fe88b7ec 70bb08564f
commit 6bbcc71ecb
118 changed files with 1294 additions and 748 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -20,9 +20,11 @@
                     type: "image/png" %>
    <%= content_for :social_media_meta_tags %>

-    <%= setting['per_page_code'].try(:html_safe) %>
+    <%= setting['per_page_code_head'].try(:html_safe) %>
  </head>
  <body>
+    <%= setting['per_page_code_body'].try(:html_safe) %>
+
    <h1 class="sr-only"><%= setting['org_name'] %></h1>

    <div class="wrapper <%= yield (:wrapper_class) %>">