pageflow 0.9.2 → 0.10.0

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

@@ -21,9 +21,6 @@
   > div {
     background-color: #fff;
     padding: 10px;
-    overflow: auto;
-    height: 100%;
-    min-height: 110px;
   }
 
   > ul > li.spinner {

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

@@ -0,0 +1,57 @@
+.tooltip {
+  $background-color: rgba(0, 0, 0, 0.7);
+
+  position: absolute;
+  z-index: 10001;
+  top: 40px;
+  left: 400px;
+  max-width: 70%;
+  padding: 10px 15px;
+  color: #fff;
+  font-size: 13px;
+  font-weight: bold;
+  text-decoration: none;
+  pointer-events: none;
+  border-radius: 5px;
+  background-color: $background-color;
+
+  opacity: 0;
+  @include transition(opacity 0.15s ease);
+
+  &.visible {
+    opacity: 1;
+  }
+
+  &:after {
+    content: '';
+    border-top: solid 10px transparent;
+    border-right: solid 10px $background-color;
+    border-bottom: solid 10px transparent;
+    border-left: solid 10px transparent;
+    position: absolute;
+    top: 7px;
+    left: -20px;
+  }
+
+  &.align_bottom_right,
+  &.align_bottom_left {
+    &:after {
+      border-top: solid 10px transparent;
+      border-right: solid 10px transparent;
+      border-bottom: solid 10px $background-color;
+      border-left: solid 10px transparent;
+
+      top: -20px;
+      left: 7px;
+    }
+  }
+
+  &.align_bottom_right {
+    @include transform(translateX(-100%));
+
+    &:after {
+      right: 7px;
+      left: auto;
+    }
+  }
+}

data/app/controllers/concerns/pageflow/entry_password_protection.rb

@@ -0,0 +1,13 @@
+module Pageflow
+  module EntryPasswordProtection
+    private
+
+    def check_entry_password_protection(entry)
+      return unless entry.password_protected?
+
+      authenticate_or_request_with_http_basic('Pageflow') do |_, password|
+        entry.authenticate(password)
+      end
+    end
+  end
+end

data/app/controllers/pageflow/chapters_controller.rb

@@ -5,16 +5,27 @@ module Pageflow
     before_filter :authenticate_user!
 
     def create
-      entry = DraftEntry.find(params[:entry_id])
-      chapter = entry.chapters.build(chapter_params)
+      storyline = Storyline.find(params[:storyline_id])
+      chapter = storyline.chapters.build(chapter_params)
 
       authorize!(:create, chapter)
-      verify_edit_lock!(chapter.entry)
+      verify_edit_lock!(storyline.entry)
       chapter.save
 
       respond_with(chapter)
     end
 
+    def scaffold
+      storyline = Storyline.find(params[:storyline_id])
+      chapter_scaffold = ChapterScaffold.build(storyline, chapter_params, depth: 'page')
+
+      authorize!(:create, chapter_scaffold.to_model)
+      verify_edit_lock!(storyline.entry)
+      chapter_scaffold.save!
+
+      respond_with(chapter_scaffold)
+    end
+
     def update
       chapter = Chapter.find(params[:id])
 
@@ -26,12 +37,13 @@ module Pageflow
     end
 
     def order
-      entry = DraftEntry.find(params[:entry_id])
+      storyline = Storyline.find(params[:storyline_id])
+      entry = DraftEntry.new(storyline.entry)
 
-      authorize!(:edit_outline, entry.to_model)
-      verify_edit_lock!(entry)
+      authorize!(:edit_outline, storyline.entry)
+      verify_edit_lock!(storyline.entry)
       params.require(:ids).each_with_index do |id, index|
-        entry.chapters.update(id, :position => index)
+        entry.chapters.update(id, storyline_id: storyline.id, position: index)
       end
 
       head :no_content
@@ -42,7 +54,7 @@ module Pageflow
 
       authorize!(:destroy, chapter)
       verify_edit_lock!(chapter.entry)
-      chapter.entry.snapshot(:creator => current_user)
+      chapter.entry.snapshot(creator: current_user)
 
       chapter.destroy
 
@@ -53,7 +65,10 @@ module Pageflow
 
     def chapter_params
       configuration = params.require(:chapter)[:configuration].try(:permit!)
-      params.require(:chapter).permit(:position, :title).merge(:configuration => configuration)
+
+      params.require(:chapter)
+        .permit(:position, :title)
+        .merge(configuration: configuration)
     end
   end
 end

data/app/controllers/pageflow/edit_locks_controller.rb

@@ -7,7 +7,7 @@ module Pageflow
     def create
       entry = Entry.find(params[:entry_id])
       authorize!(:edit, entry)
-      entry.edit_lock.aquire(current_user, edit_lock_params)
+      entry.edit_lock.acquire(current_user, edit_lock_params)
       entry.snapshot(:creator => current_user)
       respond_with(entry.reload.edit_lock, :location => entry_edit_lock_url(entry))
     end
@@ -15,7 +15,7 @@ module Pageflow
     def update
       entry = Entry.find(params[:entry_id])
       authorize!(:edit, entry)
-      entry.edit_lock.aquire(current_user, edit_lock_params)
+      entry.edit_lock.acquire(current_user, edit_lock_params)
       head :no_content
     end
 

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

@@ -29,7 +29,6 @@ module Pageflow
         file = file_type.model.find(params[:id])
 
         authorize!(:retry, file)
-        verify_edit_lock!(file.entry)
         file.retry!
 
         respond_with(:editor, file, location: editor_file_url(file, collection_name: params[:collection_name]))
@@ -39,7 +38,6 @@ module Pageflow
         file = file_type.model.find(params[:id])
 
         authorize!(:update, file)
-        verify_edit_lock!(file.entry)
         file.update_attributes!(update_params)
 
         head(:no_content)

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

@@ -9,7 +9,7 @@ module Pageflow
         subject = find_subject
         authorize!(:edit, subject.to_model)
 
-        @widgets = subject.widgets.resolve(include_placeholders: true)
+        @widgets = subject.resolve_widgets(include_placeholders: true)
         respond_with(@widgets)
       end
 

data/app/controllers/pageflow/entries_controller.rb

@@ -1,6 +1,7 @@
 module Pageflow
   class EntriesController < Pageflow::ApplicationController
     include PublicHttpsMode
+    include EntryPasswordProtection
 
     before_filter :authenticate_user!, :except => [:index, :show, :page]
 
@@ -24,8 +25,8 @@ module Pageflow
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
           I18n.locale = @entry.locale
 
-          if !request.format.css? && @entry.password_protected?
-            check_entry_password(@entry)
+          if !request.format.css?
+            check_entry_password_protection(@entry)
           end
 
           if params[:page].present?
@@ -84,17 +85,12 @@ module Pageflow
     def entry_params
       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, :locale)
