pageflow 12.1.0 → 12.2.0

data/app/views/pageflow/entries/show.html.erb

@@ -1,4 +1,5 @@
 <% @page_title = pretty_entry_title(@entry) %>
+<% @page_text_direction = text_direction(@entry.locale) %>
 
 <% content_for(:head) do %>
   <%= cache [@entry, :head, @entry.share_target] do %>
@@ -25,7 +26,7 @@
     pageflow.seed = <%= entry_json_seed(@entry) %>;
 
     pageflow.manualStart.enabled = <%= @entry.manual_start ? 'true' : 'false' %>;
-    pageflow.visited.enabled = <%= @entry.emphasize_new_pages ? 'true' : 'false' %>;
+    pageflow.Visited.enabled = <%= @entry.emphasize_new_pages ? 'true' : 'false' %>;
     pageflow.pages = pageflow.seed.pages;
     pageflow.audioFiles = <%= entry_audio_files_json_seed(@entry) %>;
     pageflow.entryId = <%= @entry.id %>;

data/config/initializers/admin_attributes_table_rows.rb

@@ -0,0 +1,3 @@
+Rails.application.config.to_prepare do
+  Arbre::Context.include(Pageflow::Admin::ExtensibleAttributesTable::BuilderMethods)
+end

data/config/locales/de.yml

@@ -1713,7 +1713,7 @@ de:
         label: Titel
     storylines:
       feature_name: Erzählstränge
-      main: Haupstrang
+      main: Hauptstrang
       untitled: Unbenannter Erzählstrang
     ui:
       configuration_editor:

data/lib/pageflow.rb

@@ -1,8 +1,10 @@
-require "pageflow/engine"
-require "pageflow/global_config_api"
+require 'pageflow/engine'
+require 'pageflow/global_config_api'
+require 'pageflow/news_item_api'
 
 module Pageflow
   extend GlobalConfigApi
+  extend NewsItemApi
 
   def self.routes(router)
     router.instance_eval do

data/lib/pageflow/ability_mixin.rb

@@ -235,6 +235,14 @@ module Pageflow
             UserPolicy::Scope.new(user, ::User).resolve do |managed_user|
           UserPolicy.new(user, managed_user).redirect_to_user?
         end
+
+        can :suspend, ::User do |managed_user|
+          UserPolicy.new(user, managed_user).suspend?
+        end
+
+        can :destroy, ::User do |managed_user|
+          UserPolicy.new(user, managed_user).destroy?
+        end
       end
 
       can :delete_own_user, ::User do |user_to_delete|

data/lib/pageflow/admin/attributes_table_rows.rb

@@ -0,0 +1,47 @@
+module Pageflow
+  # A registry of additional rows to display in attribute tables on
+  # admin pages.
+  #
+  # @since 12.2
+  module Admin
+    class AttributesTableRows
+      # @api private
+      def initialize
+        @rows = {}
+      end
+
+      # Insert an additional row into an attribute table.
+      #
+      # @param resource_name [Symbol] Either :entry, :account or :theming.
+      #
+      # @param name [Symbol] Name of the attribute to display.
+      #
+      # @param options [Hash] Supports same options as
+      #   ActiveAdmin::Views::AttributesTable#row, in addition to:
+      #
+      # @option options [Symbol] :before Insert row before row with
+      #   given name. Append to table if not found.
+      #
+      # @option options [Symbol] :after Insert row after row with
+      #   given name. Append to table if not found.
+      #
+      # @yieldparam resource [ActiveRecord::Base] A block which is
+      #   evaluated in the context of the Arbre template to render the
+      #   contents of the cell.
+      def register(resource_name, name, options = {}, &block)
+        @rows[resource_name] ||= []
+        @rows[resource_name] << {
+          name: name,
+          block: block,
+          options: options.except(:before, :after),
+          **options.slice(:before, :after)
+        }
+      end
+
+      # @api private
+      def for(resource_name)
+        @rows.fetch(resource_name, [])
+      end
+    end
+  end
+end

data/lib/pageflow/configuration.rb

@@ -192,14 +192,30 @@ module Pageflow
     #
     # @example
     #
