From 6734a51b6add70d576f25b29afbebc85f79bdc2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 14 Jan 2015 11:52:42 +0100
Subject: [PATCH] move SiteText.{head,top,bottom} to SiteCustomization

---
 .../admin/models/site_customization.js        | 20 ++++++--
 .../admin/templates/customize_css_html.hbs    | 28 ++++++++---
 .../admin/views/admin_customize_view.js       | 46 ++++++++++++-------
 .../stylesheets/common/admin/admin_base.scss  |  5 ++
 .../admin/site_customizations_controller.rb   |  5 +-
 app/controllers/application_controller.rb     |  2 +-
 app/models/site_customization.rb              | 37 +++++++--------
 app/models/site_text.rb                       |  3 --
 app/views/layouts/application.html.erb        |  8 +++-
 app/views/layouts/crawler.html.erb            |  4 +-
 app/views/layouts/no_js.html.erb              |  4 +-
 config/locales/client.en.yml                  |  7 +++
 ...migrate_site_text_to_site_customization.rb |  2 +-
 ...114093325_add_top_to_site_customization.rb | 20 ++++++++
 14 files changed, 132 insertions(+), 59 deletions(-)
 create mode 100644 db/migrate/20150114093325_add_top_to_site_customization.rb

diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js
index 94a0567842c..27b6ddbdd93 100644
--- a/app/assets/javascripts/admin/models/site_customization.js
+++ b/app/assets/javascripts/admin/models/site_customization.js
@@ -7,7 +7,12 @@
   @module Discourse
 **/
 Discourse.SiteCustomization = Discourse.Model.extend({
-  trackedProperties: ['enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer'],
+  trackedProperties: [
+    'enabled', 'name',
+    'stylesheet', 'header', 'top', 'footer',
+    'mobile_stylesheet', 'mobile_header', 'mobile_top', 'mobile_footer',
+    'head_tag', 'body_tag'
+  ],
 
   description: function() {
     return "" + this.name + (this.enabled ? ' (*)' : '');
@@ -25,8 +30,10 @@ Discourse.SiteCustomization = Discourse.Model.extend({
     if (changed) { this.set('savingStatus', ''); }
 
     return changed;
-
-  }.property('enabled', 'name', 'stylesheet', 'header', 'footer', 'mobile_stylesheet', 'mobile_header', 'mobile_footer', 'originals'),
+  }.property('enabled', 'name', 'originals',
+    'stylesheet', 'header', 'top', 'footer',
+    'mobile_stylesheet', 'mobile_header', 'mobile_top', 'mobile_footer',
+    'head_tag', 'body_tag'),
 
   startTrackingChanges: function() {
     var self = this;
@@ -43,15 +50,20 @@ Discourse.SiteCustomization = Discourse.Model.extend({
   save: function() {
     this.set('savingStatus', I18n.t('saving'));
     this.set('saving',true);
+
     var data = {
       name: this.name,
       enabled: this.enabled,
       stylesheet: this.stylesheet,
       header: this.header,
+      top: this.top,
       footer: this.footer,
       mobile_stylesheet: this.mobile_stylesheet,
       mobile_header: this.mobile_header,
-      mobile_footer: this.mobile_footer
+      mobile_top: this.mobile_top,
+      mobile_footer: this.mobile_footer,
+      head_tag: this.head_tag,
+      body_tag: this.body_tag
     };
 
     var siteCustomization = this;
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs
index d28bdc6d352..acff1b73e35 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.hbs
+++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs
@@ -17,12 +17,22 @@
 
       <div class='admin-controls'>
         <ul class="nav nav-pills">
-          <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "selectStylesheet" target="view"}}>{{i18n 'admin.customize.css'}}</a></li>
-          <li><a {{bind-attr class="view.headerActive:active"}} {{action "selectHeader" target="view"}}>{{i18n 'admin.customize.header'}}</a></li>
-          <li><a {{bind-attr class="view.footerActive:active"}} {{action "selectFooter" target="view"}}>{{i18n 'admin.customize.footer'}}</a></li>
-          <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "selectMobileStylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.css'}}</a></li>
-          <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "selectMobileHeader" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.header'}}</a></li>
-          <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.footer'}}</a></li>
+          {{#if view.mobile}}
+            <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "select" "mobile_stylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.css'}}</a></li>
+            <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "select" "mobile_header" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.header'}}</a></li>
+            <li><a {{bind-attr class="view.mobileTopActive:active"}} {{action "select" "mobile_top" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.top'}}</a></li>
+            <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "select" "mobile_footer" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.footer'}}</a></li>
+          {{else}}
+            <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "select" "stylesheet" target="view"}}>{{i18n 'admin.customize.css'}}</a></li>
+            <li><a {{bind-attr class="view.headerActive:active"}} {{action "select" "header" target="view"}}>{{i18n 'admin.customize.header'}}</a></li>
+            <li><a {{bind-attr class="view.topActive:active"}} {{action "select" "top" target="view"}}>{{i18n 'admin.customize.top'}}</a></li>
+            <li><a {{bind-attr class="view.footerActive:active"}} {{action "select" "footer" target="view"}}>{{i18n 'admin.customize.footer'}}</a></li>
+            <li><a {{bind-attr class="view.headTagActive:active"}} {{action "select" "head_tag" target="view"}} title="{{i18n 'admin.customize.head_tag.title'}}">{{fa-icon "file-text-o"}}&nbsp;{{i18n 'admin.customize.head_tag.text'}}</a></li>
+            <li><a {{bind-attr class="view.bodyTagActive:active"}} {{action "select" "body_tag" target="view"}} title="{{i18n 'admin.customize.body_tag.title'}}">{{fa-icon "file-text-o"}}&nbsp;{{i18n 'admin.customize.body_tag.text'}}</a></li>
+          {{/if}}
+          <li class='toggle-mobile'>
+            <a {{bind-attr class="view.mobile:active"}} {{action "toggleMobile" target="view"}}>{{fa-icon "mobile"}}</a>
+          </li>
           <li class='toggle-maximize'><a {{action "toggleMaximize" target="view"}}>
             {{#if view.maximized}}
               {{fa-icon "compress"}}
@@ -36,14 +46,18 @@
       <div class="admin-container">
         {{#if view.stylesheetActive}}{{aceEditor content=selectedItem.stylesheet mode="scss"}}{{/if}}
         {{#if view.headerActive}}{{aceEditor content=selectedItem.header mode="html"}}{{/if}}
+        {{#if view.topActive}}{{aceEditor content=selectedItem.top mode="html"}}{{/if}}
         {{#if view.footerActive}}{{aceEditor content=selectedItem.footer mode="html"}}{{/if}}
+        {{#if view.headTagActive}}{{aceEditor content=selectedItem.head_tag mode="html"}}{{/if}}
+        {{#if view.bodyTagActive}}{{aceEditor content=selectedItem.body_tag mode="html"}}{{/if}}
         {{#if view.mobileStylesheetActive}}{{aceEditor content=selectedItem.mobile_stylesheet mode="scss"}}{{/if}}
         {{#if view.mobileHeaderActive}}{{aceEditor content=selectedItem.mobile_header mode="html"}}{{/if}}
+        {{#if view.mobileTopActive}}{{aceEditor content=selectedItem.mobile_top mode="html"}}{{/if}}
         {{#if view.mobileFooterActive}}{{aceEditor content=selectedItem.mobile_footer mode="html"}}{{/if}}
       </div>
       <div class='admin-footer'>
         <div class='status-actions'>
-          <span>{{i18n 'admin.customize.enabled'}}  {{input type="checkbox" checked=selectedItem.enabled}}</span>
+          <span>{{i18n 'admin.customize.enabled'}} {{input type="checkbox" checked=selectedItem.enabled}}</span>
           {{#unless selectedItem.changed}}
           <a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>
           |
diff --git a/app/assets/javascripts/admin/views/admin_customize_view.js b/app/assets/javascripts/admin/views/admin_customize_view.js
index 9e267b07bff..37ecfaceb1d 100644
--- a/app/assets/javascripts/admin/views/admin_customize_view.js
+++ b/app/assets/javascripts/admin/views/admin_customize_view.js
@@ -12,21 +12,36 @@ Discourse.AdminCustomizeView = Discourse.View.extend({
   templateName: 'admin/templates/customize',
   classNames: ['customize'],
   selected: 'stylesheet',
+  mobile: false,
 
-  headerActive:           Em.computed.equal('selected', 'header'),
-  footerActive:           Em.computed.equal('selected', 'footer'),
   stylesheetActive:       Em.computed.equal('selected', 'stylesheet'),
-  mobileHeaderActive:     Em.computed.equal('selected', 'mobileHeader'),
-  mobileFooterActive:     Em.computed.equal('selected', 'mobileFooter'),
-  mobileStylesheetActive: Em.computed.equal('selected', 'mobileStylesheet'),
+  headerActive:           Em.computed.equal('selected', 'header'),
+  topActive:              Em.computed.equal('selected', 'top'),
+  footerActive:           Em.computed.equal('selected', 'footer'),
+  headTagActive:          Em.computed.equal('selected', 'head_tag'),
+  bodyTagActive:          Em.computed.equal('selected', 'body_tag'),
+
+  mobileStylesheetActive: Em.computed.equal('selected', 'mobile_stylesheet'),
+  mobileHeaderActive:     Em.computed.equal('selected', 'mobile_header'),
+  mobileTopActive:        Em.computed.equal('selected', 'mobile_top'),
+  mobileFooterActive:     Em.computed.equal('selected', 'mobile_footer'),
 
   actions: {
-    selectHeader:           function() { this.set('selected', 'header'); },
-    selectFooter:           function() { this.set('selected', 'footer'); },
-    selectStylesheet:       function() { this.set('selected', 'stylesheet'); },
-    selectMobileHeader:     function() { this.set('selected', 'mobileHeader'); },
-    selectMobileFooter:     function() { this.set('selected', 'mobileFooter'); },
-    selectMobileStylesheet: function() { this.set('selected', 'mobileStylesheet'); },
+    toggleMobile: function() {
+      // auto-select best tab
+      var tab = this.get("selected");
+      if (/_tag$/.test(tab)) { tab = "stylesheet"; }
+      if (this.get("mobile")) { tab = tab.replace("mobile_", ""); }
+      else { tab = "mobile_" + tab; }
+      this.set("selected", tab);
+      // toggle mobile
+      this.toggleProperty("mobile");
+    },
+
+    select: function(tab) {
+      this.set('selected', tab);
+    },
+
     toggleMaximize: function() {
       this.set("maximized", !this.get("maximized"));
 
@@ -35,20 +50,19 @@ Discourse.AdminCustomizeView = Discourse.View.extend({
           $(this).data("editor").resize();
         });
       });
-
     },
   },
 
-  didInsertElement: function() {
+  _init: function() {
     var controller = this.get('controller');
     Mousetrap.bindGlobal('mod+s', function() {
       controller.send("save");
       return false;
     });
-  },
+  }.on("didInsertElement"),
 
-  willDestroyElement: function() {
+  _cleanUp: function() {
     Mousetrap.unbindGlobal('mod+s');
-  }
+  }.on("willDestroyElement")
 
 });
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 3e71449fe17..d77de3dc56b 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -516,6 +516,11 @@ section.details {
     .nav.nav-pills{
       position: relative;
     }
+    .toggle-mobile {
+      position: absolute;
+      right: 35px;
+      font-size: 20px;
+    }
     .toggle-maximize {
       position: absolute;
       right: -5px;
diff --git a/app/controllers/admin/site_customizations_controller.rb b/app/controllers/admin/site_customizations_controller.rb
index 73ac7e734fa..dc104fd743f 100644
--- a/app/controllers/admin/site_customizations_controller.rb
+++ b/app/controllers/admin/site_customizations_controller.rb
@@ -52,8 +52,9 @@ class Admin::SiteCustomizationsController < Admin::AdminController
 
     def site_customization_params
       params.require(:site_customization)
-            .permit(:name, :stylesheet, :header, :footer,
-                    :mobile_stylesheet, :mobile_header, :mobile_footer,
+            .permit(:name, :stylesheet, :header, :top, :footer,
+                    :mobile_stylesheet, :mobile_header, :mobile_top, :mobile_footer,
+                    :head_tag, :body_tag,
                     :position, :enabled, :key,
                     :stylesheet_baked)
     end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ed1dbd5c954..6d10f99780b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -275,7 +275,7 @@ class ApplicationController < ActionController::Base
 
     def custom_html_json
       data = {
-        top: SiteText.text_for(:top),
+        top: SiteCustomization.custom_top(session[:preview_style]),
         footer: SiteCustomization.custom_footer(session[:preview_style])
       }
 
diff --git a/app/models/site_customization.rb b/app/models/site_customization.rb
index f9c6349e031..7a1890b62ab 100644
--- a/app/models/site_customization.rb
+++ b/app/models/site_customization.rb
@@ -77,14 +77,11 @@ class SiteCustomization < ActiveRecord::Base
     end
   end
 
-  def self.custom_header(preview_style=nil, target=:desktop)
-    preview_style ||= ENABLED_KEY
-    lookup_field(preview_style, target, :header)
-  end
-
-  def self.custom_footer(preview_style=nil, target=:dekstop)
-    preview_style ||= ENABLED_KEY
-    lookup_field(preview_style,target,:footer)
+  %i{header top footer head_tag body_tag}.each do |name|
+    define_singleton_method("custom_#{name}") do |preview_style=nil, target=:desktop|
+      preview_style ||= ENABLED_KEY
+      lookup_field(preview_style, target, name)
+    end
   end
 
   def self.lookup_field(key, target, field)
@@ -95,20 +92,18 @@ class SiteCustomization < ActiveRecord::Base
     lookup = @cache[cache_key]
     return lookup.html_safe if lookup
 
-    styles =
-      if key == ENABLED_KEY
-        order(:name).where(enabled:true).to_a
-      else
-        [find_by(key: key)].compact
-      end
+    styles = if key == ENABLED_KEY
+      order(:name).where(enabled:true).to_a
+    else
+      [find_by(key: key)].compact
+    end
 
-    val =
-      if styles.present?
-        styles.map do |style|
-          lookup = target == :mobile ? "mobile_#{field}" : field
-          style.send(lookup)
-        end.compact.join("\n")
-      end
+    val = if styles.present?
+      styles.map do |style|
+        lookup = target == :mobile ? "mobile_#{field}" : field
+        style.send(lookup)
+      end.compact.join("\n")
+    end
 
     (@cache[cache_key] = val || "").html_safe
   end
diff --git a/app/models/site_text.rb b/app/models/site_text.rb
index 6046bc50237..88620766a66 100644
--- a/app/models/site_text.rb
+++ b/app/models/site_text.rb
@@ -25,9 +25,6 @@ class SiteText < ActiveRecord::Base
   add_text_type :education_new_topic, default_18n_key: 'education.new-topic'
   add_text_type :education_new_reply, default_18n_key: 'education.new-reply'
   add_text_type :login_required_welcome_message, default_18n_key: 'login_required.welcome_message'
-  add_text_type :top, allow_blank: true, format: :html
-  add_text_type :bottom, allow_blank: true, format: :html
-  add_text_type :head, allow_blank: true, format: :html
 
   def site_text_type
     @site_text_type ||= SiteText.find_text_type(text_type)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cc71444dde9..02618bfcf04 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -22,7 +22,9 @@
       <%= script "admin"%>
     <%- end %>
 
-    <%= raw SiteText.text_for(:head) %>
+    <%- unless customization_disabled? %>
+      <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
+    <%- end %>
 
     <%= render_google_universal_analytics_code %>
 
@@ -87,6 +89,8 @@
 
     <%= render_google_analytics_code %>
 
-    <%= raw SiteText.text_for(:bottom) %>
+    <%- unless customization_disabled? %>
+      <%= raw SiteCustomization.custom_body_tag(session[:preview_style]) %>
+    <%- end %>
   </body>
 </html>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index b68ad9bbf65..8775cb8c79c 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -5,7 +5,9 @@
     <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
     <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
     <%= render partial: "layouts/head" %>
-    <%= raw SiteText.text_for(:head) %>
+    <%- unless customization_disabled? %>
+      <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
+    <%- end %>
     <%= yield :head %>
   </head>
   <body>
diff --git a/app/views/layouts/no_js.html.erb b/app/views/layouts/no_js.html.erb
index 66c350aeae1..64999a39209 100644
--- a/app/views/layouts/no_js.html.erb
+++ b/app/views/layouts/no_js.html.erb
@@ -5,7 +5,9 @@
     <title><%=SiteSetting.title%></title>
     <meta name="description" content="">
     <%= render partial: "layouts/head" %>
-    <%= raw SiteText.text_for(:head) %>
+    <%- unless customization_disabled? %>
+      <%= raw SiteCustomization.custom_head_tag(session[:preview_style]) %>
+    <%- end %>
     <%= yield(:no_js_head) %>
   </head>
   <body>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e67c61d2746..c060b77f036 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1715,7 +1715,14 @@ en:
         long_title: "Site Customizations"
         css: "CSS"
         header: "Header"
+        top: "Top"
         footer: "Footer"
+        head_tag:
+          text: "</head>"
+          title: "HTML that will be inserted before the </head> tag"
+        body_tag:
+          text: "</body>"
+          title: "HTML that will be inserted before the </body> tag"
         override_default: "Do not include standard style sheet"
         enabled: "Enabled?"
         preview: "preview"
diff --git a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
index a0288528ccf..569f4b98b2a 100644
--- a/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
+++ b/db/migrate/20150112172259_migrate_site_text_to_site_customization.rb
@@ -11,7 +11,7 @@ class MigrateSiteTextToSiteCustomization < ActiveRecord::Migration
         '#{SecureRandom.uuid}',
         now(),
         now(),
-        (SELECT value FROM site_texts WHERE text_type = 'top' LIMIT 1),
+        (SELECT value FROM site_texts WHERE text_type = 'head' LIMIT 1),
         (SELECT value FROM site_texts WHERE text_type = 'bottom' LIMIT 1)
       )
     SQL
diff --git a/db/migrate/20150114093325_add_top_to_site_customization.rb b/db/migrate/20150114093325_add_top_to_site_customization.rb
new file mode 100644
index 00000000000..0aee14ccae4
--- /dev/null
+++ b/db/migrate/20150114093325_add_top_to_site_customization.rb
@@ -0,0 +1,20 @@
+class AddTopToSiteCustomization < ActiveRecord::Migration
+  def up
+    add_column :site_customizations, :top, :text
+    add_column :site_customizations, :mobile_top, :text
+
+    execute <<-SQL
+      UPDATE site_customizations
+         SET top = (SELECT value FROM site_texts WHERE text_type = 'top' LIMIT 1),
+             mobile_top = (SELECT value FROM site_texts WHERE text_type = 'top' LIMIT 1),
+             head_tag = (SELECT value FROM site_texts WHERE text_type = 'head' LIMIT 1),
+             body_tag = (SELECT value FROM site_texts WHERE text_type = 'bottom' LIMIT 1)
+       WHERE name = 'Migrated from Site Text'
+    SQL
+  end
+
+  def down
+    remove_column :site_customizations, :top
+    remove_column :site_customizations, :mobile_top
+  end
+end