pages_cms 1.2.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197ac68da6140470849cc8698ce45ce236bd687f
-  data.tar.gz: 8b23709924440a213660782100e09b88405f19b5
+  metadata.gz: 50187550275f43fafc21baf6f990d0df37c1f449
+  data.tar.gz: 1a27fc5996a16e68cb7b7099e2dd0710ee9d9f1d
 SHA512:
-  metadata.gz: a656bfba8d7e4527472bd3c8f676e82bf7fa8b89537d803b7841fe9e48b866b2696168ffce35a5cd28a6f4cbe6de8a8a7061556ab4904f934e454440ba53659c
-  data.tar.gz: 1c781eb27c8dfdb47f41a1077e6222ec4f0fa5be6a697be4445e5ea8695e1149972a97a7d233d1ae4e0135f6533f25d6cabad45477b27a8655734945c302d37d
+  metadata.gz: f5cffa542b3d90d0ef0d2877fa19d9602a7b122718c325e23d60e1b11f8f646b3586a4d82e0ad3293d52c808e4f46a9354784b996e2467c2243681d4540c1fbc
+  data.tar.gz: 452be52cfa9f96d2a3ac24a2951279d5407635d148167f22d28ed4538a4b4bebed42fc095ffe2b451fe54a3f1805ac994d11cbb2134ff3dbe9c3149ef7943132

data/README.md

@@ -25,7 +25,7 @@ These content types can be interpreted by a designer to create a unique look and
 
 ## Installation
 
-1. 	Add: `gem 'pages_cms', '~> 1.2.1'` to your `Gemfile`
+1. 	Add: `gem 'pages_cms', '~> 1.2.3'` to your `Gemfile`
 2. 	Run: `$ rails generate pages_cms:install`
 3.	Add: `//= require cocoon` to your `application.js` file
 

data/app/assets/stylesheets/pages_cms/pages_cms.scss

