Merge pull request #384 from SumOfUs/hallway-mods

[Pre-deploy] Modifications from hallway tests

Author: osahyoun

app/assets/javascripts/layout_picker.js

@@ -6,6 +6,7 @@ const setupOnce = require('setup_once');
 
     events: {
       'click .radio-group__option': 'updateSelected',
+      'change .layout-type-checkbox': 'showRelevantLayouts'
     },
 
     updateSelected(e) {
@@ -28,6 +29,25 @@ const setupOnce = require('setup_once');
       }
     },
 
+    showRelevantLayouts(e) {
+      const $target = $(e.target);
+      const layoutClasses = this.getLayoutClasses($target.attr('id'));
+      const layoutRows = $target.closest('.form-group').find(layoutClasses.inverse_class).not(layoutClasses.own_class);
+      if ($target.is(':checked')) {
+        layoutRows.removeClass('hidden');
+      } else {
+        layoutRows.addClass('hidden');
+      }
+    },
+
+    getLayoutClasses(layout_select_id) {
+      if (layout_select_id==='primary') {
+        return {inverse_class: '.post-action-layout', own_class: '.primary-layout'}
+      } else if (layout_select_id==='follow-up') {
+        return {inverse_class: '.primary-layout', own_class: '.post-action-layout'}
+      }
+    }
+
   });
 
   $.subscribe("layout:edit pages:new", function(){

app/assets/stylesheets/page-edit.scss

@@ -430,3 +430,7 @@ body.page-edit-body {
 .well .tooltip__trigger, .tooltip--white .tooltip__trigger {
   background: white;
 }
+
+.checkbox input[type="checkbox"].layout-type-checkbox {
+  margin-left: 0px;
+}

app/controllers/liquid_layouts_controller.rb

@@ -65,6 +65,7 @@ def set_liquid_layout
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def liquid_layout_params
-      params.require(:liquid_layout).permit(:title, :content, :description, :experimental)
+      params.require(:liquid_layout).permit(:title, :content, :description, :experimental,
+        :primary_layout, :post_action_layout, :default_follow_up_layout_id)
     end
 end

app/helpers/api/actions_helper.rb

@@ -0,0 +1,33 @@
+module LayoutSelectHelper
+
+  def construct_layout_select_class(liquid_layout, page, field)
+    hidden = check_hidden(liquid_layout, field)
+    active = check_active(liquid_layout, page, field)
+    post_action_layout = liquid_layout.post_action_layout ? 'post-action-layout' : ''
+    primary_layout = liquid_layout.primary_layout ? 'primary-layout' : ''
+    "#{hidden} #{active} #{primary_layout} #{post_action_layout}"
+  end
+
+  def specify_layout_types(field)
+    (field == :liquid_layout_id) ? 'primary' : 'follow-up'
+  end
+
+  private
+
+  def check_hidden(liquid_layout, field)
+    if field == :liquid_layout_id
+      return 'hidden' unless liquid_layout.primary_layout
+    elsif field == :follow_up_liquid_layout_id
+      return 'hidden' unless liquid_layout.post_action_layout
+    end
+    ''
+  end
+
+  def check_active(liquid_layout, page, field)
+    if field == :follow_up_liquid_layout_id && page.follow_up_plan.to_sym == :with_page
+      return '' # the redirect option will be the active one in this case
+    end
+    # page.send(field) calls either page.liquid_layout_id or page.follow_up_liquid_layout_id
+    liquid_layout.id == page.send(field) ? 'active' : ''
+  end
+end