-    #     config.admin_form_inputs.register(:entry) do |form|
-    #       form.input(:custom_field)
-    #     end
+    #     config.admin_form_inputs.register(:entry, :custom_field) do
     #
     # @since 0.9
     # @return [Admin::FormInputs]
     attr_reader :admin_form_inputs
 
+    # Insert additional rows into admin attributes tables.
+    #
+    # @example
+    #
+    #     config.admin_attributes_table_rows.register(:entry, :custom)
+    #     config.admin_attributes_table_rows.register(:entry, :my_attribute, after: :title)
+    #     config.admin_attributes_table_rows.register(:entry, :some_attribute, before: :updated_at)
+    #
+    # @example Custom content
+    #
+    #     config.admin_attributes_table_rows.register(:entry, :custom) do |entry|
+    #       span(entry.custom_attribute)
+    #     end
+    #
+    # @since 12.2
+    # @return [Admin::AttributesTableRows]
+    attr_reader :admin_attributes_table_rows
+
     # Array of locales which can be chosen as interface language by a
     # user. Defaults to `[:en, :de]`.
     # @since 0.7
@@ -271,6 +287,12 @@ module Pageflow
     # @since 12.1
     attr_accessor :edit_lock_polling_interval
 
+    # News collection to add items to. Can be used to integrate
+    # Pageflow with Krant (see https://github.com/codevise/krant).
+    # @return [#item]
+    # @since 12.2
+    attr_accessor :news
+
     def initialize
       @paperclip_filesystem_default_options = {validate_media_type: false}
       @paperclip_s3_default_options = {validate_media_type: false}
@@ -300,6 +322,7 @@ module Pageflow
 
       @admin_resource_tabs = Pageflow::Admin::Tabs.new
       @admin_form_inputs = Pageflow::Admin::FormInputs.new
+      @admin_attributes_table_rows = Pageflow::Admin::AttributesTableRows.new
 
       @available_locales = [:en, :de]
       @available_public_locales = PublicI18n.available_locales
@@ -369,6 +392,7 @@ module Pageflow
       delegate :widget_types, to: :config
       delegate :help_entries, to: :config
       delegate :admin_form_inputs, to: :config
+      delegate :admin_attributes_table_rows, to: :config
       delegate :themes, to: :config
     end
   end

data/lib/pageflow/engine.rb

@@ -21,6 +21,7 @@ require 'jquery-layout-rails'
 require 'backbone-rails'
 require 'marionette-rails'
 require 'jquery-fileupload-rails'
+require 'jquery-minicolors-rails'
 require 'wysihtml5x/rails'
 require 'i18n-js'
 require 'http_accept_language'

data/lib/pageflow/news_item_api.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  # Api for plugins to contribute news items for the news collection
+  # configured via `config.news`.  Included in the Pageflow module to
+  # provide `news_item` class method.
+  module NewsItemApi
+    # Add a item to the news collection configured via
+    # `Configuration#news`. Intended to be used with Krant (see
+    # https://github.com/codevise/krant). See Krant's readme for
+    # details on the supported parameters.
+    #
+    # @since 12.2
+    def news_item(name, options)
+      after_global_configure do |config|
+        config.news.item(name, options) if config.news
+      end
+    end
+  end
+end

data/lib/pageflow/version.rb

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

data/spec/factories/accounts.rb

@@ -6,14 +6,14 @@ FactoryGirl.define do
       account.default_theming ||= build(:theming, account: account)
     end
 
-    # inline membership creation
-
     transient do
       with_member nil
       with_previewer nil
       with_editor nil
       with_publisher nil
       with_manager nil
+
+      with_feature nil
     end
 
     after(:create) do |account, evaluator|
@@ -38,5 +38,10 @@ FactoryGirl.define do
              user: evaluator.with_manager,
              role: :manager) if evaluator.with_manager
     end
+
+    after(:build) do |entry, evaluator|
+      entry.features_configuration =
+        entry.features_configuration.merge(evaluator.with_feature => true)
+    end
   end
 end

data/spec/factories/entries.rb

@@ -13,13 +13,13 @@ module Pageflow
         entry.theming ||= entry.account.default_theming
       end
 
-      # inline membership creation
-
       transient do
         with_previewer nil
         with_editor nil
         with_publisher nil
         with_manager nil
+
+        with_feature nil
       end
 
       after(:create) do |entry, evaluator|
