pulitzer 0.3.9 → 0.4.0

data/app/models/pulitzer/version.rb

@@ -3,13 +3,14 @@ module Pulitzer
     include ForeignOffice::Broadcaster if defined? ForeignOffice
     enum status: [ :preview, :active, :archived, :abandoned, :processing, :processing_failed ]
     has_many :content_elements, dependent: :destroy
+    has_many :free_form_sections, dependent: :destroy
     has_many :post_tags, dependent: :destroy
     belongs_to :post
     scope :tagged_with_type, ->(label_type){includes(:post_tags).where(pulitzer_post_tags: {label_type: label_type}).references(:pulitzer_post_tags)}
     scope :tagged_with_label, ->(label){includes(:post_tags).where(pulitzer_post_tags:{label_type: label.class.name, label_id: label.id}).references(:pulitzer_post_tags)}
     attr_accessor :processed_element_count
 
-    delegate :allow_free_form?, :title, :slug, to: :post
+    delegate :has_free_form_sections?, :has_templated_content_elements?, :title, :slug, :active_version, to: :post
 
     validates :post_id, :status, presence: true
 
@@ -29,6 +30,10 @@ module Pulitzer
       self.content_elements.find_by(label: label)
     end
 
+    def section(name)
+      self.free_form_sections.find_by(name: name)
+    end
+
     def template_content_elements
       content_elements.template
     end
@@ -37,6 +42,10 @@ module Pulitzer
       content_elements.free_form
     end
 
+    def total_processing_elements
+      active_version.content_elements.count + active_version.post_tags.count + active_version.free_form_sections.count + 2
+    end
+
     def serialize
       self.attributes.merge \
         processed_element_count: self.processed_element_count

data/app/views/pulitzer/content_elements/_form.html.erb

@@ -1,5 +1,5 @@
 <% if content_element.template? %>
-  <h3><%= content_element.label %></h3>
+  <h5><%= content_element.label %></h5>
 <% end %>
 <%= form_for content_element, html: ajax_form_hash(dom_target(content_element)), multipart: true,
   data: { server_endpoint: content_element_path(content_element) } do |f| %>

data/app/views/pulitzer/content_elements/_index.html.erb

@@ -1,20 +1,5 @@
-<h2>Template content elements</h2>
+<h2>Page content elements</h2>
 
 <% version.template_content_elements.each do |content_element| %>
   <%= render partial: '/pulitzer/content_elements/show_wrapper', locals: { content_element: content_element } %>
 <% end %>
-
-<% if version.allow_free_form? %>
-  <div id="<%= dom_id version, :free_form_elements %>">
-    <h2>Free form content elements</h2>
-    <div class="pulitzer-row margin-bottom list-item">
-      <%= ajax_link "add a new content element for #{version.title}", new_content_element_path(version_id: version), {}, "#new_free_form_content_element_#{dom_id(version)}" %>
-      <div id="<%= dom_id(version, :new_free_form_content_element) %>"></div>
-    </div>
-    <div class="pulitzer-row margin-bottom list-item" id="<%= dom_id(version, :free_form_content_element_container) %>" id="content_element_list" data-sorter href="<%= update_all_content_elements_path %>">
-      <% version.free_form_content_elements.each do |content_element| %>
-        <%= render partial: '/pulitzer/content_elements/show_wrapper', locals: { content_element: content_element } %>
-      <% end %>
-    </div>
-  </div>
-<% end %>

data/app/views/pulitzer/content_elements/_partial_index.html.erb

@@ -0,0 +1,5 @@
+<div class="pulitzer-row margin-left">
+  <% partial.content_elements.each do |content_element| %>
+    <%= render partial: '/pulitzer/content_elements/show_wrapper', locals: { content_element: content_element } %>
+  <% end %>
+</div>

data/app/views/pulitzer/content_elements/_show.html.erb

@@ -8,7 +8,7 @@
 <div class="pulitzer-row">
   <ul class="list">
     <% if content_element.template? %>
