pulitzer 0.12.5 → 0.13.0

data/app/controllers/pulitzer/tags_controller.rb

@@ -1,6 +1,6 @@
 module Pulitzer
   class TagsController < ApplicationController
-    before_filter :get_tag, only: [:edit, :update, :destroy]
+    before_action :get_tag, only: [:edit, :update, :destroy]
 
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
 
@@ -43,7 +43,7 @@ module Pulitzer
 
     def destroy
       @tag.destroy
-      render nothing: true
+      head :ok
     end
 
     protected
@@ -54,7 +54,7 @@ module Pulitzer
 
     def render_not_found(e)
       Rails.logger.warn("Rendering 404 because #{e.inspect}")
-      render nothing: true, status: :not_found
+      head :ok, status: :not_found
     end
 
     def tag_params

data/app/interactions/pulitzer/update_post_type_content_elements.rb

@@ -23,7 +23,7 @@ class Pulitzer::UpdatePostTypeContentElements
         # if there is no preview version, skip this one.
       end
     end
-    post_type.partials.each do |partial|
+    post_type.partials.joins(free_form_section: :version).where(pulitzer_versions: {status: 0}).each do |partial|
       partial.content_elements.where(label: old_label).each do |content_element|
         content_element.update(label: ptcet.label,
           height: ptcet.height,

data/app/models/pulitzer/arrangement_style.rb

@@ -0,0 +1,8 @@
+module Pulitzer
+  class ArrangementStyle < ActiveRecord::Base
+    belongs_to :post_type
+    has_many :partials
+    validates :display_name, presence: true
+    validates :view_file_name, presence: true
+  end
+end

data/app/models/pulitzer/background_style.rb

@@ -0,0 +1,8 @@
+module Pulitzer
+  class BackgroundStyle < ActiveRecord::Base
+    belongs_to :post_type
+    has_many :partials
+    validates :display_name, presence: true
+    validates :css_class_name, presence: true
+  end
+end

data/app/models/pulitzer/content_element.rb

@@ -47,6 +47,10 @@ module Pulitzer
       image_type? ? !image? : body.blank?
     end
 
+    def has_content?
+      image_type? ? image? : body.present?
+    end
+
     def clone_me
       clone_attrs = self.attributes.dup
       clone_attrs.delete 'id'

data/app/models/pulitzer/free_form_section_type.rb

@@ -4,7 +4,11 @@ module Pulitzer
 
     belongs_to :post_type
     has_many :free_form_sections
-    has_many :partial_types
+    has_many :partial_types, -> { order :id }
+
+    def first_partial_type
+      partial_types.first
+    end
 
   end
 end

data/app/models/pulitzer/justification_style.rb

@@ -0,0 +1,8 @@
+module Pulitzer
+  class JustificationStyle < ActiveRecord::Base
+    belongs_to :post_type
+    has_many :partials
+    validates :display_name, presence: true
+    validates :css_class_name, presence: true
+  end
+end

data/app/models/pulitzer/partial.rb

@@ -2,12 +2,14 @@ module Pulitzer
   class Partial < ActiveRecord::Base
     belongs_to :free_form_section
     belongs_to :post_type
-    belongs_to :layout
+    belongs_to :background_style
+    belongs_to :justification_style
+    belongs_to :sequence_flow_style
+    belongs_to :arrangement_style
     
     has_many :content_elements, dependent: :destroy
 
-    delegate :name, :post_type_content_element_types, :has_display?, to: :post_type
-    delegate :template_path, to: :layout, allow_nil: true
+    delegate :name, :post_type_content_element_types, to: :post_type
 
     before_save :handle_sort_order
 
@@ -15,20 +17,52 @@ module Pulitzer
       self.content_elements.find_by(label: label)
     end
 
+    def background_css_class
+      background_style&.css_class_name
+    end
+
+    def justification_css_class
+      justification_style&.css_class_name
+    end
+
+    def sequence_flow_css_class
+      sequence_flow_style&.css_class_name
+    end
+
     def handle_sort_order
       if new_record? && sort_order.nil?
         self.sort_order = free_form_section.partials.maximum(:sort_order).to_i + 1
       end
     end
 
-    def available_layouts
-      post_type.layouts
+    def available_backgrounds
+      post_type.background_styles
+    end
+
+    def available_justifications
+      post_type.justification_styles
+    end
+
+    def available_sequence_flows
+      post_type.sequence_flow_styles
+    end
+
+    def available_arrangements
+      post_type.arrangement_styles
     end
 
     def folder_path
       name.downcase.gsub(/ /,'_').gsub(/\W/,'')      
     end
 
+    def template_path
+      if arrangement_style.present?
+        arrangement_style.view_file_name
+      else
+        'default'
+      end
+    end
+
     def full_view_path
       Pulitzer.partial_folder + '/' + folder_path + '/' + template_path
     end

data/app/models/pulitzer/partial_type.rb

@@ -2,17 +2,9 @@ module Pulitzer
   class PartialType < ActiveRecord::Base
     belongs_to :free_form_section_type
     belongs_to :post_type
-    belongs_to :layout
 
-    delegate :template_path, to: :layout, allow_nil: true
-
-
-    def folder_path
-      label.downcase.gsub(/ /,'_').gsub(/\W/,'')
-    end
-
-    def available_layouts
-      post_type.layouts
+    def first?
+      free_form_section_type.first_partial_type.id == id
     end
   end
 end

data/app/models/pulitzer/post.rb

@@ -3,7 +3,7 @@ module Pulitzer
     include ForeignOffice::Broadcaster if defined? ForeignOffice
     extend ::FriendlyId
     has_many :versions, dependent: :destroy
-    has_one :active_version, -> { active }, class_name: "Pulitzer::Version"
+    has_one :active_version, -> { where(status: 'active') }, class_name: "Pulitzer::Version"
 
     belongs_to :post_type
     delegate :post_type_content_element_types, :free_form_section_types, :has_free_form_sections?, :has_templated_content_elements?, to: :post_type

data/app/models/pulitzer/post_type.rb

@@ -5,7 +5,10 @@ class Pulitzer::PostType < ActiveRecord::Base
   has_many :post_type_content_element_types, dependent: :destroy
   has_many :content_element_types, through: :post_type_content_element_types
   has_many :free_form_section_types, dependent: :destroy
-  has_many :layouts, dependent: :destroy
+  has_many :background_styles, dependent: :destroy
+  has_many :justification_styles, dependent: :destroy
+  has_many :sequence_flow_styles, dependent: :destroy
+  has_many :arrangement_styles, dependent: :destroy
 
   scope :templates, -> { where(kind: Pulitzer::PostType.kinds[:template])}
   scope :partials, -> { where(kind: Pulitzer::PostType.kinds[:partial])}
@@ -28,10 +31,6 @@ class Pulitzer::PostType < ActiveRecord::Base
     !plural
   end
 
-  def has_display?
-    layouts.any?
-  end
-
   def has_templated_content_elements?
     content_element_types.any?
   end

data/app/models/pulitzer/post_type_content_element_type.rb

@@ -9,9 +9,28 @@ module Pulitzer
 
     delegate :type, :image_type?, to: :content_element_type
 
-    default_scope { order(id: :asc) }
+    default_scope { order(sort_order: :asc) }
 
     validates :label, presence: true
 
+    def type_specific_display
+      case type
+      when :image
+        "#{height}x#{width}"
+      when :text
+        text_editor_display
+      else
+        ''
+      end
+    end
+
+    def text_editor_display
+      case text_editor
+      when 'None'
+        'no editor'
+      else
+        text_editor
+      end
+    end
   end
 end

data/app/models/pulitzer/sequence_flow_style.rb

@@ -0,0 +1,8 @@
+module Pulitzer
+  class SequenceFlowStyle < ActiveRecord::Base
+    belongs_to :post_type
+    has_many :partials
+    validates :display_name, presence: true
+    validates :css_class_name, presence: true
+  end
+end

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

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

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

@@ -0,0 +1,6 @@
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :display_name %>
+</div>
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :view_file_name %>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="pulitzer-row">
+  <%= form_for arrangement_style, html: ajax_form_hash(dom_target(arrangement_style.post_type, :arrangement_styles_container), insert_method: 'append', reset_on_success: true) do |f| %>
+    <%= f.hidden_field :post_type_id %>
+    <%= render partial: 'form_fields', locals: { f: f, arrangement_style: arrangement_style } %>
+    <div class="pulitzer-span ten-percent">
+      <%= f.submit "Create", data: {disable_with: false} %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <a class="button" data-emptier="true" data-target="<%= dom_target(arrangement_style.post_type, :new_arrangement_style)%>">Close</a>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,10 @@
+<div class="pulitzer-row">
+  <div class="pulitzer-span one-fifth"><%= arrangement_style.display_name %></div>
+  <div class="pulitzer-span one-fifth"><%= arrangement_style.view_file_name %></div>
+  <div class="pulitzer-span ten-percent">
+    <%= ajax_link "Edit", edit_arrangement_style_path(arrangement_style), {}, dom_target(arrangement_style) %>
+  </div>
+  <div class="pulitzer-span ten-percent">
+    <%= ajax_delete 'Delete', arrangement_style_path(arrangement_style), {}, dom_target(arrangement_style) %>
+  </div>
+</div>

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

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

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

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

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

@@ -0,0 +1,6 @@
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :display_name %>
+</div>
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :css_class_name %>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="pulitzer-rowe">
+  <%= form_for background_style, html: ajax_form_hash(dom_target(background_style.post_type, :background_styles_container), insert_method: 'append', reset_on_success: true) do |f| %>
+    <%= f.hidden_field :post_type_id %>
+    <%= render partial: 'form_fields', locals: { f: f, background_style: background_style } %>
+    <div class="pulitzer-span ten-percent">
+      <%= f.submit "Create", data: {disable_with: false} %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <a class="button" data-emptier="true" data-target="<%= dom_target(background_style.post_type, :new_background_style)%>">Close</a>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,10 @@
+<div class="pulitzer-row">
+  <div class="pulitzer-span one-fifth"><%= background_style.display_name %></div>
+  <div class="pulitzer-span one-fifth"><%= background_style.css_class_name %></div>
+  <div class="pulitzer-span ten-percent">
+    <%= ajax_link "Edit", edit_background_style_path(background_style), {}, dom_target(background_style) %>
+  </div>
+  <div class="pulitzer-span ten-percenth">
+    <%= ajax_delete 'Delete', background_style_path(background_style), {}, dom_target(background_style) %>
+  </div>
+</div>

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

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

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

@@ -1,8 +1,17 @@
-<%= 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 %>
+<div class="pulitzer-row">
+  <%= 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 } %>
+    <div class="pulitzer-span ten-percent">
+      <%= f.submit "Update" %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <%= link_to('Cancel', free_form_section_type_path(ffst), :class => 'button',
+        data: { ajax_link: true, ajax_target: dom_target(ffst) } ) %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <%= ajax_delete 'Delete', free_form_section_type_path(ffst), {}, dom_target(ffst) %>
+    </div>
+  <% end %>
 
