pageflow 0.10.0 → 0.11.0

data/app/assets/stylesheets/pageflow/themes/legacy/page_types.scss

@@ -0,0 +1,2 @@
+@import "page_types/audio";
+@import "page_types/video";

data/app/assets/stylesheets/pageflow/themes/legacy/page_types/audio.scss

@@ -0,0 +1,5 @@
+.audioPage {
+  .control_bar_text {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pageflow/{page_types/video.css.scss → themes/legacy/page_types/video.scss}

@@ -1,3 +1,5 @@
+// scss-lint:disable all
+
 .videoWrapper {
   @include desktop {
     position: relative;
@@ -23,103 +25,13 @@
   }
 }
 
-.has_phone_platform .page .videoPage .videoWrapper {
-  margin-right: 0;
-  position: initial;
-  height: 100%;
-
-  video {
-    width: 1px;
-    height: 1px;
-    left: -1;
-  }
-}
-
-.video-js.player {
-  position: relative;
-}
-
-.js .video-js.player {
-  position: absolute;
-  z-index: 0;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-}
-
-.video-js {
-  .vjs-big-play-button {
-    display: none;
-  }
-}
-
-.videoPage .video-js {
-  background-color: transparent;
-
-  .vjs-tech {
-    height: auto;
-  }
-}
-
 .page .videoPage {
-  .shadow {
-    display: none;
-  }
-
-  .contentText {
-    padding-top: 2em;
-  }
-
   .scroller.vjs-fade-out {
     visibility: initial;
   }
-
-  .scroller {
-    /* required for IE 10 to enable mouse events */
-    background-image: image-url('pageflow/empty.png');
-  }
-
-  .vjs-poster-mobile {
-    background-repeat: no-repeat;
-    background-position: 50% 50%;
-    background-size: cover;
-    cursor: pointer;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    position: relative;
-    width: 100%;
-  }
-
-  .vjs-poster {
-    background-color: black;
-  }
-
-  .backgroundArea {
-    height: initial;
-  }
-
-  video {
-    height: auto;
-    width: 100%;
-  }
 }
 
 .js .page .videoPage {
-  .contentText {
-    padding-top: initial;
-    margin-bottom: 200px;
-  }
-
-  .shadow {
-    display: block;
-  }
-
-  .backgroundArea {
-    height: 100%;
-  }
-
   .vjs-control-bar {
     @include transform(translate3d(-50%, 0, 0));
 
@@ -127,10 +39,6 @@
       @include transform(translate3d(0, 0, 0));
     }
   }
-  .vjs-tech {
-    height: 100%;
-  }
-
   /* overwriting video js auto hiding control rules */
   /* Fading sytles, used to fade control bar. */
   .vjs-fade-in {
@@ -205,21 +113,8 @@
     opacity: 1;
     visibility: visible;
   }
-}
-
-.non_js .text_position_right .videoPage {
-  .page_header {
-    margin-left: 0;
-    max-width: initial;
 
-    > * {
-      max-width: 500px;
-      width: 60%;
-      margin-left: auto;
-    }
+  .control_bar_text {
+    display: none;
   }
 }
-
-.js .non_js_video {
-  display: none;
-}

data/app/assets/stylesheets/pageflow/{player_controls.css.scss → themes/legacy/player_controls.scss}

@@ -119,19 +119,12 @@
       -moz-box-shadow: 0 0 2em white;
       box-shadow: 0 0 2em white;
     }
-    .vjs-play-control:focus {
-      outline: 3px solid #c1c1c1;
-    }
   }
 
   .vjs-control:before {
     text-shadow: none;
   }
 
-  .vjs-play-control:focus {
-    outline: 3px solid #c1c1c1;
-  }
-
   .vjs-play-control {
     width: 40px;
     height: 40px;
@@ -151,10 +144,6 @@
     &.vjs-playing:hover { background-position: center -160px; }
     &.vjs-playing:active, &.vjs-paused.touched {  background-position: center -200px; }
 
-    &.pressed:focus {
-      outline: none;
-    }
-
     &:before {
       content: ""
     }
@@ -222,6 +211,10 @@
     .vjs-loading-spinner {
       top: 30px;
       left: 31px;
+      margin-left: -0.5em;
+      margin-top: -0.5em;
+      width: 1em;
+      height: 1em;
       opacity: 1;
 
       &:before {
@@ -360,4 +353,12 @@
       }
     }
   }
