pageflow 0.5.0 → 0.6.0

data/app/assets/stylesheets/pageflow/ui.css.scss

@@ -0,0 +1,7 @@
+@import "bourbon";
+@import "pageflow/mixins";
+
+%pageflow-ui {
+  @import "./ui/forms";
+  @import "./ui/tabs_view";
+}

data/app/assets/stylesheets/pageflow/{editor → ui}/forms.css.scss

@@ -180,6 +180,7 @@ textarea.short {
 
 .configuration_editor {
   margin: 10px 0;
+  padding-bottom: 20px;
 
   > div {
     padding: 5px 0;

data/app/assets/stylesheets/pageflow/{editor → ui}/tabs_view.css.scss

@@ -4,6 +4,7 @@
     width: 100%;
     white-space: nowrap;
     overflow: hidden;
+    padding: 0;
   }
 
   > ul > li {

data/app/controllers/pageflow/editor/widgets_controller.rb

@@ -0,0 +1,39 @@
+module Pageflow
+  module Editor
+    class WidgetsController < Pageflow::ApplicationController
+      respond_to :json
+
+      before_action :authenticate_user!
+
+      def index
+        subject = find_subject
+        authorize!(:edit, subject.to_model)
+
+        @widgets = subject.widgets.resolve(include_placeholders: true)
+        respond_with(@widgets)
+      end
+
+      def batch
+        subject = find_subject
+        authorize!(:edit, subject.to_model)
+
+        subject.widgets.batch_update!(widget_batch_params)
+        render(json: {})
+      end
+
+      private
+
+      def widget_batch_params
+        params.permit(widgets: [:role, :type_name]).fetch(:widgets, [])
+      end
+
+      def find_subject
+        if params[:collection_name] == 'entries'
+          DraftEntry.find(params[:subject_id])
+        else
+          Theming.find(params[:subject_id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/pageflow/entries_controller.rb

@@ -20,6 +20,13 @@ module Pageflow
       respond_to do |format|
         format.any(:html, :css) do
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
+
+          if params[:page].present?
+            @entry.share_target = Page.find_by_perma_id(params[:page])
+          else
+            @entry.share_target = @entry
+          end
+
         end
         format.json do
           authenticate_user!
@@ -66,7 +73,9 @@ module Pageflow
     protected
 
     def entry_params
-      params.require(:entry).permit(:title, :summary, :credits, :manual_start, :home_url, :home_button_enabled)
+      params.require(:entry).permit(:title, :summary, :credits, :manual_start, :home_url, :home_button_enabled,
+                                    :emphasize_chapter_beginning, :emphasize_new_pages,
+                                    :share_image_id, :share_image_x, :share_image_y)
     end
 
     def entry_request_scope

data/app/helpers/pageflow/entries_helper.rb

@@ -52,6 +52,13 @@ module Pageflow
       end
     end
 
+    def entry_css_class(entry)
+      [
+        present_widgets_css_class(entry),
+        entry.emphasize_chapter_beginning ? 'emphasize_chapter_beginning' : nil
+      ].compact.join(' ')
+    end
+
     def entry_header_css_class(entry)
       css_class = 'header'
       if entry.pages.any? && entry.pages.first.configuration['invert']

data/app/helpers/pageflow/page_types_helper.rb

@@ -7,13 +7,13 @@ module Pageflow
     end
 
     def page_type_templates
-      Pageflow.config.page_types.map do |page_type|
-        content_tag(:script, :type => 'text/html', :data => {:template => "#{page_type.name}_page"}) do
-          render_to_string(:template => page_type.template_path,
-                           :locals => {:configuration => {}, :page => Page.new},
-                           :layout => false)
-        end
-      end.join(' ').html_safe
+      safe_join(Pageflow.config.page_types.map do |page_type|
+        content_tag(:script,
+                    render_to_string(:template => page_type.template_path,
+                                     :locals => {:configuration => {}, :page => Page.new},
+                                     :layout => false).to_str,
+                    :type => 'text/html', :data => {:template => "#{page_type.name}_page"})
+      end)
     end
   end
 end

data/app/helpers/pageflow/pages_helper.rb

@@ -5,6 +5,15 @@ module Pageflow
       classes << 'invert' if page.configuration['invert']
       classes << 'hide_title' if page.configuration['hide_title']
       classes << "text_position_#{page.configuration['text_position']}" if page.configuration['text_position'].present?
+      classes << 'chapter_beginning' if page.position == 0
+      classes.join(' ')
+    end
+
+    def page_navigation_css_class(page)
+      classes = [page.template]
+      classes << 'chapter_beginning' if page.position == 0
+      classes << "chapter_#{page.chapter.position}"
+      page.chapter.position % 2 == 0 ? classes << 'chapter_even' : classes << 'chapter_odd'
       classes.join(' ')
     end
 
@@ -13,12 +22,28 @@ module Pageflow
       content_tag(:div, '', :class => 'shadow', :style => style)
     end
 
-    def poster_image_div(video_id, poster_image_id)
-      if poster_image_id.present?
-        content_tag(:div, '', :class => "background background_image image_#{poster_image_id}")
+    def mobile_poster_image_div(config = {})
+      classes = ['background', 'background_image']
+      position = {x: 50, y: 50}
+
+      if config['mobile_poster_image_id']
+        classes << "image_#{config['mobile_poster_image_id']}"
+        position[:x] = config['mobile_poster_image_x'] || 50
+        position[:y] = config['mobile_poster_image_y'] || 50
+      elsif config['poster_image_id']
+        classes << "image_#{config['poster_image_id']}"
+        position[:x] = config['poster_image_x'] || 50
+        position[:y] = config['poster_image_y'] || 50
+      elsif config['video_file_id']
+        classes << "video_poster_#{config['video_file_id']}"
+        position[:x] = config['video_file_x'] || 50
+        position[:y] = config['video_file_y'] || 50
       else
-        content_tag(:div, '', :class => "background background_image video_poster_#{video_id || 'none'}")
+        classes << 'video_poster_none'
       end
+
+      content_tag(:div, '', :class => classes.join(' '),
+                  :style => "background-position: #{position[:x]}% #{position[:y]}%;")
     end
 
     def poster_image_tag(video_id, poster_image_id, options = {})
@@ -46,10 +71,16 @@ module Pageflow
 
       video_file = VideoFile.find_by_id(video_id)
       poster = ImageFile.find_by_id(poster_image_id)
+      mobile_poster = ImageFile.find_by_id(options.delete(:mobile_poster_image_id))
 
       options[:data] = {}
       script_tag_data = {:template => 'video'}
 
+      if mobile_poster
+        options[:data][:mobile_poster] = mobile_poster.attachment.url(:medium)
+        options[:data][:mobile_large_poster] = mobile_poster.attachment.url(:large)
+      end
+
       if poster
         options[:data][:poster] = poster.attachment.url(:medium)
         options[:data][:large_poster] = poster.attachment.url(:large)
@@ -58,7 +89,7 @@ module Pageflow
         options[:data][:large_poster] = video_file.poster.url(:large)
       end
 
-      if (video_file && video_file.width.present? && video_file.height.present?)
+      if video_file && video_file.width.present? && video_file.height.present?
         script_tag_data[:video_width] = options[:data][:width] = video_file.width
         script_tag_data[:video_height] = options[:data][:height] = video_file.height
       end

data/app/helpers/pageflow/social_share_helper.rb

@@ -0,0 +1,54 @@
+module Pageflow
+  module SocialShareHelper
+    def social_share_meta_tags_for(target)
+      if target.is_a?(Page)
+        render('pageflow/social_share/page_meta_tags', entry: @entry, page: @entry.share_target)
+      else
+        render('pageflow/social_share/entry_meta_tags', entry: @entry)
+      end
+    end
+
+    def social_share_page_url(page)
+      "#{pretty_entry_url(page.chapter.entry)}?page=#{page.perma_id}"
+    end
+
+    def social_share_page_title(page)
+      entry = page.chapter.entry
+
+      title = ["#{entry.title}:"]
+      title << page.title
+      title << '-' if entry.theming.cname_domain.present?
+      title << entry.theming.cname_domain
+
+      title.join(' ')
+    end
+
+    def social_share_page_description(page)
+      return page.configuration['text'] if page.configuration['text'].present?
+      return page.configuration['description'] if page.configuration['description'].present?
+      ''
+    end
+
+    def social_share_entry_image_tags(entry)
+      image_urls = []
+
+      image_urls << ImageFile.find(entry.share_image_id).thumbnail_url(:medium) if entry.share_image_id.present?
+
+      entry.pages.each do |page|
+        if image_urls.size >= 4
+          break
+        else
+          image_urls << page.thumbnail_url(:medium)
+          image_urls.uniq!
+        end
+      end
+
+      render 'pageflow/social_share/image_tags', :image_urls => image_urls
+    end
+
+    def social_share_normalize_protocol(url)
+      url.gsub(/^(\/\/|https:\/\/)/, 'http://')
+    end
+
+  end
+end

data/app/helpers/pageflow/widgets_helper.rb

@@ -0,0 +1,43 @@
+module Pageflow
+  module WidgetsHelper
+    def render_widget_head_fragments(entry, options = {})
+      fragments = entry.widgets.resolve(options).map do |widget|
+        widget.widget_type.render_head_fragment(self, entry)
+      end
+
+      safe_join(fragments)
+    end
+
+    def render_widgets(entry, options = {})
+      fragments = entry.widgets.resolve(options).map do |widget|
+        widget.widget_type.render(self, entry)
+      end
+
+      safe_join(fragments)
+    end
+
+    def present_widgets_css_class(entry)
+      entry.widgets.resolve.map do |widget|
+        "widget_#{widget.widget_type.name}_present"
+      end.join(' ')
+    end
+
+    def widget_types_json_seeds
+      Pageflow.config.widget_types.each_with_object({}) do |widget_type, result|
+        widget_type.roles.each do |role|
+          result[role] ||= []
+          result[role] << {
+            name: widget_type.name,
+            translationKey: widget_type.translation_key
+          }
+        end
+      end.to_json.html_safe
+    end
+
+    def widget_types_collection_for_role(role)
+      Pageflow.config.widget_types.find_all_by_role(role).each_with_object({}) do |widget_type, result|
+        result[I18n.t(widget_type.translation_key)] = widget_type.name
+      end
+    end
+  end
+end

data/app/models/pageflow/draft_entry.rb

@@ -11,7 +11,10 @@ module Pageflow
              :to => :entry)
 
     delegate(:title, :summary, :credits, :manual_start,
-             :chapters, :pages,
+             :widgets, :chapters, :pages,
+             :emphasize_chapter_beginning,
+             :emphasize_new_pages,
+             :share_image_id, :share_image_x, :share_image_y,
              :files,
              :image_files, :video_files, :audio_files,
              :to => :draft)

data/app/models/pageflow/entry.rb

@@ -32,6 +32,7 @@ module Pageflow
 
     after_create do
       create_draft!(home_button_enabled: theming.home_button_enabled_by_default)
+      theming.widgets.copy_all_to(draft)
     end
 
     def edit_lock

data/app/models/pageflow/published_entry.rb

@@ -4,13 +4,16 @@ module Pageflow
     extend ActiveModel::Naming
 
     attr_reader :entry, :revision
+    attr_accessor :share_target
 
-    delegate(:account, :theming, :to_model, :to_key, :persisted?, :to => :entry)
+    delegate(:id, :account, :theming, :to_model, :to_key, :persisted?, :to => :entry)
 
-    delegate(:chapters, :pages,
-             :files,
+    delegate(:widgets, :chapters, :pages, :files,
              :image_files, :video_files, :audio_files,
              :title, :summary, :credits, :manual_start,
+             :emphasize_chapter_beginning,
+             :emphasize_new_pages,
+             :share_image_id, :share_image_x, :share_image_y,
              :to => :revision)
 
     def initialize(entry, revision = nil)

data/app/models/pageflow/revision.rb

@@ -4,6 +4,7 @@ module Pageflow
     belongs_to :creator, :class_name => 'User'
     belongs_to :restored_from, :class_name => 'Pageflow::Revision'
 
+    has_many :widgets, :as => :subject
     has_many :chapters, -> { order('position ASC') }
     has_many :pages, -> { reorder('pageflow_chapters.position ASC, pageflow_pages.position ASC') }, :through => :chapters
 
@@ -73,6 +74,10 @@ module Pageflow
       revision = dup
       yield(revision) if block_given?
 
+      widgets.each do |widget|
+        widget.copy_to(revision)
+      end
+
       chapters.each do |chapter|
         chapter.copy_to(revision)
       end

data/app/models/pageflow/theming.rb

@@ -1,6 +1,9 @@
 module Pageflow
   class Theming < ActiveRecord::Base
     belongs_to :account
+    has_many :widgets, as: :subject
+
+    has_many :entries
 
     scope :with_home_url, -> { where.not(home_url: '') }
     scope :for_request, ->(request) { Pageflow.config.theming_request_scope.call(all, request) }

data/app/models/pageflow/widget.rb

@@ -0,0 +1,74 @@
+module Pageflow
+  class Widget < ActiveRecord::Base
+    belongs_to :subject, polymorphic: true, touch: true
+
+    validates :subject, presence: true
+
+    def copy_to(subject)
+      record = dup
+      record.subject = subject
+      record.save!
+    end
+
+    def enabled?(options)
+      options[:only] != :editor || widget_type.enabled_in_editor?
+    end
+
+    def widget_type
+      Pageflow.config.widget_types.fetch_by_name(type_name) do
+        WidgetType::Null.new(role)
+      end
+    end
+
+    def self.copy_all_to(subject)
+      all.each do |widget|
+        widget.copy_to(subject)
+      end
+    end
+
+    def self.batch_update!(widgets_attributes)
+      widgets_attributes.each do |attributes|
+        find_or_initialize_by(role: attributes[:role]).update!(attributes)
+      end
+    end
+
+    def self.resolve(options = {})
+      Resolver.new(options).result
+    end
+
+    class Resolver < Struct.new(:options)
+      def result
+        all.select do |widget|
+          widget.enabled?(options)
+        end
+      end
+
+      private
+
+      def all
+        placeholders_by_role
+          .merge(defaults_by_role)
+          .merge(from_db_by_role)
+          .values
+      end
+
+      def from_db_by_role
+        Widget.all.index_by(&:role)
+      end
+
+      def defaults_by_role
+        Pageflow.config.widget_types.defaults_by_role.each_with_object({}) do |(role, widget_type), result|
+          result[role] = Widget.new(role: role, type_name: widget_type.name, subject: nil)
+        end
+      end
+
+      def placeholders_by_role
+        return {} unless options[:include_placeholders]
+
+        Pageflow.config.widget_types.roles.each_with_object({}) do |role, result|
+          result[role] = Widget.new(role: role, type_name: nil, subject: nil)
+        end
+      end
+    end
+  end
+end