-      <li><h3><%= content_element.label %></h3></li>
+      <li><h5><%= content_element.label %></h5></li>
     <% end %>
     <li><%= render_element(content_element) %></li>
     <li><%= ajax_link "Edit", edit_content_element_path(content_element), {}, dom_target(content_element) %></li>

data/app/views/pulitzer/free_form_section_types/_form.html.erb

@@ -0,0 +1,8 @@
+<%= render 'pulitzer/shared/error_messages', object: ffst %>
+<%= form_for ffst, html: ajax_form_hash(dom_target(ffst)) do |f| %>
+  <%= render partial: 'form_fields', locals: { f: f, ffst: ffst } %>
+  <%= f.submit "Update" %>
+  <%= link_to('Cancel', free_form_section_type_path(ffst), :class => 'button',
+    data: { ajax_link: true, ajax_target: dom_target(ffst) } ) %>
+<% end %>
+

data/app/views/pulitzer/free_form_section_types/_form_fields.html.erb

@@ -0,0 +1,2 @@
+<%= f.label :name %>
+<%= f.text_field :name %>

data/app/views/pulitzer/free_form_section_types/_new.html.erb

@@ -0,0 +1,7 @@
+<%= form_for ffst, html: ajax_form_hash("#free_form_section_types_container_#{dom_id(ffst.post_type)}", insert_method: 'append', empty_on_success: dom_target(ffst.post_type, :new_free_form_section_type)) do |f| %>
+  <%= f.hidden_field :post_type_id %>
+  <%= render partial: 'form_fields', locals: { f: f, ffst: ffst } %>
+  <%= f.submit "Create" %>
+  <%= link_to('Cancel', '#', :class => 'button',
+    data: { emptier: true, target: "#new_free_form_section_type_#{dom_id(ffst.post_type)}" } ) %>
+<% end %>

data/app/views/pulitzer/free_form_section_types/_show.html.erb

@@ -0,0 +1,9 @@
+<ul class="inline-list">
+  <li><%= ffst.name %></li>
+  <li>
+    <%= ajax_link "Edit", edit_free_form_section_type_path(ffst), {}, dom_target(ffst) %>
+  </li>
+  <li>
+    <%= ajax_delete 'Delete', free_form_section_type_path(ffst), {}, dom_target(ffst) %>
+  </li>
+</ul>

data/app/views/pulitzer/free_form_section_types/_show_wrapper.html.erb

@@ -0,0 +1,3 @@
+<li id="<%= dom_id(ffst) %>">
+  <%= render partial: '/pulitzer/free_form_section_types/show', locals: {ffst: ffst} %>
+</li>

data/app/views/pulitzer/free_form_sections/_index.html.erb

@@ -0,0 +1,3 @@
+<% version.free_form_sections.each do |ffs| %>
+  <%= render partial: '/pulitzer/free_form_sections/show_wrapper', locals: {ffs: ffs} %>
+<% end %>

data/app/views/pulitzer/free_form_sections/_show.html.erb

@@ -0,0 +1,2 @@
+<h3><%= ffs.name %></h3>
+<%= render partial: '/pulitzer/partials/index', locals: {free_form_section: ffs} %>

data/app/views/pulitzer/free_form_sections/_show_wrapper.html.erb

@@ -0,0 +1,3 @@
+<div class="pulitzer-row" id="<%= dom_id(ffs) %>">
+  <%= render partial: '/pulitzer/free_form_sections/show', locals: {ffs: ffs} %>
+</div>

data/app/views/pulitzer/layouts/_form.html.erb

@@ -0,0 +1,8 @@
+<%= render 'pulitzer/shared/error_messages', object: layout %>
+<%= form_for layout, html: ajax_form_hash(dom_target(layout)) do |f| %>
+  <%= render partial: 'form_fields', locals: { f: f, layout: layout } %>
+  <%= f.submit "Update" %>
+  <%= link_to('Cancel', layout_path(layout), :class => 'button',
+    data: { ajax_link: true, ajax_target: dom_target(layout) } ) %>
+<% end %>
+

data/app/views/pulitzer/layouts/_form_fields.html.erb

@@ -0,0 +1,2 @@
+<%= f.label :name %>
+<%= f.text_field :name %>