-}
+}
+
+.vjs-play-control:focus {
+  outline: 3px solid #c1c1c1 !important;
+}
+
+.disable_focus_outline .vjs-play-control:focus {
+  outline: 0 !important;
+}

data/app/controllers/pageflow/application_controller.rb

@@ -21,8 +21,14 @@ module Pageflow
 
     rescue_from ActiveRecord::RecordNotFound do
       respond_to do |format|
-        format.html { render :file => Rails.root.join('public/404.html'), :status => :not_found }
-        format.any(:json, :css) { head :not_found }
+        format.html do
+          begin
+            render file: Rails.public_path.join('pageflow', 'error_pages', '404.html'), status: :not_found
+          rescue ActionView::MissingTemplate
+            head :not_found
+          end
+        end
+        format.any { head :not_found }
       end
     end
 

data/app/controllers/pageflow/entries_controller.rb

@@ -10,6 +10,7 @@ module Pageflow
     helper_method :render_to_string
 
     helper PagesHelper
+    helper NavigationBarHelper
     helper BackgroundImageHelper
     helper RenderJsonHelper
 
@@ -40,9 +41,6 @@ module Pageflow
           @entry = DraftEntry.find(params[:id])
           authorize!(:show, @entry.to_model)
         end
-        format.any do
-          render(:file => 'public/pageflow/404.html', :status => :not_found)
-        end
       end
     end
 
@@ -83,10 +81,12 @@ 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,
+                                    :overview_button_enabled,
                                     :emphasize_chapter_beginning, :emphasize_new_pages,
-                                    :share_image_id, :share_image_x, :share_image_y, :locale,
-                                    :author, :publisher, :keywords)
+                                    :share_url, :share_image_id, :share_image_x, :share_image_y,
+                                    :locale, :author, :publisher, :keywords)
     end
 
     def entry_request_scope

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

@@ -0,0 +1,15 @@
+module Pageflow
+  module Admin
+    module EntriesHelper
+      def collection_for_entry_publication_states
+        [
+          'published_without_password_protection',
+          'published_with_password_protection',
+          'not_published'
+        ].index_by do |state|
+          I18n.t(state, scope: 'activerecord.values.pageflow/entry.publication_states')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Pageflow
+  module Admin
+    module FormHelper
+      # Using semantic_for_for directly causes Formtastic deprecation
+      # warnings regarding `input_class_finder` and
+      # `action_class_finder`. `active_admin_form_for` causes issues
+      # in `erb` templates (see
+      # https://github.com/activeadmin/activeadmin/issues/3916).
+      def admin_form_for(resource, options = {}, &block)
+        semantic_form_for(resource, options.merge(builder: ActiveAdmin::FormBuilder), &block)
+      end
+    end
+  end
+end

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

@@ -4,6 +4,15 @@ module Pageflow
       def collection_for_user_roles
         User.roles_accessible_by(current_ability).index_by { |role| t(role, :scope => 'pageflow.admin.users.roles') }
       end
+
+      def delete_own_user_section
+        user_deletion_permission = Pageflow.config.authorize_user_deletion.call(current_user)
+        if user_deletion_permission == true
+          render('pageflow/admin/users/may_delete')
+        else
+          render('pageflow/admin/users/cannot_delete', reason: user_deletion_permission)
+        end
+      end
     end
   end
 end

data/app/helpers/pageflow/entries_helper.rb

@@ -4,8 +4,9 @@ module Pageflow
       [entry.title, entry.theming.cname_domain.presence].compact.join(' - ')
     end
 
