pageflow 12.0.4 → 12.1.0

data/config/locales/de.yml

@@ -194,6 +194,7 @@ de:
         share_image_id: Social Sharing Bild
         share_url: Social Sharing URL
         summary: Zusammenfassung
+        theme_name: Theme
         title: Titel
         updated_at: Geändert am
         url: Permalink
@@ -754,7 +755,8 @@ de:
       accounts:
         no_entries: Keine Beiträge
         no_members: Keine Benutzer
-        widgets_inline_help: Die hier ausgewählten Widgets werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
+        theming_defaults_inline_help: Die folgenden Einstellungen werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
+        widgets_inline_help: DELETED
       entries:
         add_folder: Ordner hinzufügen
         confirm_depublish: Soll der Beitrag wirklich depubliziert werden?
@@ -981,6 +983,8 @@ de:
         captions: Ton-Ersatz-Textspur
         descriptions: Bild-Ersatz-Textspur
         subtitles: Übersetzungs-Textspur
+    default_theme:
+      name: Standard
     delayed_text_fade_in:
       feature_name: Text verzögert einblenden
     devise:
@@ -1125,6 +1129,11 @@ de:
             ratio4to3Portrait: 4:3 Portrait
           save: Speichern
           title: Bildausschnitt anpassen
+        change_theme_dialog:
+          close: Schließen
+          header: Themes
+          preview_header_prefix: Vorschau
+          preview_header_suffix: "-Theme"
         chapter_item:
           new_page: Neue Seite
           save_error: Beim Speichern des Kapitels ist ein Fehler aufgetreten.
@@ -1171,6 +1180,8 @@ de:
           outline: Gliederung
           retry: Erneut versuchen
           save_error: Beim Speichern des Erzählstrangs ist ein Problem aufgetreten.
+        edit_widget:
+          back: Erscheinungsbild
         embedded:
           page_link:
             reset: Zurücksetzen
@@ -1207,8 +1218,8 @@ de:
           open_help: Hilfe anzeigen
         inputs:
           reference:
-            edit: Verknüpfung ändern
-            reset: Verknüpfung entfernen
+            edit: DELETED
+            reset: DELETED
         list_blank_slate:
           text: "(Keine Einträge)"
         list_item:
@@ -1274,9 +1285,15 @@ de:
         text_tracks:
           edit_file_header: Metadaten
           upload: Hinzufügen
+        theme:
+          use: Verwenden
+        widget_item:
+          settings: Einstellungen
       text_track_files:
         label_missing: "(Label fehlt)"
         srclang_missing: "(Fehlt)"
+      themes:
+        header: Themes
       views:
         chapter_item_view:
           chapter: Kapitel
@@ -1319,7 +1336,11 @@ de:
             edit_file_settings: Datei-Einstellungen...
             no_default_text_track: "(Kein)"
           reference_input_view:
+            choose: Verknüpfung ändern
             none: "(Kein)"
+            unset: Verknüpfung entfernen
+          theme_input_view:
+            choose: Theme ändern
         page_item_view:
           unnamed: "(Unbenannt)"
         page_link_item_view:
@@ -1666,6 +1687,8 @@ de:
       scroll_right: Scrollen (von rechts)
     quotas:
       exhausted: Quota verbraucht.
+    selectable_themes:
+      feature_name: Editor-Theme-Auswahl
     storyline_attributes:
       main:
         inline_help: Macht die erste Seite dieses Erzählstrangs zur Startseite des Beitrags.

data/config/locales/en.yml

@@ -194,6 +194,7 @@ en:
         share_image_id: Social Sharing Image
         share_url: Social Sharing URL
         summary: Summary
+        theme_name: Theme
         title: Title
         updated_at: Updated at
         url: Permalink
@@ -754,7 +755,8 @@ en:
       accounts:
         no_entries: No Stories
         no_members: No members
-        widgets_inline_help: The widgets selected here will be used as defaults for new entries in this account. Changes do not affect existing entries.
+        theming_defaults_inline_help: The following settings will be used as defaults for new entries in this account. Changes do not affect existing entries.
+        widgets_inline_help: DELETED
       entries:
         add_folder: Add folder
         confirm_depublish: Unpublish this story?
@@ -979,6 +981,8 @@ en:
         captions: Audio Replacement Text Track
         descriptions: Image Description Text Track
         subtitles: Translation Text Track