data/app/views/pulitzer/layouts/_new.html.erb

@@ -0,0 +1,7 @@
+<%= form_for layout, html: ajax_form_hash(dom_target(layout.post_type, :layouts_container), insert_method: 'append', empty_on_success: dom_target(layout.post_type, :new_layout)) do |f| %>
+  <%= f.hidden_field :post_type_id %>
+  <%= render partial: 'form_fields', locals: { f: f, layout: layout } %>
+  <%= f.submit "Create" %>
+  <%= link_to('Cancel', '#', :class => 'button',
+    data: { emptier: true, target: dom_target(layout.post_type, :new_layout) } ) %>
+<% end %>

data/app/views/pulitzer/layouts/_show.html.erb

@@ -0,0 +1,9 @@
+<ul class="inline-list">
+  <li><%= layout.name %></li>
+  <li>
+    <%= ajax_link "Edit", edit_layout_path(layout), {}, dom_target(layout) %>
+  </li>
+  <li>
+    <%= ajax_delete 'Delete', layout_path(layout), {}, dom_target(layout) %>
+  </li>
+</ul>

data/app/views/pulitzer/layouts/_show_wrapper.html.erb

@@ -0,0 +1,3 @@
+<li id="<%= dom_id(layout) %>">
+  <%= render partial: '/pulitzer/layouts/show', locals: {layout: layout} %>
+</li>

data/app/views/pulitzer/partials/_fields.html.erb

@@ -0,0 +1,2 @@
+<%= f.collection_select :post_type_id, Pulitzer::PostType.partials, :id, :name, {}, {} %>
+<%= f.collection_select :layout_id, f.object.available_layouts, :id, :name, {}, {} %>

data/app/views/pulitzer/partials/_form.html.erb

@@ -0,0 +1,11 @@
+<h3><%= partial.name %></h3>
+<%= render 'pulitzer/shared/error_messages', object: partial %>
+<%= form_for partial, html: ajax_form_hash(dom_target(partial)), multipart: true,
+  data: { server_endpoint: partial_path(partial) } do |f| %>
+  <%= f.collection_select :layout_id, partial.available_layouts, :id, :name, {}, {} %>
+  <%= submit_tag "Update" %>
+  <%= link_to('Cancel', partial_path(partial), :class => 'button',
+    data: { ajax_link: true, ajax_target: dom_target(partial) } ) %>
+    or
+  <%= ajax_delete 'delete', partial_path(partial), {class: 'button'}, dom_target(partial) %>
+<% end %>

data/app/views/pulitzer/partials/_index.html.erb

@@ -0,0 +1,12 @@
+<div id="<%= dom_id free_form_section, :partial_container %>">
+  <% free_form_section.partials.each do |partial| %>
+    <%= render partial: '/pulitzer/partials/show_wrapper', locals: { partial: partial } %>
+  <% end %>
+</div>
+
+<div id="<%= dom_id free_form_section, :partials %>">
+  <div class="pulitzer-row margin-bottom list-item">
+    <%= ajax_link "add a new partial for #{free_form_section.name}", new_partial_path(partial: {free_form_section_id: free_form_section}), {}, dom_target(free_form_section, :new_partial) %>
+    <div id="<%= dom_id(free_form_section, :new_partial) %>"></div>
+  </div>
+</div>

data/app/views/pulitzer/partials/_new.html.erb

@@ -0,0 +1,16 @@
+<%= render 'pulitzer/shared/error_messages', object: partial %>
+<%= form_for partial, html: ajax_form_hash(dom_target(partial.free_form_section, :partial_container), insert_method: 'append', empty_on_success: dom_target(partial.free_form_section, :new_partial)) do |f| %>
+  <%= f.hidden_field :free_form_section_id %>
+  <%= f.collection_select :post_type_id, Pulitzer::PostType.partials, :id, :name, {}, revealer(dom_id(partial.free_form_section, :new_partial_type), highlander: true) %>
+  <div <%= revealer_target_attrs(dom_id(partial.free_form_section, :new_partial_type)) %>>
+    <% Pulitzer::PostType.partials.each do |post_type| %>
+      <div <%= revealer_option_attrs(dom_id(partial.free_form_section, :new_partial_type), trigger: post_type.id) %>>
+        <%= f.collection_select :layout_id, post_type.layouts, :id, :name, {}, {} %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= submit_tag "Create" %>
+  <%= link_to('Cancel', '#', :class => 'button',
+    data: { emptier: true, target: dom_target(partial.free_form_section, :new_partial) } ) %>
+<% end %>