+                                    :share_image_id, :share_image_x, :share_image_y, :locale,
+                                    :author, :publisher, :keywords)
     end
 
     def entry_request_scope
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end
-
-    def check_entry_password(entry)
-      authenticate_or_request_with_http_basic('Pageflow') do |_, password|
-        entry.authenticate(password)
-      end
-    end
   end
 end

data/app/controllers/pageflow/files_controller.rb

@@ -1,6 +1,7 @@
 module Pageflow
   class FilesController < Pageflow::ApplicationController
     include PublicHttpsMode
+    include EntryPasswordProtection
 
     before_filter :check_public_https_mode
 
@@ -9,6 +10,8 @@ module Pageflow
         format.html do
           entry = PublishedEntry.find(params[:entry_id], entry_request_scope)
           @file = entry.files(file_type.model).find(params[:id])
+
+          check_entry_password_protection(entry)
         end
       end
     end

data/app/controllers/pageflow/storylines_controller.rb

@@ -0,0 +1,69 @@
+module Pageflow
+  class StorylinesController < Pageflow::ApplicationController
+    respond_to :json
+
+    before_filter :authenticate_user!
+
+    def create
+      entry = DraftEntry.find(params[:entry_id])
+      storyline = entry.storylines.build(storyline_params)
+
+      authorize!(:create, storyline)
+      verify_edit_lock!(entry.to_model)
+      storyline.save
+
+      respond_with(storyline)
+    end
+
+    def scaffold
+      entry = DraftEntry.find(params[:entry_id])
+      storyline_scaffold = StorylineScaffold.build(entry, storyline_params, params.slice(:depth))
+
+      authorize!(:create, storyline_scaffold.to_model)
+      verify_edit_lock!(entry.to_model)
+      storyline_scaffold.save!
+
+      respond_with(storyline_scaffold)
+    end
+
+    def update
+      storyline = Storyline.find(params[:id])
+
+      authorize!(:update, storyline)
+      verify_edit_lock!(storyline.entry)
+      storyline.update_attributes(storyline_params)
+
+      respond_with(storyline)
+    end
+
+    def order
+      entry = DraftEntry.find(params[:entry_id])
+
+      authorize!(:edit_outline, entry.to_model)
+      verify_edit_lock!(entry)
+      params.require(:ids).each_with_index do |id, index|
+        entry.storylines.update(id, position: index)
+      end
+
+      head :no_content
+    end
+
+    def destroy
+      storyline = Storyline.find(params[:id])
+
+      authorize!(:destroy, storyline)
+      verify_edit_lock!(storyline.entry)
+
+      storyline.destroy
+
+      respond_with(storyline)
+    end
+
+    private
+
+    def storyline_params
+      configuration = params.require(:storyline)[:configuration].try(:permit!)
+      params.require(:storyline).permit.merge(configuration: configuration)
+    end
+  end
+end