+    default_theme:
+      name: Default
     delayed_text_fade_in:
       feature_name: Delayed text fade in
     devise:
@@ -1125,6 +1129,11 @@ en:
             ratio4to3Portrait: 4:3 Portrait
           save: Save
           title: Adjust position
+        change_theme_dialog:
+          close: Close
+          header: Themes
+          preview_header_prefix: Preview
+          preview_header_suffix: "-Theme"
         chapter_item:
           new_page: New page
           save_error: Errors were detected while saving this chapter.
@@ -1171,6 +1180,8 @@ en:
           outline: Outline
           retry: Retry
           save_error: Errors were detected while saving the storyline.
+        edit_widget:
+          back: Appearance
         embedded:
           page_link:
             reset: Reset
@@ -1207,8 +1218,8 @@ en:
           open_help: Open help
         inputs:
           reference:
-            edit: Edit
-            reset: Reset
+            edit: DELETED
+            reset: DELETED
         list_blank_slate:
           text: "(No items)"
         list_item:
@@ -1274,9 +1285,15 @@ en:
         text_tracks:
           edit_file_header: Metadata
           upload: Add
+        theme:
+          use: Use
+        widget_item:
+          settings: Settings
       text_track_files:
         label_missing: "(Label missing)"
         srclang_missing: "(Missing)"
+      themes:
+        header: Themes
       views:
         chapter_item_view:
           chapter: Chapter
@@ -1319,7 +1336,11 @@ en:
             edit_file_settings: File settings...
             no_default_text_track: "(None)"
           reference_input_view:
+            choose: Edit
             none: "(None)"
+            unset: Reset
+          theme_input_view:
+            choose: Change theme
         page_item_view:
           unnamed: "(New page)"
         page_link_item_view:
@@ -1638,6 +1659,8 @@ en:
       scroll_right: Scroll right
     quotas:
       exhausted: Quota exhausted
+    selectable_themes:
+      feature_name: Editor theme selection
     storyline_attributes:
       main:
         inline_help: Turns the first page of this storyline into the start page of the entry.

data/db/migrate/20170201074328_add_configuration_to_widgets.rb

@@ -0,0 +1,5 @@
+class AddConfigurationToWidgets < ActiveRecord::Migration
+  def change
+    add_column :pageflow_widgets, :configuration, :text
+  end
+end

data/db/migrate/20170222124848_update_video_file_output_presences.rb

@@ -2,7 +2,7 @@ class UpdateVideoFileOutputPresences < ActiveRecord::Migration
   def up
     execute(<<-SQL)
       UPDATE pageflow_video_files
-        SET output_presences = '{"high":true,"medium":true,"low":true}'
+        SET output_presences = '{"high":true,"medium":true,"low":true,"hls-playlist":true}'
         WHERE output_presences IS NULL;
     SQL
   end

data/db/migrate/20170315130000_add_theme_name_to_revisions.rb

@@ -0,0 +1,12 @@
+class AddThemeNameToRevisions < ActiveRecord::Migration
+  def change
+    add_column :pageflow_revisions, :theme_name, :string, null: false, default: 'default'
+
+    execute(<<-SQL)
+      UPDATE pageflow_revisions, pageflow_entries, pageflow_themings
+      SET pageflow_revisions.theme_name = pageflow_themings.theme_name
+      WHERE pageflow_revisions.entry_id = pageflow_entries.id
+      AND pageflow_entries.theming_id = pageflow_themings.id
+    SQL
+  end
+end

data/db/migrate/20170912165050_reset_copied_snapshot_type.rb

@@ -0,0 +1,24 @@
+class ResetCopiedSnapshotType < ActiveRecord::Migration
+  def up
+    fix_restored_drafts
+    fix_publications_created_from_restored_drafts
+  end
+
+  private
+
+  def fix_restored_drafts
+    execute(<<-SQL)
+      UPDATE pageflow_revisions
+        SET snapshot_type = NULL
+        WHERE frozen_at IS NULL;
+    SQL
+  end
+
+  def fix_publications_created_from_restored_drafts
+    execute(<<-SQL)
+      UPDATE pageflow_revisions
+        SET snapshot_type = NULL
+        WHERE published_at IS NOT NULL;
+    SQL
+  end
+end

data/lib/generators/pageflow/routes/routes_generator.rb