@@ -41,6 +41,11 @@ module Pageflow
                role: :manager) if evaluator.with_manager
       end
 
+      after(:build) do |entry, evaluator|
+        entry.features_configuration =
+          entry.features_configuration.merge(evaluator.with_feature => true)
+      end
+
       trait :published do
         transient do
           published_revision_attributes({})

data/vendor/assets/javascripts/iscroll.js

@@ -1,6 +1,7 @@
 /*jshint trailing: false*/
 /*! iScroll v5.0.4 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
 var IScroll = (function (window, document, Math) {
+
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
 	window.mozRequestAnimationFrame		||
@@ -138,21 +139,13 @@ var utils = (function () {
 		e.className = e.className.replace(re, '');
 	};
 
-	me.offset = function (el) {
-		var left = -el.offsetLeft,
-			top = -el.offsetTop;
-
-		// jshint -W084
-		while (el = el.offsetParent) {
-			left -= el.offsetLeft;
-			top -= el.offsetTop;
-		}
-		// jshint +W084
+	me.isDirLtr = function (el) {
+		var styles = window.getComputedStyle(el);
+		return styles.direction == 'ltr';
+	};
 
-		return {
-			left: left,
-			top: top
-		};
+	me.offsetRight = function (e) {
+		return e.offsetParent ? e.offsetParent.offsetWidth - e.offsetLeft - e.offsetWidth : 0;
 	};
 
 	me.extend(me.eventType = {}, {
@@ -257,7 +250,7 @@ function IScroll (el, options) {
 
 		snapThreshold: 0.334,
 
-// INSERT POINT: OPTIONS 
+// INSERT POINT: OPTIONS
 
 		startX: 0,
 		startY: 0,
@@ -312,11 +305,12 @@ function IScroll (el, options) {
 
 // INSERT POINT: NORMALIZATION
 
-	// Some defaults	
+	// Some defaults
 	this.x = 0;
 	this.y = 0;
 	this.directionX = 0;
 	this.directionY = 0;
+	this.dir = utils.isDirLtr(this.wrapper) ? 1 : -1;
 	this._events = {};
 
 // INSERT POINT: DEFAULTS
@@ -430,7 +424,7 @@ IScroll.prototype = {
 		}
 
 		var point		= e.touches ? e.touches[0] : e,
-			deltaX		= this.hasHorizontalScroll ? point.pageX - this.pointX : 0,
+			deltaX		= this.dir * (this.hasHorizontalScroll ? point.pageX - this.pointX : 0),
 			deltaY		= this.hasVerticalScroll   ? point.pageY - this.pointY : 0,
 			timestamp	= utils.getTime(),
 			newX, newY,
@@ -687,7 +681,7 @@ IScroll.prototype = {
 		this.directionX = 0;
 		this.directionY = 0;
 
-		this.wrapperOffset = utils.offset(this.wrapper);
+		this.wrapperOffset = this.offset(this.wrapper);
 
 		this._execEvent('refresh');
 
@@ -756,10 +750,10 @@ IScroll.prototype = {
 			return;
 		}
 
-		var pos = utils.offset(el);
+		var pos = this.offset(el);
 
-		pos.left -= this.wrapperOffset.left;
-		pos.top  -= this.wrapperOffset.top;
+		pos.x -= this.wrapperOffset.x;
+		pos.y  -= this.wrapperOffset.y;
 
 		// if offsetX/Y are true we center the element to the screen
 		if ( offsetX === true ) {
@@ -769,15 +763,15 @@ IScroll.prototype = {
 			offsetY = Math.round(el.offsetHeight / 2 - this.wrapper.offsetHeight / 2);
 		}
 
-		pos.left -= offsetX || 0;
-		pos.top  -= offsetY || 0;
+		pos.x -= offsetX || 0;
+		pos.y  -= offsetY || 0;
 
-		pos.left = pos.left > 0 ? 0 : pos.left < this.maxScrollX ? this.maxScrollX : pos.left;
-		pos.top  = pos.top  > 0 ? 0 : pos.top  < this.maxScrollY ? this.maxScrollY : pos.top;
+		pos.x = pos.x > 0 ? 0 : pos.x < this.maxScrollX ? this.maxScrollX : pos.x;
+		pos.y  = pos.y  > 0 ? 0 : pos.y  < this.maxScrollY ? this.maxScrollY : pos.y;
 
-		time = time === undefined || time === null || time === 'auto' ? Math.max(Math.abs(pos.left)*2, Math.abs(pos.top)*2) : time;
+		time = time === undefined || time === null || time === 'auto' ? Math.max(Math.abs(pos.x)*2, Math.abs(pos.y)*2) : time;
 
-		this.scrollTo(pos.left, pos.top, time, easing);
+		this.scrollTo(pos.x, pos.y, time, easing);
 	},
 
 	_transitionTime: function (time) {
@@ -819,7 +813,7 @@ IScroll.prototype = {
 
 /* REPLACE START: _translate */
 