data/app/views/pulitzer/partials/_show.html.erb

@@ -0,0 +1,7 @@
+<div class="pulitzer-row">
+  <div class="pulitzer-span"><h5><%= partial.folder_path %>/</h5></div>
+  <div class="pulitzer-span margin match-h5"><%= partial.template_path %></div>
+  <div class="pulitzer-span match-h5"><%= ajax_link 'edit', edit_partial_path(partial), {}, dom_target(partial) %></div>
+</div>
+
+<%= render partial: '/pulitzer/content_elements/partial_index', locals: {partial: partial} %>

data/app/views/pulitzer/partials/_show_wrapper.html.erb

@@ -0,0 +1,3 @@
+<div class="pulitzer-row margin-bottom list-item" id="<%= dom_id(partial) %>">
+  <%= render partial: '/pulitzer/partials/show', locals: { partial: partial } %>
+</div>

data/app/views/pulitzer/post_type_content_element_types/_form_fields.html.erb

@@ -2,19 +2,19 @@
 <%= f.text_field :label %>
 <%= f.label :content_element_type_id, "Type" %>
 <%= f.collection_select :content_element_type_id, Pulitzer::ContentElementType.all, :id, :name, {},
-{ data: { "revealer" => true, "sub-type" => "FormFieldRevealer", "revealer-children-id" => dom_id(ptcet, :revealer) }} %>
+revealer(dom_id(ptcet, :revealer), highlander: true) %>
 <%= f.hidden_field :post_type_id %>
 
-<div data-revealer-target="<%= dom_id(ptcet, :revealer) %>"></div>
+<div <%= revealer_target_attrs(dom_id(ptcet, :revealer)) %>></div>
 
-<div data-revealer_id="<%= dom_id(ptcet, :revealer) %>" data-revealer-triggers="['<%= Pulitzer::ContentElementType.find_by(name: 'Image').id %>']">
+<div <%= revealer_option_attrs(dom_id(ptcet, :revealer), trigger: Pulitzer::ContentElementType.find_by(name: 'Image').id) %> >
   <%= f.label :height %>
   <%= f.text_field :height, placeholder: 'Height' %>
   <%= f.label :width %>
   <%= f.text_field :width, placeholder: 'Width' %>
 </div>
 
-<div data-revealer_id="<%= dom_id(ptcet, :revealer) %>" data-revealer-triggers="['<%= Pulitzer::ContentElementType.find_by(name: 'Text').id %>']">
+<div <%= revealer_option_attrs(dom_id(ptcet, :revealer), trigger: Pulitzer::ContentElementType.find_by(name: 'Text').id) %> >
   <%= f.label :text_editor, "Text editor" %>
   <%= f.select :text_editor, Pulitzer.text_editor_toolbars.map { |t| t[:name] } %>
 </div>

data/app/views/pulitzer/post_types/_form.html.erb

@@ -1,7 +1,7 @@
+<%= render 'pulitzer/shared/error_messages', object: post_type %>
 <%= form_for post_type, html: ajax_form_hash(dom_target(post_type)) do |f| %>
   <%= render partial: 'form_fields', locals: { f: f } %>
   <%= f.submit "Update" %>
   <%= link_to('Cancel', post_type_path(post_type), :class => 'button',
     data: { ajax_link: true, ajax_target: dom_target(post_type) } ) %>
 <% end %>
-<%= render 'pulitzer/shared/error_messages', object: post_type %>

data/app/views/pulitzer/post_types/_form_fields.html.erb

@@ -1,5 +1,12 @@
 <%= f.label :name %>
 <%= f.text_field :name %>
