From dabdcf59c478ac27f84a7718ac8d66e13649b3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 18 Nov 2013 17:13:24 +0100
Subject: [PATCH] allow for arbitrary HTML at the top/bottom of every pages

---
 .../discourse/components/logo_component.js        |  1 +
 .../discourse/controllers/static_controller.js    | 14 ++++++++------
 .../discourse/templates/list.js.handlebars        |  4 +++-
 .../discourse/templates/topic.js.handlebars       |  3 +++
 .../javascripts/discourse/views/html_view.js      | 15 +++++++++++++++
 app/models/site_content.rb                        |  2 ++
 app/views/layouts/application.html.erb            |  6 ++++++
 config/locales/server.en.yml                      |  6 ++++++
 8 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/views/html_view.js

diff --git a/app/assets/javascripts/discourse/components/logo_component.js b/app/assets/javascripts/discourse/components/logo_component.js
index 3091ff09603..443d666a2fa 100644
--- a/app/assets/javascripts/discourse/components/logo_component.js
+++ b/app/assets/javascripts/discourse/components/logo_component.js
@@ -1,4 +1,5 @@
 Discourse.DiscourseLogoComponent = Ember.Component.extend({
+
   linkUrl: function() {
     return Discourse.getURL("/");
   }.property(),
diff --git a/app/assets/javascripts/discourse/controllers/static_controller.js b/app/assets/javascripts/discourse/controllers/static_controller.js
index e02d6fee20a..f3f945b8306 100644
--- a/app/assets/javascripts/discourse/controllers/static_controller.js
+++ b/app/assets/javascripts/discourse/controllers/static_controller.js
@@ -15,20 +15,22 @@ Discourse.StaticController = Discourse.Controller.extend({
   }.property('path'),
 
   loadPath: function(path) {
-    this.set('path', path);
-    var staticController = this;
-    this.set('content', null);
+    var self = this;
+
+    this.setProperties({
+      path: path,
+      content: null
+    });
 
     // Load from <noscript> if we have it.
     var $preloaded = $("noscript[data-path=\"" + path + "\"]");
     if ($preloaded.length) {
       var text = $preloaded.text();
-      text = text.match(/<!-- preload-content: -->((?:.|[\n\r])*)<!-- :preload-content -->/);
-      text = text[1];
+      text = text.match(/<!-- preload-content: -->((?:.|[\n\r])*)<!-- :preload-content -->/)[1];
       this.set('content', text);
     } else {
       return Discourse.ajax(path, {dataType: 'html'}).then(function (result) {
-        staticController.set('content', result);
+        self.set('content', result);
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/templates/list.js.handlebars b/app/assets/javascripts/discourse/templates/list.js.handlebars
index 28b8c8f05bb..30f8b6353c3 100644
--- a/app/assets/javascripts/discourse/templates/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list.js.handlebars
@@ -1,3 +1,5 @@
+{{view Discourse.HtmlView key="top"}}
+
 <div class='list-controls'>
   <div class="container">
 
@@ -33,4 +35,4 @@
   </div>
 </div>
 
-
+{{view Discourse.HtmlView key="bottom"}}
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index ee1e3329655..6d6fb7013ce 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -1,3 +1,5 @@
+{{view Discourse.HtmlView key="top"}}
+
 {{#if postStream.loaded}}
 
   {{#if postStream.firstPostLoaded}}
@@ -136,3 +138,4 @@
   {{render topicAdminMenu content}}
 {{/if}}
 
+{{view Discourse.HtmlView key="bottom"}}
diff --git a/app/assets/javascripts/discourse/views/html_view.js b/app/assets/javascripts/discourse/views/html_view.js
new file mode 100644
index 00000000000..d399095611b
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/html_view.js
@@ -0,0 +1,15 @@
+Discourse.HtmlView = Ember.View.extend({
+
+  render: function(buffer) {
+    var key = this.get("key"),
+        noscript = $("noscript").text();
+
+    if (noscript.length) {
+      var regexp = new RegExp("<!-- " +  key + ": -->((?:.|[\\n\\r])*)<!-- :" + key + " -->"),
+          content = noscript.match(regexp)[1];
+
+      buffer.push(content);
+    }
+  }
+
+});
diff --git a/app/models/site_content.rb b/app/models/site_content.rb
index 7bf6cef3be0..e8aa741a4f1 100644
--- a/app/models/site_content.rb
+++ b/app/models/site_content.rb
@@ -20,6 +20,8 @@ class SiteContent < ActiveRecord::Base
   add_content_type :login_required_welcome_message, default_18n_key: 'login_required.welcome_message'
   add_content_type :privacy_policy, allow_blank: true
   add_content_type :faq, allow_blank: true
+  add_content_type :top, allow_blank: true
+  add_content_type :bottom, allow_blank: true
 
 
   def site_content_type
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0b3a0f7f798..a60e8cb68ae 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -75,11 +75,17 @@
           </div>
         </div>
       </header>
+      <!-- top: -->
+      <%= raw SiteContent.content_for(:top) %>
+      <!-- :top -->
       <div id="main-outlet" class="container">
         <!-- preload-content: -->
         <%= yield %>
         <!-- :preload-content -->
       </div>
+      <!-- bottom: -->
+      <%= raw SiteContent.content_for(:bottom) %>
+      <!-- :bottom -->
     </noscript>
     <!-- Discourse Version: <%= Discourse::VERSION::STRING %> -->
     <!-- Git Version: <%= Discourse.git_version %> -->
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4225b622c4b..8e8090b74f4 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -476,6 +476,12 @@ en:
     login_required:
       title: "Login Required: Homepage"
       description: "The text displayed for unauthorized users when login is required on the site."
+    top:
+      title: "Top of the pages"
+      description: "HTML that will be added at the top of every pages (after the header, before the navigation or the topic title)"
+    bottom:
+      title: "Bottom of the pages"
+      description: "HTML that will be added at the bottom of every pages"
 
   site_settings:
     default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"