@@ -7,9 +7,19 @@ module Pageflow
 
       def add_route
         inject_into_file 'config/routes.rb', after: "  ActiveAdmin.routes(self)\n" do
-          "  Pageflow.routes(self)\n"
+          <<-HEREDOC
+  Pageflow.routes(self)
+
+  authenticate :user, lambda { |user| user.admin? } do
+    mount Resque::Server.new, at: "/background_jobs"
+  end
+          HEREDOC
         end
       end
+
+      def require_resque_server
+        prepend_to_file 'config/routes.rb', "require 'resque/server'\nrequire 'resque_scheduler/server'\n\n"
+      end
     end
   end
 end

data/lib/generators/pageflow/seeds/seeds_generator.rb

@@ -1,10 +1,15 @@
 require 'rails/generators'
+require 'securerandom'
 
 module Pageflow
   module Generators
     class SeedsGenerator < Rails::Generators::Base
       desc "Requires the pageflow seeds in db/seeds.rb"
 
+      argument :password,
+               default: SecureRandom.random_number(36**12).to_s(36).rjust(12, '0'),
+               desc: 'Default user password'
+
       source_root File.expand_path("../templates", __FILE__)
 
       def create_initializer

data/lib/generators/pageflow/seeds/templates/seeds.rb

@@ -1,8 +1,10 @@
+# This file was generated by Pageflow.
+# It will create example users for each of the Pageflow roles.
+# Feel free to edit or remove it; these entries are not required for Pageflow to function.
+
 include Pageflow::Seeds
 
-# Make sure to change the password if you intend to apply this seed to
-# a production system.
-default_user_password('!Pass123')
+default_user_password('<%= password %>')
 
 publisher_account = account(name: 'Acme Corporation')
 editor_account = account(name: 'General Products')

data/lib/generators/pageflow/theme/theme_generator.rb

@@ -15,6 +15,9 @@ module Pageflow
       def copy_template
         directory('themes', File.join('app', 'assets', 'stylesheets', 'pageflow', 'themes'))
         empty_directory(File.join('app', 'assets', 'images', 'pageflow', 'themes', name))
+        copy_file('preview.png', "app/assets/images/pageflow/themes/#{name}/preview.png")
+        copy_file('preview_thumbnail.png',
+                  "app/assets/images/pageflow/themes/#{name}/preview_thumbnail.png")
       end
     end
   end

data/lib/pageflow/ability_mixin.rb

@@ -1,6 +1,8 @@
 module Pageflow
   # Defines the default abilities for the Pageflow models.
   module AbilityMixin
+    include ActiveAdminCanCanFix
+
     # Call this in the ability initializer.
     def pageflow_default_abilities(user)
       return if user.nil?
@@ -13,8 +15,8 @@ module Pageflow
         AccountPolicy.new(user, account).update?
       end
 
-      can :index, Account do |account|
-        AccountPolicy.new(user, account).index?
+      can :update_feature_configuration_on, Account do |account|
+        AccountPolicy.new(user, account).update_feature_configuration_on?
       end
 
       can :add_member_to, Account do |account|
@@ -43,6 +45,18 @@ module Pageflow
         MembershipPolicy.new(user, membership).destroy?
       end
 
+      can :index, :users do
+        UserPolicy.new(user, User.new).index?
+      end
+
+      can :create_any, :users do
+        UserPolicy.new(user, User.new).create_any?
+      end
+
+      can :add_account_to, :users do
+        UserPolicy.new(user, User.new).add_account_to?
+      end
+
       can :set_admin, ::User do |managed_user|
         UserPolicy.new(user, managed_user).set_admin?
       end
@@ -59,6 +73,12 @@ module Pageflow
         AccountPolicy.new(user, Account.new).index?
       end
 
+      can :index, :entries
+
+      can :create_any, :entries do
+        EntryPolicy.new(user, Entry.new).create_any?
+      end
+
       can :see_own_role_on, :entries do
         !user.admin?
       end
@@ -202,14 +222,14 @@ module Pageflow
           UserPolicy.new(user, managed_user).create?
         end
 
-        can :index, ::User, UserPolicy::Scope.new(user, ::User).resolve do |managed_user|
-          UserPolicy.new(user, managed_user).index?
-        end
-
         can :read, ::User, UserPolicy::Scope.new(user, ::User).resolve do |managed_user|
           UserPolicy.new(user, managed_user).read?
         end
 