-<%= f.label :plural %>
-<%= f.check_box :plural %>
-<%= f.select :kind, Pulitzer::PostType.kinds.keys.map { |m| [m.humanize, m] } %>
+<div <%= revealer_target_attrs(dom_id(f.object, :kind)) %>>
+  <div <%= revealer_option_attrs(dom_id(f.object, :kind), trigger: 'template') %>>
+    <%= f.label :plural %>
+    <%= f.check_box :plural %>
+  </div>
+  <div <%= revealer_option_attrs(dom_id(f.object, :kind), trigger: 'partial') %>>
+    <%= f.hidden_field :plural, value: true %>
+  </div>
+</div>
+<%= f.select :kind, Pulitzer::PostType.kinds.keys.map { |m| [m.humanize, m] }, {}, revealer(dom_id(f.object, :kind), highlander: true) %>

data/app/views/pulitzer/post_types/_show.html.erb

@@ -1,12 +1,12 @@
 <div class="pulitzer-row">
   <ul class="inline-list">
     <li><%= post_type.name %></li>
-    <li><%= link_to_posts(post_type, 'Index', 'Manage') %></li>
-    <% if post_type.allow_template? %>
-      <li <%= expander("post_type_content_element_types_#{dom_id(post_type)}") %>>
-        <%= link_to "Template", '#', class: 'toggle-post-type-content-elements', data: { post_types: post_type.id } %>
-      </li>
+    <% unless post_type.partial? %>
+      <li><%= link_to_posts(post_type, 'Index', 'Manage') %></li>
     <% end %>
+    <li <%= expander("post_type_content_element_types_#{dom_id(post_type)}") %>>
+      <%= link_to "Template", '#', class: 'toggle-post-type-content-elements', data: { post_types: post_type.id } %>
+    </li>
     <li>
       <% if Pulitzer.skip_metadata_auth? || self.instance_eval(&Pulitzer.metadata_closure) %>
         <%= ajax_link "Details", edit_post_type_path(post_type), {}, dom_target(post_type) %>
@@ -21,7 +21,8 @@
     <% end %>
   </ul>
 
-  <div <%= collapsed("post_type_content_element_types_#{dom_id(post_type)}") %> style='display:none'>
+  <div <%= collapsed("post_type_content_element_types_#{dom_id(post_type)}") %> class="pulitzer-hidden pulitzer-indent" >
+    <h5>Content Elements</h5>
     <div id="post_type_content_element_types_container_<%= dom_id(post_type) %>">
       <% post_type.post_type_content_element_types.each do |ptcet| %>
         <%= render partial: '/pulitzer/post_type_content_element_types/show_wrapper', locals: {ptcet: ptcet} %>
@@ -29,5 +30,25 @@
     </div>
     <%= ajax_link 'add a new content element for ' + post_type.name, new_post_type_content_element_type_path(post_type_id: post_type.id), {}, "#new_post_type_content_element_type_#{dom_id(post_type)}" %>
     <div id="new_post_type_content_element_type_<%= dom_id(post_type) %>"></div>
+
+    <h5>Free Form Sections</h5>
+    <div id="<%= dom_id(post_type, :free_form_section_types_container) %>">
+      <% post_type.free_form_section_types.each do |ffst| %>
+        <%= render partial: '/pulitzer/free_form_section_types/show_wrapper', locals: {ffst: ffst} %>
+      <% end %>
+    </div>
+    <%= ajax_link 'add a new section for ' + post_type.name, new_free_form_section_type_path(post_type_id: post_type.id), {}, dom_target(post_type, :new_free_form_section_type) %>
+    <div id="<%= dom_id(post_type, :new_free_form_section_type) %>"></div>
+
+    <% if post_type.partial? %>
+      <h5>Layouts</h5>
+      <div id="<%= dom_id(post_type, :layouts_container) %>">
+        <% post_type.layouts.each do |layout| %>
+          <%= render partial: '/pulitzer/layouts/show_wrapper', locals: {layout: layout} %>
+        <% end %>
+      </div>
+      <%= ajax_link 'add a new layout for ' + post_type.name, new_layout_path(layout: {post_type_id: post_type.id}), {}, dom_target(post_type, :new_layout) %>
+      <div id="<%= dom_id(post_type, :new_layout) %>"></div>
+    <% end %>
   </div>
 </div>