@@ -1,11 +1,24 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
+@import url(http://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,300,100,700);
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Lato', sans-serif;
+}
+h1 { font-size: 4em; text-align: center; margin-top: 2em;}
+p, div {
+  font-family: 'Roboto Slab', serif; font-size: 17px !important; line-height: 1.5em !important; font-weight: 300;
+}
+p { margin-bottom: 2em; }
+
+body { background-color: #f5f5f5;}
+.back { background-color: #fff !important; padding: 1em;}
 .inline-form { display: inline-block; max-width: 150px; }
 .indent-1 { margin-left: 2em; }
 .indent-2 { margin-left: 3.5em; }
 .small-text-area { width: 400px; }
 .big { font-size: 3em; height: auto !important; }
-.container-fluid { max-width: 1150px; }
+.container-fluid { max-width: 1200px; }
 .navbar { height: 50px; margin: 0; }
 .gallery { height: 300px !important; width: auto; overflow: hidden;}
 .center { text-align: center;}
@@ -23,21 +36,29 @@
 .carousel { width: 100% !important;}
 .full { width: 100% !important; padding: 0;}
 .container-contain { width: 100%; overflow: hidden;}
-.post { margin-top: 4em !important; }
+.post { margin-bottom: 4em !important; }
 .contact-mes { max-width: 600px; max-height: 80px !important; overflow: scroll !important }
 .image-box { position: relative; width: 50%; float: left !important; overflow: hidden; transition: all 0.3s; h3 { position: absolute; top: 50%; text-align: center; width: 100%; } }
 .image-box:hover { opacity: 0.5; }
-.admin-list { background-color: #2E2F30; margin: 0; color: #90d9ff !important; a { color: #ffffff !important; padding: 5px; } a:hover { color: black !important; background-color: #fff !important;} }
+.admin-list {  background-color: #2E2F30; margin: 0; color: #90d9ff !important; a { color: #ffffff !important; padding: 5px; } a:hover { background-color: #5e5e5e !important; text-decoration: none !important; transition: background-color 0.3s; } }
 .list-table { list-style-type: none; .drop-link { color: inherit; } li {margin: 1.5em; position: relative; padding-top: 0.5em;} .items {position: relative; padding-top: 0.5em;} .links { position: absolute; right: 25% !important; top: 0; }  }
 .form-control { border-left: none !important; border-right: none !important; border-top: none !important; outline: none !important; box-shadow: none !important; border-radius: 0 !important; }
 .sortable-dragging {  border: 1px dashed #CCC;  background: none; height: 2em; }
 .sortable-placeholder {  border: 1px dashed #CCC;  background: none; height: 2em; }
-.mess { max-height: 40px; overflow: hidden; }
-.page-height-1 { height: 80vh !important; overflow: scroll; }
+.mess { max-height: 60px; overflow: hidden; }
+.page-height-1 { height: 70vh !important; overflow: scroll; }
 .page-height-2 { height: 70vh !important; overflow: scroll; }
-.message{ position: fixed; width: 200px; top: 0; left: 0; right: 0; margin: auto !important;  }
+.message{ position: fixed; width: 200px; top: 50px; left: 0; right: 0; margin: auto !important; z-index: 6;  }
 .relative { position: relative; }
 .hard-right { position: absolute; right: 0; top: 0; }
 
+.space { margin-top: 2em !important; }
+.space-bottom { margin-bottom: 2em !important; }
+
 .td-left { width: 40% }
 .td-right { width: 60% !important }
+
+.main-background { height: 50vh !important; position: relative; .header-text { position: absolute; left: 10%; top: 20%; } }
+
+.navbar { z-index: 9999; .in, .collapsing { background-color: #ffffff; } }
+

data/app/controllers/pages_cms/admin/articles_controller.rb

@@ -6,10 +6,7 @@ module PagesCms
     before_action :selected_account
 
     def index
-      @articles = current_account.articles.all
-      filter_params(params).each do |search, result|
-        @articles = @articles.public_send(search, result) if result.present?
-      end
+      return_articles
       if params[:edit].present? && Article.exists?(params[:edit])
         @article = Article.find(params[:edit])
         @edit = true
@@ -21,33 +18,30 @@ module PagesCms
       end
     end
 
-    def new
-      @article = current_account.articles.build
-    end
-
     def create
+      return_articles
       @article = current_account.articles.build(article_params)
       if @article.save
         flash[:success] = 'Successfully updated'
         redirect_to admin_articles_path
       else
-        flash[:danger] = 'Failed to update'
-        redirect_to admin_articles_path
+        @new = true
+        flash[:danger] = "Failed: #{@article.errors.full_messages.to_sentence}"
+        render :index
       end
     end
 
-    def edit
-      @article = Article.find(params[:id])
-    end
-
     def update
+      return_articles
       @article = Article.find(params[:id])
       if @article.update(article_params)
+        @edit = true
         flash[:success] = 'Successfully updated'
-        redirect_to admin_articles_path
+        render :index
       else
-        flash[:danger] = 'Failed to update'
-        redirect_to admin_articles_path
+        @edit = true
+        flash[:danger] = "Failed: #{@article.errors.full_messages.to_sentence}"
+        render :index
       end
     end
 
@@ -58,9 +52,16 @@ module PagesCms
     end
 
     private
+      def return_articles
+        @articles = current_account.articles.all
+        filter_params(params).each do |search, result|
+          @articles = @articles.public_send(search, result) if result.present?
+        end
+      end
+
       def article_params
         params.require(:article).permit(
-          :title, :tags, :content, :image_id, :draft, :archived
+          :title, :tags, :content, :image_id, :draft, :archived, :content_md
         )
       end
 

data/app/controllers/pages_cms/contacts_controller.rb

@@ -7,8 +7,13 @@ module PagesCms
     def create
       contact = current_site.contacts.build(contact_params)
       if contact.save
+        begin
+          ContactMailer.new_contact(contact).deliver
+          flash[:success] = 'Successfully contacted us. We will respond shortly!'
+        rescue Exception => e
+          flash[:success] = 'Successfully contacted us. We will respond shortly.'
+        end
         flash[:success] = 'Successfully contacted us. We will respond shortly!'
-        ContactMailer.new_contact(contact).deliver_now
         redirect_to :back
       else
         flash[:danger] = "There was a problem: #{contact.errors.full_messages.to_sentence}"

data/app/helpers/pages_cms/application_helper.rb

@@ -35,7 +35,9 @@ module PagesCms
     # redirects to the blog with a search
     def blog_path(current_site, search = '')
       blog = current_site.pages.find_by(slug: 'blog')
-      "#{slugged_path(blog)}?search=#{search}"
+      unless blog.nil?
+        "#{slugged_path(blog)}?search=#{search}"
+      end
     end
 
     def insert_html_breaks(string)

data/app/models/pages_cms/article.rb

@@ -4,22 +4,46 @@ module PagesCms
     belongs_to :image
 
     validates :title,   presence: true
-    validates :content, presence: true
     validates :tags,    presence: true
 
+    validate :xor_article
 
-    def tags=(val)
-      write_attribute(:tags, val.strip.gsub(/\s+/, '_').split(',') )
+
+    def content?
+      content.present?
     end
 
-    def self.published
-      self.where('archived != true AND draft != true')
+    def content_md?
+      content_md.present?
     end
 
-    def self.all_tags
-      self.each do |article|
+    def content_either
+      if content_md?
+        self.content_md_rendered
+      elsif content?
+        self.content
+      else
+        'Article not saved properly.'
+      end
+    end
 
+    def content_md=(value)
+      old = value
+      if value.nil?
+        new = value
+      else
+        new = Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(value)
       end
+      self[:content_md_rendered] = new
+      self[:content_md] = old
+    end
+
+    def tags=(val)
+      write_attribute(:tags, val.strip.gsub(/\s+/, '_').split(',') )
+    end
+
+    def self.published
+      self.where('archived != true AND draft != true')
     end
 
     def article_status
@@ -48,5 +72,16 @@ module PagesCms
       end
     end
 
+    def xor(a,b)
+      (a || b) && !(a && b)
+    end
+
+    private
+      def xor_article
+        unless xor(content_md?, content?)
+          errors.add(:base, "Content can't be blank")
+        end
+      end
+
   end
 end

data/app/models/pages_cms/markdown_text.rb

@@ -0,0 +1,13 @@
+module PagesCms
+  class MarkdownText < ActiveRecord::Base
+    belongs_to :page_block
+
+    def content=(value)
+      old = value
+      new = Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(value)
+      self[:content_rendered] = new
+      self[:content] = old
+    end
+
+  end
+end

data/app/models/pages_cms/page_block.rb

@@ -4,12 +4,14 @@ module PagesCms
     belongs_to  :image #todo why is this here?
 
     has_many    :text_boxes,      dependent: :destroy
+    has_many    :markdown_texts,  dependent: :destroy
     has_many    :thumbnails,      dependent: :destroy
     has_many    :blog_feeds,      dependent: :destroy
     has_many    :image_boxes,     dependent: :destroy
     has_many    :contact_fields,  dependent: :destroy
 
     accepts_nested_attributes_for :text_boxes,      reject_if: :all_blank, allow_destroy: true
+    accepts_nested_attributes_for :markdown_texts,  reject_if: :all_blank, allow_destroy: true
     accepts_nested_attributes_for :thumbnails,      reject_if: :all_blank, allow_destroy: true
     accepts_nested_attributes_for :blog_feeds,      reject_if: :all_blank, allow_destroy: true
     accepts_nested_attributes_for :image_boxes,     reject_if: :all_blank, allow_destroy: true

data/app/views/layouts/pages_cms/_header.html.erb

@@ -8,13 +8,13 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="/">Brand</a>
+			<a class="navbar-brand" href="/"><%= current_site.site_name if current_site %></a>
 		</div>
 
-		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1" >
 			<ul class="nav navbar-nav navbar-right">
 				<% if current_site %>
-				<% current_site.pages.where(navbar_show: true).order(:order).each do |page| %>
+				<% current_site.pages.where(navbar_show: true).order(:order).includes(:children).each do |page| %>
 					<% if page.children.exists? %>
 						<li class="dropdown">
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><%= page.title %><span class="caret"></span></a>
@@ -30,6 +30,9 @@
 					<% end %>
 				<% end %>
 				<% end %>
+				<% if current_user_is_admin? %>
+						<li><%= link_to 'Admin', admin_pages_path %></li>
+				<% end %>
 			</ul>
 		</div>
 

data/app/views/layouts/pages_cms/application.html.erb

@@ -5,6 +5,7 @@
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<% if current_site %>
 		<meta name="description" content="<%= yield(:meta_description).present? ? yield(:meta_description) : current_site.meta_description %>">
 		<meta name="keywords" content="<%= yield(:meta_tags).present? ? yield(:meta_tags) : current_site.meta_tags %>">
@@ -12,32 +13,10 @@
 </head>
 <body>
 
-<% if current_user_is_admin? %>
-	<ul class="list-inline admin-list">
-		<li class="dropdown">
-			<a type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><%= current_account ? current_account.site_name : 'No Site Selected' %><span class="caret"></span></a>
-			<ul class="dropdown-menu navbar-inverse" aria-labelledby="dropdownMenu1">
-				<% PagesCms::Account.all.each do |account| %>
-					<li><%= link_to account.site_name, admin_accounts_site_path(account: account.id), method: :post %></li>
-				<% end  %>
-				<li class="divider"></li>
-				<li><%= link_to 'Manage Accounts', admin_accounts_path %></li>
-			</ul>
-		</li>
-		<li><%= link_to 'Pages', admin_pages_path  %></li>
-		<li><%= link_to 'Images', admin_images_path  %></li>
-		<li><%= link_to 'Articles', admin_articles_path  %></li>
-		<li><%= link_to 'Account', admin_accounts_path  %></li>
-		<li><%= link_to 'Contacts', admin_contacts_path  %></li>
-		<li><%= link_to 'Log Out', 'logout_path', method: :delete  %></li>
-	</ul>
-<% end %>
-
 <%= render 'layouts/pages_cms/header' %>
 
 <% flash.each do |message_type, message| %>
-	<div class="message" onclick="$('.message').remove()">
-		<span class="hard-right glyphicon glyphicon-remove-circle"></span>
+	<div class="message" onclick="$('.message').fadeOut(300, function() { $(this).remove(); });" style="transition: all 0.2s">
 		<div class="center-block text-center alert alert-<%= message_type %>" ><%= message %></div>
 	</div>
 <% end %>
@@ -46,8 +25,8 @@
 
 <script>
 	window.setInterval(function(){
-		$('.message').remove();
-	}, 5000);
+		$(".message").fadeOut(300, function() { $(this).remove(); });
+	}, 2000);
 </script>
 
 </body>

data/app/views/pages_cms/admin/accounts/_form.html.haml

@@ -1,4 +1,4 @@
-%div.content
+%div.content.back
   = form_for account, url: url, method: method do |f|
     %table
       %tr
@@ -36,4 +36,5 @@
           = f.label 'SEO Meta Description'
         %td.td-right
           = f.text_field :meta_description, class: 'form-control'
+    <br />
     = f.submit 'Submit', class: 'btn btn-primary center-block'

data/app/views/pages_cms/admin/accounts/index.html.haml

@@ -1,7 +1,8 @@
-%div.container-fluid
-  %h1 Accounts
-  = link_to 'New Account', new_admin_account_path, class: 'btn btn-default'
+<br />
+= render 'pages_cms/admin/shared/tabs', active: 'Account'
 
+%div.container-fluid.back
+  = link_to 'New Account', new_admin_account_path, class: 'btn btn-default'
   %table.table
     %thead
       %tr

data/app/views/pages_cms/admin/articles/_form.html.haml

@@ -1,14 +1,39 @@
-= javascript_include_tag 'pages_cms/wysihtml5x-toolbar'
-= javascript_include_tag 'pages_cms/advanced_and_extended'
--#= javascript_include_tag 'pages_cms/select2.min'
--#= stylesheet_link_tag 'pages_cms/select2.min'
+= javascript_include_tag  'pages_cms/wysihtml5x-toolbar'
+= javascript_include_tag  'pages_cms/advanced_and_extended'
+= javascript_include_tag  'pages_cms/select2.min'
+= stylesheet_link_tag     'pages_cms/select2.min'
 
 = form_for article, url: url, method: method do |f|
-  = f.text_field :title, placeholder: 'article title', class: 'form-control med'
-  = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'Choose a picture'}, class: 'form-control inline-form')
-  = f.text_field :tags, value: f.object.tags.join(','), placeholder: 'tags, comma separated', class: 'form-control inline-form'
+  = f.text_field :title, placeholder: 'article title', class: 'form-control med', 'data-parsley-minlength' => '1'
   <br />
-  = render 'pages_cms/admin/pages/editor', f: f
+  - if f.object.content?
+    - markdown = ''
+    - wysiwyg = 'active'
+  - elsif f.object.content_md?
+    - markdown = 'active'
+    - wysiwyg = ''
+  - else
+    - markdown = ''
+    - wysiwyg = 'active'
+
+  %div.row
+    %div.col-md-6
+      <br />
+      %ul.nav.nav-tabs{ role: 'tablist' }
+        %li{ role: 'presentation', class: markdown }
+          %a{ href: '#markdown', 'aria-controls' => 'markdown', role: 'tab', 'data-toggle' => 'tab' } Markdown Editor
+        %li{ role: 'presentation', class: wysiwyg }
+          %a{ href: '#wysiwyg', 'aria-controls' => 'wysiwyg', role: 'tab', 'data-toggle' => 'tab' } Wysiwyg Editor
+    %div.col-md-6
+      = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'Choose a picture'}, class: 'form-control')
+      = f.text_field :tags, value: f.object.tags.join(','), placeholder: 'tags, comma separated', class: 'form-control'
+  <br />
+  %div.tab-content
+    %div.tab-pane#markdown{ role: 'tabpanel', class: markdown }
+      <br />
+      = f.text_area :content_md, class: 'form-control', rows: 15
+    %div.tab-pane#wysiwyg{ role: 'tabpanel', class: wysiwyg }
+      = render 'pages_cms/admin/pages/editor', f: f
   = f.label :draft
   = f.check_box :draft, value: false
   = f.label :archived
@@ -16,3 +41,4 @@
   = f.submit 'Submit', class: 'btn btn-primary'
 
 
+

data/app/views/pages_cms/admin/articles/index.html.haml

@@ -1,6 +1,7 @@
-%div.container-fluid
-  %div
-    %p
+<br />
+= render 'pages_cms/admin/shared/tabs', active: 'Articles'
+
+%div.container-fluid.back
   %div.row
     %div.col-md-4
       = form_tag '#', method: :get do
@@ -11,21 +12,23 @@
         - @articles.each do |article|
           %div
             %h4.relative
-              = article.title
+              = link_to article.title, admin_articles_path(edit: article.id)
               %div.hard-right
                 = link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_article_path(article), method: :delete
                 = link_to raw('<span class="glyphicon glyphicon-pencil"></span>'), admin_articles_path(edit: article.id)
-                = link_to raw('<span class="glyphicon glyphicon-search"></span>'), admin_article_path(article)
+                = link_to raw('<span class="glyphicon glyphicon-search"></span>'), article_path(article)
             %span
-              %strong
-                = article.article_status
-              |
-              = article.created_at.strftime("%B %d %Y")
-              |
-              - article.tags.each do |tag|
-                = link_to tag, blog_path(current_site, tag)
+              %small
+                %strong
+                  = article.article_status
+                |
+                = article.created_at.strftime("%B %d %Y")
+                |
+                - article.tags.each do |tag|
+                  = link_to tag, blog_path(current_site, tag)
             %div.mess
-              = raw article.content
+              %small
+                = raw article.content_either
           %hr
     %div.col-md-8
       - if @article && @new
@@ -34,4 +37,4 @@
         = render 'form', article: @article, method: :patch, url: admin_article_path(@article)
       - else
         %h1 Click on an article to edit it here.
-      = link_to 'New Article', admin_articles_path(new: true), class: 'btn btn-default'
+      = link_to 'New Article', admin_articles_path(new: true), class: 'btn btn-xs btn-default'

data/app/views/pages_cms/admin/contacts/index.html.haml

@@ -1,4 +1,7 @@
-%div.container-fluid
+<br />
+= render 'pages_cms/admin/shared/tabs', active: 'Contacts'
+
+%div.container-fluid.back
   <br />
   %div.row
     %div.col-md-4
@@ -15,8 +18,9 @@
             |
             %span{ id: "date#{contact.id}" }
               = contact.created_at.strftime("%B %d %Y")
-            %div.mess{ id: "mess#{contact.id}" }
-              = raw insert_html_breaks(contact.message)
+            %small
+              %div.mess{ id: "mess#{contact.id}" }
+                = raw insert_html_breaks(contact.message)
           %hr
     %div.col-md-8
       %h5#name

data/app/views/pages_cms/admin/images/index.html.haml

@@ -1,5 +1,7 @@
-%div.container-fluid
-  %h1 Images
+<br />
+= render 'pages_cms/admin/shared/tabs', active: 'Images'
+
+%div.container-fluid.back
   %div.row
     %div.col-md-6
       %h4 Upload Image

data/app/views/pages_cms/admin/pages/_editor.html.haml

@@ -44,7 +44,7 @@
     %a{ data: { 'wysihtml5-dialog-action' => 'save' } } OK
     %a{ data: { 'wysihtml5-dialog-action' => 'cancel' } } Cancel
 
-= f.text_area :content, 'data-placeholder' => 'content', class: 'form-control', rows: 20, id: 'editor'
+= f.text_area :content, 'data-placeholder' => 'content', class: 'form-control', rows: 15, id: 'editor'
 
 :javascript
   var random = Math.floor((Math.random() * 10000) + 1);

data/app/views/pages_cms/admin/pages/_markdown_text_fields.html.haml

@@ -0,0 +1,7 @@
+.row
+.nested-fields
+  %hr
+  %h5
+    Markdown Box
+    = link_to_remove_association 'remove', f
+  = f.text_area :content, class: 'form-control', rows: 15

data/app/views/pages_cms/admin/pages/_page_block_fields.html.haml

@@ -1,28 +1,33 @@
-.nested-fields
-  %div.block
-    = f.text_field :name, placeholder: 'page block title (leave blank for no title)', class: 'form-control med'
-    = f.text_field :div_id, placeholder: 'division identifier (always fill out)', class: 'form-control'
-    = f.hidden_field :order, class: 'block-order'
-    %div
-      = f.fields_for :text_boxes do |text_box|
-        = render 'text_box_fields', f: text_box
-    %div
-      = f.fields_for :blog_feeds do |text_box|
-        = render 'blog_feed_fields', f: text_box
-    %div
-      = f.fields_for :contact_fields do |contact|
-        = render 'contact_field_fields', f: contact
-      %div.row
-        = f.fields_for :image_boxes do |text_box|
-          = render 'image_box_fields', f: text_box
-      %div.row
-        = f.fields_for :thumbnails do |thumbnail|
-          = render 'thumbnail_fields', f: thumbnail
-      %hr
-      = link_to_add_association 'Add Text Box', f, :text_boxes, class: 'btn btn-default btn-xs'
-      = link_to_add_association 'Add Thumbnail', f, :thumbnails, class: 'btn btn-default btn-xs'
-      = link_to_add_association 'Add Blog Feed', f, :blog_feeds, class: 'btn btn-default btn-xs'
-      = link_to_add_association 'Add Image Box', f, :image_boxes, class: 'btn btn-default btn-xs'
-      = link_to_add_association 'Add Contact Box', f, :contact_fields, class: 'btn btn-default btn-xs'
-    %div.right
-      = link_to_remove_association 'Remove Block', f
+%div.back.space
+  %div.nested-fields
+    %div.block
+      = f.text_field :name, placeholder: 'page block title (leave blank for no title)', class: 'form-control med'
+      = f.text_field :div_id, placeholder: 'division identifier (always fill out)', class: 'form-control'
+      = f.hidden_field :order, class: 'block-order'
+      %div
+        = f.fields_for :text_boxes do |text_box|
+          = render 'text_box_fields', f: text_box
+      %div
+        = f.fields_for :markdown_texts do |markdown|
+          = render 'markdown_text_fields', f: markdown
+      %div
+        = f.fields_for :blog_feeds do |text_box|
+          = render 'blog_feed_fields', f: text_box
+      %div
+        = f.fields_for :contact_fields do |contact|
+          = render 'contact_field_fields', f: contact
+        %div.row
+          = f.fields_for :image_boxes do |text_box|
+            = render 'image_box_fields', f: text_box
+        %div.row
+          = f.fields_for :thumbnails do |thumbnail|
+            = render 'thumbnail_fields', f: thumbnail
+        %hr
+        = link_to_add_association 'Add Text Box',     f, :text_boxes,     class: 'btn btn-default btn-xs'
+        = link_to_add_association 'Add Markdown Box', f, :markdown_texts, class: 'btn btn-default btn-xs'
+        = link_to_add_association 'Add Thumbnail',    f, :thumbnails,     class: 'btn btn-default btn-xs'
+        = link_to_add_association 'Add Blog Feed',    f, :blog_feeds,     class: 'btn btn-default btn-xs'
+        = link_to_add_association 'Add Image Box',    f, :image_boxes,    class: 'btn btn-default btn-xs'
+        = link_to_add_association 'Add Contact Box',  f, :contact_fields, class: 'btn btn-default btn-xs'
+      %div.right
+        = link_to_remove_association 'Remove Block', f

data/app/views/pages_cms/admin/pages/_slider_fields.html.haml

@@ -1,10 +1,12 @@
 .nested-fields
-  %h5
-    Content Slider
-    = link_to_remove_association 'remove', f
-  = f.select(:link, PagesCms::Page.all.collect {|p| [p.title, p.slug] } << f.object.link, {include_blank: 'Choose a link'}, class: 'form-control select2')
-  = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'choose an image'}, class: 'form-control')
-  = f.text_field :header, placeholder: 'overlayed header', class: 'form-control'
-  = f.number_field :order, placeholder: 'display order', class: 'form-control'
+  %div.back
+    %h5
+      Content Slider
+      = link_to_remove_association 'remove', f
+    = f.select(:link, PagesCms::Page.all.collect {|p| [p.title, p.slug] } << f.object.link, {include_blank: 'Choose a link'}, class: 'form-control select2')
+    = f.select(:image_id, PagesCms::Image.all.collect {|p| [p.name, p.id] }, {include_blank: 'choose an image'}, class: 'form-control')
+    = f.text_field :header, placeholder: 'overlayed header', class: 'form-control'
+    = f.text_field :subheading, placeholder: 'subheading', class: 'form-control'
+    = f.number_field :order, placeholder: 'display order', class: 'form-control'
 
 = render 'select_js'