+</div>

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

@@ -1,4 +1,6 @@
-<%= f.label :name %>
-<%= f.text_field :name %>
-<%= f.label :sort_order %>
-<%= f.text_field :sort_order %>
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :name %>
+</div>
+<div class="pulitzer-span one-fifth">
+  <%= f.text_field :sort_order %>
+</div>

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

@@ -1,7 +1,12 @@
-<%= 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 %>
+<div class="pulitzer-row">
+  <%= 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 } %>
+    <div class="pulitzer-span ten-percent">
+      <%= f.submit "Create", data: {disable_with: false} %>
+    </div>
+    <div class="pulitzer-span ten-percent">
+      <a class="button" data-emptier="true" data-target="#new_free_form_section_type_<%= dom_id(ffst.post_type) %>">Close</a>
+    </div>
+  <% end %>
+</div>

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

@@ -1,13 +1,11 @@
-<ul class="inline-list">
-  <li><%= ffst.name %></li>
-  <li>
+<div class="pulitzer-row">
+  <div class="pulitzer-span one-fifth"><%= ffst.name %></div>
+  <div class="pulitzer-span one-fifth"><%= ffst.sort_order %></div>
+  <div class="pulitzer-span one-fifth">
+    <%= ajax_link "Required partials", partial_types_path(ffst_id: ffst), {}, dom_target(ffst, :associations_container) %>
+  </div>
+  <div class="pulitzer-span ten-percent">
     <%= ajax_link "Edit", edit_free_form_section_type_path(ffst), {}, dom_target(ffst) %>
-  </li>
-  <li>
-    <%= ajax_link "Required partials", partial_types_path(ffst_id: ffst), {}, "#partials_#{dom_id(ffst)}" %>
-  </li>
-  <li>
-    <%= ajax_delete 'Delete', free_form_section_type_path(ffst), {}, dom_target(ffst) %>
-  </li>
-  <div id="partials_<%= dom_id(ffst) %>"></div>
-</ul>
+  </div>
+  <div id="<%= dom_id(ffst, :associations_container) %>"></div>
+</div>