From 10efb67e7b647c535cd57861f2c84aeb79dc67e7 Mon Sep 17 00:00:00 2001
From: Vincent Martinez <eykosioux@gmail.com>
Date: Tue, 5 Dec 2017 11:36:09 +0000
Subject: [PATCH] Add a liquid_layout meta tag to page#show

---
 app/views/layouts/member_facing.slim | 3 +--
 app/views/pages/_show.slim           | 2 +-
 db/schema.rb                         | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/member_facing.slim b/app/views/layouts/member_facing.slim
index 9a7891788..22bbc72d7 100644
--- a/app/views/layouts/member_facing.slim
+++ b/app/views/layouts/member_facing.slim
@@ -6,7 +6,7 @@ html lang="#{@page.language.try(:code).try(:downcase)}"
     meta name="description" content=t('branding.description')
     - if Settings.facebook_app_id.present?
       meta property='fb:app_id' content="#{Settings.facebook_app_id}"
-      
+
     - if Settings.mixpanel_token
       = render 'layouts/mixpanel'
     = stylesheet_link_tag 'member-facing'
@@ -36,7 +36,6 @@ html lang="#{@page.language.try(:code).try(:downcase)}"
 
     = yield
 
-
     = render partial: 'shared/google_analytics_snippet'
 
     script type="text/javascript" charset="utf-8" async=true src="//c.shpg.org/99/sp.js"
diff --git a/app/views/pages/_show.slim b/app/views/pages/_show.slim
index 890bcfb4f..9eab261f0 100644
--- a/app/views/pages/_show.slim
+++ b/app/views/pages/_show.slim
@@ -3,7 +3,7 @@
 - meta og: facebook_meta(@page, share_card)
 
 - meta optimization_tags: @page.meta_tags
-
+- meta liquid_layout: @page.liquid_layout.title
 = @rendered
 = render 'pages/personalization', data: @data
 = render 'pages/campaigner_overlay', page: @page
diff --git a/db/schema.rb b/db/schema.rb
index fd847755e..7b009d283 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -45,8 +45,8 @@
     t.text "body"
     t.string "resource_id", null: false
     t.string "resource_type", null: false
-    t.integer "author_id"
     t.string "author_type"
+    t.integer "author_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
@@ -69,7 +69,7 @@
     t.string "member_phone_number"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.jsonb "target_call_info", default: {}, null: false
+    t.jsonb "target_call_info", default: "{}", null: false
     t.json "member_call_events", default: [], array: true
     t.integer "twilio_error_code"
     t.json "target"
@@ -114,8 +114,8 @@
     t.datetime "updated_at", null: false
     t.boolean "visible", default: false
     t.boolean "master", default: false
-    t.integer "formable_id"
     t.string "formable_type"
+    t.integer "formable_id"
     t.integer "position", default: 0, null: false
     t.index ["formable_type", "formable_id"], name: "index_forms_on_formable_type_and_formable_id"
   end
@@ -416,11 +416,11 @@
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "title"
-    t.json "targets", default: [], array: true
     t.string "sound_clip_file_name"
     t.string "sound_clip_content_type"
     t.integer "sound_clip_file_size"
     t.datetime "sound_clip_updated_at"
+    t.json "targets", default: [], array: true
     t.text "description"
     t.string "menu_sound_clip_file_name"
     t.string "menu_sound_clip_content_type"