+        can :see_admin_status, ::User do |managed_user|
+          UserPolicy.new(user, managed_user).see_admin_status?
+        end
+
         can :redirect_to_user,
             ::User,
             UserPolicy::Scope.new(user, ::User).resolve do |managed_user|
@@ -223,6 +243,7 @@ module Pageflow
 
       if user.admin?
         can [:create, :configure_folder_on], Account
+        can :create_any, :accounts
         can :destroy, Account do |account|
           account.users.empty? && account.entries.empty?
         end

data/lib/pageflow/active_admin_can_can_fix.rb

@@ -0,0 +1,34 @@
+module Pageflow
+  # @api private
+  #
+  # ActiveAdmin passes class objects to CanCan when authorizing access
+  # to the "index" and "new resource" pages. CanCan does not evaluate
+  # `can` blocks when classes are passed as subjects. Since the above
+  # code relies on block evaluation for all but the `admin` case, this
+  # causes "new" buttons and menu items to be displayed even though
+  # access should not be permitted.
+  #
+  # see also https://github.com/activeadmin/activeadmin/issues/5144
+  #
+  # Detect these cases and pass the collection name as subject
+  # instead. To prevent collision with existing cases, rename actions:
+  #
+  #     :read, User  ->  :index, :users
+  #     :create, User  ->  :create_any, :users
+  module ActiveAdminCanCanFix
+    def can?(action, subject)
+      if [:read, :create].include?(action) &&
+         [Entry, Account, User].include?(subject)
+        collection_name = subject.name.demodulize.underscore.pluralize.to_sym
+
+        if action == :read
+          super(:index, collection_name)
+        elsif action == :create
+          super(:create_any, collection_name)
+        end
+      else
+        super
+      end
+    end
+  end
+end

data/lib/pageflow/configuration/permissions.rb

@@ -0,0 +1,27 @@
+module Pageflow
+  class Configuration
+    # Permissions related options to be defined in the pageflow
+    # initializer of the main app.
+    class Permissions
+      def initialize
+        @only_admins_may_update_features = false
+        @only_admins_may_see_admin_boolean = false
+        @only_admins_may_update_theming = false
+      end
+
+      # Restrict access to features tabs to admins. Defaults to false.
+      # @since 12.1
+      attr_accessor :only_admins_may_update_features
+
+      # Restrict visibility of admin flag on user admin page to
+      # admins. Defaults to false.
+      # @since 12.1
+      attr_accessor :only_admins_may_see_admin_boolean
+
+      # Restrict access to theming drop down on entry edit admin page
+      # to admins. Defaults to false.
+      # @since 12.1
+      attr_accessor :only_admins_may_update_theming
+    end
+  end
+end

data/lib/pageflow/configuration.rb

@@ -252,6 +252,25 @@ module Pageflow
     # take. Defaults to `[:captions, :subtitles, :descriptions]`.
     attr_reader :available_text_track_kinds
 
+    # Allow one user to be member of multiple accounts. Defaults to
+    # true.
+    # @since 12.1
+    attr_accessor :allow_multiaccount_users
+
+    # Options hash for account admin menu. Options from config precede
+    # defaults.
+    # @since 12.1
+    attr_accessor :account_admin_menu_options
+
+    # Sublayer for permissions related config.
+    # @since 12.1
+    attr_reader :permissions
+
+    # Defines the editor lock polling interval.
+    # @return [number]
+    # @since 12.1
+    attr_accessor :edit_lock_polling_interval
+
     def initialize
       @paperclip_filesystem_default_options = {validate_media_type: false}
       @paperclip_s3_default_options = {validate_media_type: false}
@@ -294,6 +313,14 @@ module Pageflow
       @authorize_user_deletion = lambda { |_user| true }
 
       @available_text_track_kinds = [:captions, :subtitles, :descriptions]
+
+      @allow_multiaccount_users = true
+
+      @account_admin_menu_options = {}
+
+      @permissions = Permissions.new
+
+      @edit_lock_polling_interval = 15.seconds
     end
 
     # Activate a plugin.
@@ -342,6 +369,7 @@ module Pageflow
       delegate :widget_types, to: :config
       delegate :help_entries, to: :config
       delegate :admin_form_inputs, to: :config
+      delegate :themes, to: :config
     end
   end
 end