data/app/helpers/pageflow/admin/features_helper.rb

@@ -2,10 +2,14 @@ module Pageflow
   module Admin
     module FeaturesHelper
       def feature_state_select_tag(feature_target, feature_name)
-        value = FeatureTarget::STATE_MAPPING[feature_target.feature_state(feature_name)]
+        own_state = feature_target.own_feature_state(feature_name)
+        inherited_state = feature_target.inherited_feature_state(feature_name)
+
+        value = FeatureTarget::STATE_MAPPING[own_state]
+        collection = feature_states_collection(inherited_state)
 
         select_tag(feature_state_input_name(feature_target, feature_name),
-                   options_for_select(feature_states_collection, value))
+                   options_for_select(collection, value))
       end
 
       def feature_state_input_name(feature_target, feature_name)
@@ -13,13 +17,20 @@ module Pageflow
         "#{param_key}[feature_states][#{feature_name}]"
       end
 
-      def feature_states_collection
+      def feature_states_collection(inherited_feature_state)
+        default_item_label = I18n.t('pageflow.admin.features.states.default',
+                                    inherited: feature_state_display_name(inherited_feature_state))
         {
-          I18n.t('pageflow.admin.features.states.undefined') => nil,
-          I18n.t('pageflow.admin.features.states.enabled') => FeatureTarget::STATE_MAPPING[true],
-          I18n.t('pageflow.admin.features.states.disabled') => FeatureTarget::STATE_MAPPING[false]
+          default_item_label => FeatureTarget::STATE_MAPPING[nil],
+          feature_state_display_name(true) => FeatureTarget::STATE_MAPPING[true],
+          feature_state_display_name(false) => FeatureTarget::STATE_MAPPING[false]
         }
       end
+
+      def feature_state_display_name(state)
+        I18n.t(FeatureTarget::STATE_MAPPING[state],
+               scope: 'pageflow.admin.features.states')
+      end
     end
   end
 end

data/app/helpers/pageflow/admin/widgets_helper.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  module Admin
+    module WidgetsHelper
+      def admin_widgets_fields(form, config)
+        render('pageflow/admin/widgets/fields',
+               widgets: form.object.widgets.resolve(config, include_placeholders: true),
+               form: form,
+               config: config)
+      end
+
+      def admin_widget_types_collection_for_role(config, role)
+        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
+end

data/app/helpers/pageflow/audio_files_helper.rb

@@ -23,9 +23,9 @@ module Pageflow
       end
     end
 
-    def audio_file_non_js_link(audio_file_id)
+    def audio_file_non_js_link(entry, audio_file_id)
       if (audio_file = AudioFile.find_by_id(audio_file_id))
-        link_to(t('pageflow.audio.open'), short_audio_file_path(audio_file.entry, audio_file))
+        link_to(t('pageflow.audio.open'), short_audio_file_path(entry, audio_file))
       end
     end
 

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -0,0 +1,52 @@
+module Pageflow
+  # Seed data that is used for published entires as well as editor
+  # display.
+  #
+  # @api private
+  module CommonEntrySeedHelper
+    def common_entry_seed(entry)
+      {
+        locale: entry.locale,
+        page_types: PageTypesSeed.new(entry, Pageflow.config_for(entry)).as_json
+      }
+    end
+
+    class PageTypesSeed
+      attr_reader :entry, :config
+
+      def initialize(entry, config)
+        @entry = entry
+        @config = config
+      end
+
+      def as_json
+        config.page_types.each_with_object({}) do |page_type, result|
+          result[page_type.name.to_sym] = page_type_seed(page_type)
+        end
+      end
+
+      private
+
+      def page_type_seed(page_type)
+        {
+          thumbnail_candidates: thumbnail_candidates(page_type)
+        }
+      end
+
+      def thumbnail_candidates(page_type)
+        page_type.thumbnail_candidates.map do |candidate|
+          {
+            attribute: candidate[:attribute],
+            collection_name: candidate[:file_collection],
+            css_class_prefix: thumbnail_candidate_css_class_prefix(candidate)
+          }
+        end
+      end
+
+      def thumbnail_candidate_css_class_prefix(candidate)
+        file_type = config.file_types.find_by_collection_name!(candidate[:file_collection])
+        file_type.model.model_name.singular
+      end
+    end
+  end
+end