-			this.scrollerStyle[utils.style.transform] = 'translate(' + x + 'px,' + y + 'px)' + this.translateZ;
+			this.scrollerStyle[utils.style.transform] = 'translate(' + (this.dir * x) + 'px,' + y + 'px)' + this.translateZ;
 
 /* REPLACE END: _translate */
 
@@ -878,13 +872,34 @@ IScroll.prototype = {
 		eventType(this.scroller, 'MSTransitionEnd', this);
 	},
 
+	offsetX: function (el) {
+		return this.dir > 0 ? el.offsetLeft : utils.offsetRight(el);
+	},
+
+	offset: function (el) {
+		var x = -this.offsetX(el),
+		y = -el.offsetTop;
+
+		// jshint -W084
+		while (el = el.offsetParent) {
+			x -= this.offsetX(el);
+			y -= el.offsetTop;
+		}
+		// jshint +W084
+
+		return {
+			x: x,
+			y: y
+		};
+	},
+
 	getComputedPosition: function () {
 		var matrix = window.getComputedStyle(this.scroller, null),
 			x, y;
 
 		if ( this.options.useTransform ) {
 			matrix = matrix[utils.style.transform].split(')')[0].split(', ');
-			x = +(matrix[12] || matrix[4]);
+			x = this.dir * (matrix[12] || matrix[4]);
 			y = +(matrix[13] || matrix[5]);
 		} else {
 			x = +matrix.left.replace(/[^-\d]/g, '');
@@ -1098,7 +1113,7 @@ IScroll.prototype = {
 				n = -1;
 
 				for ( ; i < l; i++ ) {
-					if ( i === 0 || el[i].offsetLeft <= el[i-1].offsetLeft ) {
+					if ( i === 0 || this.offsetX(el[i]) <= this.offsetX(el[i-1]) ) {
 						m = 0;
 						n++;
 					}
@@ -1107,7 +1122,7 @@ IScroll.prototype = {
 						this.pages[m] = [];
 					}
 
-					x = Math.max(-el[i].offsetLeft, this.maxScrollX);
+					x = Math.max(-this.offsetX(el[i]), this.maxScrollX);
 					y = Math.max(-el[i].offsetTop, this.maxScrollY);
 					cx = x - Math.round(el[i].offsetWidth / 2);
 					cy = y - Math.round(el[i].offsetHeight / 2);
@@ -1435,7 +1450,7 @@ IScroll.prototype = {
 			if ( now >= destTime ) {
 				that.isAnimating = false;
 				that._translate(destX, destY);
-				
+
 				if ( !that.resetPosition(that.options.bounceTime) ) {
 					that._execEvent('scrollEnd');
 				}
@@ -1736,7 +1751,7 @@ Indicator.prototype = {
 				this.indicatorWidth = this.indicator.clientWidth;
 			}
 			this.maxPosX = this.wrapperWidth - this.indicatorWidth;
-			this.sizeRatioX = this.options.speedRatioX || (this.scroller.maxScrollX && (this.maxPosX / this.scroller.maxScrollX));	
+			this.sizeRatioX = this.options.speedRatioX || (this.scroller.maxScrollX && (this.maxPosX / this.scroller.maxScrollX));
 		}
 
 		if ( this.options.listenY ) {
@@ -1770,7 +1785,7 @@ Indicator.prototype = {
 				y = 0;
 			} else if ( y > this.maxPosY ) {
 				y = this.maxPosY;
-			}		
+			}
 		}
 
 		this.x = x;