pulitzer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ba76fb2ab1a9a028fccef98ba535797488e082
-  data.tar.gz: 2ac42afaf4b83740e45cbe0b087532c99cd49385
+  metadata.gz: 349de1f3241b0779b75810a87af0007d9ae813b1
+  data.tar.gz: 5ced147d99a02930a5bc8b727d3fb591b46ad4bd
 SHA512:
-  metadata.gz: 4ddaa9b9e4eefddc29997e39e3e07b383b0a795a3d75ee19b9cf4548d9ac468be847d97731b8762008ee3a84e7923a36c89c4c61b55b9e4a7ec9ee6b70c84be5
-  data.tar.gz: 922f6cbb8cf5454cf3102bfa09658541eb0de47b06c336c70c019aaead4c9175ea03d357da13e59fd38c7f57ca711e208590cd5f3e7db4572b622af43148ff23
+  metadata.gz: 707c33cba7df7ce82113c8d17b9d9d4c7eecba3edae5bc73aa2a0f76e37eb2a8e8f2e2ca9952d1e86cbd9424f49778e4cb33bb3167406a4b12617f1db37ec54e
+  data.tar.gz: d32edbaa2efa3005e5fceb58efa568dad7d8d33f57a54266998b13c788e87a904f2760573016e54ecd8cb361d53afe9e6a30560d7ca2d479ebfff385f359c5a4

data/app/assets/stylesheets/pulitzer.scss

@@ -150,6 +150,10 @@ body {
     display: inline-block;
     width: 5px;
   }
+  &.match-h2{
+    line-height: 40px;
+    margin: 10px 0;
+  }
   &.match-h5{
     line-height: 20px;
     margin: 10px 0;

data/app/controllers/pulitzer/partials_controller.rb

@@ -1,5 +1,5 @@
 class Pulitzer::PartialsController < Pulitzer::ApplicationController
-  before_filter :set_partial, only: [:show, :edit, :update]
+  before_filter :set_partial, except: [:new, :create, :update_all]
 
   def new
     @partial = Pulitzer::Partial.new(partial_params)
@@ -33,13 +33,18 @@ class Pulitzer::PartialsController < Pulitzer::ApplicationController
 
   def update_all
     partials = Pulitzer::Partial.find params[:partial]
-    partials.each do |ce|
-      new_sort_order = params[:partial].index(ce.id.to_s)
-      ce.update_attribute(:sort_order, new_sort_order)
+    partials.each do |partial|
+      new_sort_order = params[:partial].index(partial.id.to_s)
+      partial.update_attribute(:sort_order, new_sort_order)
     end
     render nothing: true
   end
 
+  def destroy
+    @partial.destroy
+    render nothing: true
+  end
+
   protected
 
   def partial_params

data/app/interactions/pulitzer/update_post_type_content_elements.rb

@@ -18,5 +18,15 @@ class Pulitzer::UpdatePostTypeContentElements
           post_type_content_element_type: ptcet)
       end
     end
+    post_type.partials.each do |partial|
+      partial.content_elements.where(label: old_label).each do |content_element|
+        content_element.update(label: ptcet.label,
+          height: ptcet.height,
+          width: ptcet.width,
+          text_editor: ptcet.text_editor,
+          content_element_type: ptcet.content_element_type,
+          post_type_content_element_type: ptcet)
+      end
+    end
   end
 end

data/app/models/pulitzer/free_form_section.rb

@@ -2,7 +2,7 @@ module Pulitzer
   class FreeFormSection < ActiveRecord::Base
     belongs_to :version
     belongs_to :free_form_section_type
-    has_many :partials
+    has_many :partials, -> { order :sort_order}
 
     def clone_me
       clone_attrs = self.attributes.dup

data/app/models/pulitzer/post_type.rb

@@ -1,6 +1,7 @@
 class Pulitzer::PostType < ActiveRecord::Base
   enum kind: [ :template, :partial ]
   has_many :posts, dependent: :destroy
+  has_many :partials, dependent: :destroy
   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

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

@@ -1,5 +1,10 @@
-<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 %>
+<div class="pulitzer-row">
+  <div class="pulitzer-span margin match-h2" <%= expander(dom_id(version, :content_elements)) %>>&rtrif;</div>
+  <div class="pulitzer-span margin match-h2" <%= collapser(dom_id(version, :content_elements)) %>>&dtrif;</div>
+  <div class="pulitzer-span"><h2>Page content elements</h2></div>
+</div>
+<div <%= collapsed(dom_id(version, :content_elements)) %>>
+  <% version.template_content_elements.each do |content_element| %>
+    <%= render partial: '/pulitzer/content_elements/show_wrapper', locals: { content_element: content_element } %>
+  <% end %>
+</div>

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

@@ -1,7 +1,15 @@
-<h3><%= partial.name %></h3>
+<div class="pulitzer-row">
+  <div class="pulitzer-span margin"><h5><%= partial.name %></h5></div>
+  <div class="pulitzer-span right">
+    <%= render partial: '/pulitzer/shared/drag_handle' %>
+  </div>
+</div>
 <%= 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.label :label %>