data/lib/pageflow/engine.rb

@@ -15,6 +15,7 @@ require 'resque_mailer'
 require 'resque_scheduler'
 
 require 'active_admin'
+require 'activeadmin-searchable_select'
 
 require 'jquery-layout-rails'
 require 'backbone-rails'
@@ -57,25 +58,6 @@ module Pageflow
       config.i18n.reload!
     end
 
-    # Precompile additional assets. pageflow/editor.* has to be
-    # provided by the main app.
-    config.assets.precompile += %w(pageflow/editor.js pageflow/editor.css
-                                   pageflow/application_with_simulated_media_queries.css
-                                   pageflow/print_view.css
-                                   pageflow/lt_ie9.js pageflow/lt_ie9.css pageflow/ie9.js pageflow/ie9.css
-                                   video-js.swf vjs.eot vjs.svg vjs.ttf vjs.woff)
-
-    config.assets.precompile << lambda do |path, _filename|
-      Pageflow.config.themes.any? do |theme|
-        path == theme.stylesheet_path
-      end
-    end
-
-    config.assets.precompile << lambda do |path, filename|
-      filename.start_with?(Engine.root.join('app/assets').to_s) &&
-        !['.js', '.css', ''].include?(File.extname(path))
-    end
-
     # Make sure the configuration is recreated when classes are
     # reloded. Otherwise registered page types might still point to
     # unloaded classes in development mode.
@@ -88,5 +70,29 @@ module Pageflow
         FactoryGirl.definition_file_paths.unshift(Engine.root.join('spec', 'factories'))
       end
     end
+
+    # Precompile additional assets. pageflow/editor.* has to be
+    # provided by the main app.
+    initializer 'pageflow.assets.precompile' do |app|
+      app.config.assets.precompile += %w(
+        pageflow/editor.js pageflow/editor.css
+        pageflow/application_with_simulated_media_queries.css
+        pageflow/print_view.css
+        pageflow/lt_ie9.js pageflow/lt_ie9.css pageflow/ie9.js pageflow/ie9.css
+        pageflow/vendor.js
+        video-js.swf vjs.eot vjs.svg vjs.ttf vjs.woff
+      )
+
+      app.config.assets.precompile << lambda do |path, _filename|
+        Pageflow.config.themes.any? do |theme|
+          path == theme.stylesheet_path
+        end
+      end
+
+      app.config.assets.precompile << lambda do |path, filename|
+        filename.start_with?(Engine.root.join('app/assets').to_s) &&
+          !['.js', '.css', ''].include?(File.extname(path))
+      end
+    end
   end
 end

data/lib/pageflow/seeds.rb

@@ -54,7 +54,7 @@ module Pageflow
     # @return [Theming] newly built theming
     def build_default_theming_for(account, attributes = {}, &block)
       default_attributes = {
-        theme_name: Pageflow.config.themes.names.first,
+        theme_name: Pageflow.config_for(account).themes.names.first,
 
         imprint_link_label: 'Impressum',
         imprint_link_url: 'http://example.com/impressum.html',

data/lib/pageflow/theme.rb

@@ -12,6 +12,14 @@ module Pageflow
       "pageflow/themes/#{name}.css"
     end
 
+    def preview_image_path
+      "pageflow/themes/#{name}/preview.png"
+    end
+
+    def preview_thumbnail_path
+      "pageflow/themes/#{name}/preview_thumbnail.png"
+    end
+
     def has_home_button?
       !@options[:no_home_button]
     end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.0.4'.freeze
+  VERSION = '12.1.0'.freeze
 end

data/lib/pageflow/widget_type.rb

@@ -25,11 +25,24 @@ module Pageflow
       true
     end
 
+    # Override instead of render to use the widget
+    # configuration. Return html as string.
+    def render_with_configuration(template, entry, _configuration)
+      render(template, entry)
+    end
+
     # Override to return html as string.
     def render(template, entry)
       template.render(File.join('pageflow', name, 'widget'), entry: entry)
     end
 
+    # Override instead of render_head_fragment to use the widget
+    # configuration. Return html as string that should be placed in
+    # the head element of the page.
+    def render_head_fragment_with_configuration(template, entry, _configuration)
+      render_head_fragment(template, entry)
+    end
+
     # Override to return html that should be placed in the head
     # element of the page. Not supported inside the editor.
     def render_head_fragment(template, entry)