data/app/views/pulitzer/versions/_edit.html.erb

@@ -10,7 +10,7 @@
 <% elsif version.processing? %>
   <h2> Processing Preview for <%= version.title %> </h2>
   <div class="pulitzer-row">
-    <progress value="0" max="<%= version.post.active_version.content_elements.count + version.post.active_version.post_tags.count + 2 %>" <%= listener_attrs version, :processed_element_count if defined? ForeignOffice %>></progress>
+    <progress value="0" max="<%= version.total_processing_elements %>" <%= listener_attrs version, :processed_element_count if defined? ForeignOffice %>></progress>
   </div>
   <a <%= listener_attrs version.post, :new_preview_version, trigger: true if defined? ForeignOffice %>
      <%= ajax_link_attrs(dom_target(version.post, :preview_version)) %> > </a>
@@ -23,10 +23,16 @@
       <%= render partial: 'pulitzer/post_tags/show_wrapper', locals: { version: version, tag_model: tag_model } %>
     <% end %>
   </div>
-
-  <div class="pulitzer-row margin-bottom list-item">
-    <%= render partial: '/pulitzer/content_elements/index', locals: {version: version} %>
-  </div>
+  <% if version.has_templated_content_elements? %>
+    <div class="pulitzer-row margin-bottom list-item">
+      <%= render partial: '/pulitzer/content_elements/index', locals: {version: version} %>
+    </div>
+  <% end %>
+  <% if version.has_free_form_sections? %>
+    <div class="pulitzer-row margin-bottom list-item">
+      <%= render partial: '/pulitzer/free_form_sections/index', locals: {version: version} %>
+    </div>
+  <% end %>
 
   <div class="pulitzer-row">
     <%= render partial: 'pulitzer/versions/form', locals: { version: version } %>

data/config/routes.rb

@@ -7,7 +7,8 @@ Pulitzer::Engine.routes.draw do
   resources :content_elements
   resources :post_tags
 
-  resources :content_elements do
+  resources :content_elements
+  resources :partials do
     collection do
       patch :update_all
     end
@@ -16,5 +17,8 @@ Pulitzer::Engine.routes.draw do
   resources :versions
   resources :content_element_types
   resources :post_type_content_element_types
+  resources :free_form_section_types
+  resources :layouts
+  resources :free_form_sections
   root to: 'post_types#index'
 end

data/db/migrate/20160511192041_create_partials.rb

@@ -0,0 +1,9 @@
+class CreatePartials < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_partials do |t|
+      t.integer :post_type_id
+      t.integer :free_form_section_id
+      t.integer :sort_order
+    end
+  end
+end

data/db/migrate/20160512214545_add_partial_to_content_element.rb

@@ -0,0 +1,5 @@
+class AddPartialToContentElement < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_content_elements, :partial_id, :integer
+  end
+end

data/db/migrate/20160513153209_create_free_form_section_type.rb

@@ -0,0 +1,8 @@
+class CreateFreeFormSectionType < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_free_form_section_types do |t|
+      t.integer :post_type_id
+      t.string :name
+    end
+  end
+end

data/db/migrate/20160513153214_create_free_form_section.rb

@@ -0,0 +1,9 @@
+class CreateFreeFormSection < ActiveRecord::Migration
+  def change
+    create_table :pulitzer_free_form_sections do |t|
+      t.integer :version_id
+      t.integer :free_form_section_type_id
+      t.string :name
+    end
+  end
+end

data/db/migrate/20160516150237_fix_post_type_kinds.rb

@@ -0,0 +1,7 @@
+class FixPostTypeKinds < ActiveRecord::Migration
+  def change
+    Pulitzer::PostType.where(kind: [1,2]).each do |pt|
+      pt.update_columns(kind: 0)
+    end
+  end
+end