+  <%= f.text_field :label %>
+  <%= f.label :layout_id, 'Layout' %>
   <%= f.collection_select :layout_id, partial.available_layouts, :id, :name, {}, {} %>
   <%= submit_tag "Update" %>
   <%= link_to('Cancel', partial_path(partial), :class => 'button',

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

@@ -1,4 +1,4 @@
-<div id="<%= dom_id free_form_section, :partial_container %>">
+<div id="<%= dom_id free_form_section, :partial_container %>" data-sorter href="<%= update_all_partials_path %>">
   <% free_form_section.partials.each do |partial| %>
     <%= render partial: '/pulitzer/partials/show_wrapper', locals: { partial: partial } %>
   <% end %>

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

@@ -1,10 +1,14 @@
 <%= 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.label :label %>
+  <%= f.text_field :label %>
+  <%= f.label :post_type_id, 'Partial Type' %>
   <%= 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.label :layout_id, 'Layout' %>
         <%= f.collection_select :layout_id, post_type.layouts, :id, :name, {}, {} %>
       </div>
     <% end %>

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

@@ -1,7 +1,14 @@
 <div class="pulitzer-row">
-  <div class="pulitzer-span"><h5><%= partial.folder_path %>/</h5></div>
+  <div class="pulitzer-span margin match-h5" <%= expander(dom_id(partial)) %>>&rtrif;</div>
+  <div class="pulitzer-span margin match-h5" <%= collapser(dom_id(partial)) %>>&dtrif;</div>
+  <div class="pulitzer-span margin"><h5><%= partial.label %></h5></div>
+  <div class="pulitzer-span match-h5"><%= partial.folder_path %>/</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 class="pulitzer-span right">
+    <%= render partial: '/pulitzer/shared/drag_handle' %>
+  </div>
 </div>
-
+<div <%= collapsed(dom_id(partial)) %>>
 <%= render partial: '/pulitzer/content_elements/partial_index', locals: {partial: partial} %>
+</div>

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

@@ -18,10 +18,16 @@
   <%= ajax_link "refresh preview", edit_version_path(version), {}, dom_target(version.post, :preview_version) %>
 <% elsif version.preview? %>
   <div class="pulitzer-row margin-bottom list-item">
-    <h2>Tags</h2>
-    <% Pulitzer::Post::TAG_MODELS.each do |tag_model| %>
-      <%= render partial: 'pulitzer/post_tags/show_wrapper', locals: { version: version, tag_model: tag_model } %>
-    <% end %>
+    <div class="pulitzer-row">
+      <div class="pulitzer-span margin match-h2" <%= expander(dom_id(version, :tags)) %>>&rtrif;</div>
+      <div class="pulitzer-span margin match-h2" <%= collapser(dom_id(version, :tags)) %>>&dtrif;</div>
+      <div class="pulitzer-span"><h2>Tags</h2></div>
+    </div>
+    <div <%= collapsed(dom_id(version, :tags)) %>>
+      <% Pulitzer::Post::TAG_MODELS.each do |tag_model| %>
+        <%= render partial: 'pulitzer/post_tags/show_wrapper', locals: { version: version, tag_model: tag_model } %>
+      <% end %>
+    </div>
   </div>
   <% if version.has_templated_content_elements? %>
     <div class="pulitzer-row margin-bottom list-item">

data/db/migrate/20160519181030_add_label_to_partial.rb

@@ -0,0 +1,5 @@
+class AddLabelToPartial < ActiveRecord::Migration
+  def change
+    add_column :pulitzer_partials, :label, :string
+  end
+end

data/lib/pulitzer/content_element_helper.rb

@@ -27,6 +27,10 @@ module Pulitzer
       content_tag(:img, nil, options.merge(srcset: element.image_url(:cms)))
     end
 
+    def render_cms_image_path(element,options = {})
+      element.image_url(:cms)
+    end
+
     def render_video(element, options = {})
       content_tag(:iframe, nil, options.merge(src: element.video_link)) if element.video_link
     end

data/lib/pulitzer/version.rb

@@ -1,3 +1,3 @@
 module Pulitzer
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulitzer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Eric Draut
@@ -516,7 +516,6 @@ files:
 - app/views/pulitzer/layouts/_new.html.erb
 - app/views/pulitzer/layouts/_show.html.erb
 - app/views/pulitzer/layouts/_show_wrapper.html.erb
-- app/views/pulitzer/partials/_fields.html.erb
 - app/views/pulitzer/partials/_form.html.erb
 - app/views/pulitzer/partials/_index.html.erb
 - app/views/pulitzer/partials/_new.html.erb
@@ -573,6 +572,7 @@ files:
 - db/migrate/20160516150237_fix_post_type_kinds.rb
 - db/migrate/20160517181706_create_layouts.rb
 - db/migrate/20160517182500_add_layout_to_partial.rb
+- db/migrate/20160519181030_add_label_to_partial.rb
 - lib/pulitzer.rb
 - lib/pulitzer/content_element_helper.rb
 - lib/pulitzer/engine.rb

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

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