-    def pretty_entry_url(entry)
-      pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
+    def pretty_entry_url(entry, options = {})
+      params = options.reverse_merge(Pageflow.config.theming_url_options(entry.theming) || {})
+      pageflow.short_entry_url(entry.to_model, params)
     end
 
     def entry_file_rights(entry)

data/app/helpers/pageflow/info_box_helper.rb

@@ -1,13 +1,25 @@
 module Pageflow
   module InfoBoxHelper
     def info_box(configuration)
-      if configuration['additional_title'].blank? && configuration['additional_description'].blank?
-        css_class = 'add_info_box empty'
-      else
-        css_class = 'add_info_box'
+      css_classes = ['add_info_box']
+
+      if configuration['additional_title'].blank? &&
+         configuration['additional_description'].blank?
+
+        css_classes << 'empty'
+      end
+
+      if configuration['additional_title'].blank?
+        css_classes << 'title_empty'
+      end
+
+      if configuration['additional_description'].blank?
+        css_classes << 'description_empty'
       end
 
-      render('pageflow/pages/info_box', :configuration => configuration, :css_class => css_class)
+      render('pageflow/pages/info_box',
+             configuration: configuration,
+             css_class: css_classes * ' ')
     end
 
     def info_box_title(title)

data/app/helpers/pageflow/navigation_bar_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module NavigationBarHelper
+    def navigation_bar_css_class(entry, options = {})
+      [
+        options[:class],
+        entry.home_button.enabled? ? 'with_home_button' : nil,
+        entry.overview_button.enabled? ? 'with_overview_button' : nil
+      ].compact.join(' ')
+    end
+  end
+end

data/app/helpers/pageflow/social_share_helper.rb

@@ -1,5 +1,7 @@
 module Pageflow
   module SocialShareHelper
+    include EntriesHelper
+
     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)
@@ -8,8 +10,19 @@ module Pageflow
       end
     end
 
-    def social_share_page_url(page)
-      "#{pretty_entry_url(page.chapter.entry)}?page=#{page.perma_id}"
+    def social_share_entry_url(entry)
+      entry.share_url.presence || pretty_entry_url(entry)
+    end
+
+    def social_share_page_url(entry, page_or_perma_id)
+      perma_id =
+        if page_or_perma_id.respond_to?(:perma_id)
+          page_or_perma_id.perma_id
+        else
+          page_or_perma_id
+        end
+
+      pretty_entry_url(entry, page: perma_id)
     end
 
     def social_share_page_title(page)
@@ -23,7 +36,7 @@ module Pageflow
       title.join(' ')
     end
 
-    def social_share_page_description(page, entry)
+    def social_share_page_description(entry, page)
       return social_share_sanitize(page.configuration['text']) if page.configuration['text'].present?
       return social_share_sanitize(page.configuration['description']) if page.configuration['description'].present?
       social_share_entry_description(entry)

data/app/helpers/pageflow/social_share_links_helper.rb

@@ -0,0 +1,32 @@
+module Pageflow
+  module SocialShareLinksHelper
+    include SocialShareHelper
+
+    PROVIDER_URL_TEMPLATES = {
+      facebook: 'http://www.facebook.com/sharer/sharer.php?u=%{url}',
+      google: 'https://plus.google.com/share?url=%{url}',
+      twitter: 'http://twitter.com/home?status=%{url}'
+    }.freeze
+
+    def social_share_link(provider, entry, &block)
+      block ||= ->() {}
+      page_share_link_url = social_share_link_url(provider, social_share_page_url(entry, 'permaId'))
+      data_attributes = entry.share_url.present? ? {} : {share_page: page_share_link_url}
+
+      link_to(social_share_link_url(provider, social_share_entry_url(entry)),
+              target: '_blank',
+              tabindex: '2',
+              class: ['share', provider],
+              data: data_attributes,
+              &block)
+    end
+
+    private
+
+    def social_share_link_url(provider, url)
+      return nil if url.blank?
+      encoded_url = ERB::Util.url_encode(url)
+      PROVIDER_URL_TEMPLATES[provider] % {url: encoded_url}
+    end
+  end
+end