pageflow 12.1.0 → 12.2.0

data/app/assets/stylesheets/pageflow/themes/default/page/line_lengths.scss

@@ -37,9 +37,8 @@ $page-content-width: 60% !default;
     width: 100%;
   }
 
-  // see pageflow/page.scss
-  $page-padding-left: 8%;
-  $page-padding-right: 14%;
+  $page-padding-left: $page-scroller-padding-left;
+  $page-padding-right: $page-scroller-padding-right;
   $page-content-wrapper-width: 100% - $page-padding-left - $page-padding-right;
 
   // On pages that support split layout (i.e. some kind of
@@ -82,17 +81,13 @@ $page-content-width: 60% !default;
   }
 
   &.text_position_right {
-    .contentText > * {
-      margin-left: auto;
-    }
-
     h1,
     h2 .subtitle,
     h2 .title,
     h2 .tagline,
     h3,
     p {
-      margin-left: auto;
+      @include margin-start(auto);
       max-width: $page-content-position-right-max-width;
       width: 60%;
 

data/app/assets/stylesheets/pageflow/themes/default/page/paddings.scss

@@ -0,0 +1,72 @@
+////
+/// @group page-typography
+////
+
+/// Space around page text inside scroller.
+$page-scroller-padding-top: 15% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-mobile-padding-top: 25% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-mobile-landscape-padding-top: 10% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-padding-bottom: 5% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-padding-left: 8% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-padding-right: 8% !default;
+
+/// Space around page text inside scroller.
+$page-scroller-mobile-padding-right: 8% !default;
+
+/// Space for logo on first page.
+$page-scroller-first-page-padding-top: null !default;
+
+/// Space for logo on first page in mobile layout.
+$page-scroller-first-page-mobile-padding-top: 110px !default;
+
+/// Space for logo on first page in mobile landscape layout.
+$page-scroller-first-page-mobile-landscape-padding-top: 100px !default;
+
+/// Space for logo on first page in phone layout.
+$page-scroller-first-page-phone-padding-top: null !default;
+
+.page {
+  .scroller > div {
+    padding: $page-scroller-padding-top
+               $page-scroller-padding-right
+               $page-scroller-padding-bottom
+               $page-scroller-padding-left;
+
+    @include mobile {
+      padding-top: $page-scroller-mobile-padding-top;
+      padding-right: $page-scroller-mobile-padding-right;
+
+      @media (orientation: landscape) {
+        padding-top: $page-scroller-mobile-landscape-padding-top;
+      }
+    }
+  }
+}
+
+.page:first-child {
+  .scroller > div {
+    padding-top: $page-scroller-first-page-padding-top;
+
+    @include mobile {
+      padding-top: $page-scroller-first-page-mobile-padding-top;
+
+      @media (orientation: landscape) {
+        padding-top: $page-scroller-first-page-mobile-landscape-padding-top;
+      }
+    }
+
+    @include phone {
+      padding-top: $page-scroller-first-page-phone-padding-top;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/page/scroller.scss

@@ -0,0 +1,3 @@
+.page .scroller {
+  @extend %pageflow_widget_margin_right !optional;
+}

data/app/assets/stylesheets/pageflow/themes/default/page/shadow.scss

@@ -0,0 +1,27 @@
+/// Color of the gradient
+/// @group page-colors
+$page-shadow-color: #000 !default;
+
+/// Color of the gradient on inverted pages
+/// @group page-colors
+$page-shadow-inverted-color: #fff !default;
+
+.page {
+  .shadow {
+    @include shadow-start($page-shadow-color);
+  }
+
+  &.invert {
+    .shadow {
+      @include shadow-start($page-shadow-inverted-color);
+    }
+  }
+
+  &.text_position_right .shadow {
+    @include shadow-end($page-shadow-color);
+  }
+
+  &.invert.text_position_right .shadow {
+    @include shadow-end($page-shadow-inverted-color);
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/control_bar.scss

@@ -48,6 +48,7 @@ $classic-player-controls-timestamp-position: "left" !default;
 
 %player_controls {
   &-control_bar {
+    direction: ltr;
     position: absolute;
     left: 50%;
     bottom: 100%;

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/container.scss

@@ -7,7 +7,7 @@ $slim-player-controls-typography: $player-controls-typography !default;
 
 %player_controls {
   &-container,
-  &-background {
+  &-background::after {
     @include transition(opacity 0.2s linear, visibility 0.2s linear);
   }
 

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

@@ -1,8 +1,10 @@
 @import "bourbon";
+@import "jquery.minicolors";
 @import "pageflow/mixins";
 
 %pageflow-ui {
   @import "./ui/forms";
+  @import "./ui/input/color_input";
   @import "./ui/table_view";
   @import "./ui/table_cells/presence_table_cell";
   @import "./ui/table_cells/delete_row_table_cell";

data/app/assets/stylesheets/pageflow/ui/input/color_input.scss

@@ -0,0 +1,25 @@
+.color_input {
+  .minicolors {
+    box-sizing: border-box;
+    width: 100%;
+    padding-right: 24px;
+  }
+
+  input {
+    padding-left: 26px;
+    width: 100%;
+  }
+
+  .minicolors-input-swatch {
+    top: 3px;
+    left: 2px;
+  }
+
+  &.is_default input {
+    color: #888;
+  }
+
+  .minicolors-focus input {
+    color: #000;
+  }
+}

data/app/controllers/pageflow/application_controller.rb

@@ -15,16 +15,19 @@ module Pageflow
 
     include EditLocking
 
-    rescue_from ActionController::UnknownFormat do
+    rescue_from ActionController::UnknownFormat do |exception|
+      debug_log_with_backtrace(exception)
       render(status: 404, text: 'Not found')
     end
 
-    rescue_from ActiveRecord::RecordNotFound do
+    rescue_from ActiveRecord::RecordNotFound do |exception|
+      debug_log_with_backtrace(exception)
       respond_to do |format|
         format.html do
           begin
             render file: Rails.public_path.join('pageflow', 'error_pages', '404.html'), status: :not_found
-          rescue ActionView::MissingTemplate
+          rescue ActionView::MissingTemplate => exception
+            debug_log_with_backtrace(exception)
             head :not_found
           end
         end
@@ -33,6 +36,7 @@ module Pageflow
     end
 
     rescue_from CanCan::AccessDenied do |exception|
+      debug_log_with_backtrace(exception)
       respond_to do |format|
         format.html { redirect_to main_app.admin_root_path, :alert => t('pageflow.unauthorized') }
         format.any(:json, :css) { head :forbidden }
@@ -40,6 +44,7 @@ module Pageflow
     end
 
     rescue_from StateMachine::InvalidTransition do |exception|
+      debug_log_with_backtrace(exception)
       respond_to do |format|
         format.html { redirect_to main_app.admin_root_path, :alert => t('pageflow.invalid_transition') }
         format.json { head :bad_request }
@@ -63,5 +68,14 @@ module Pageflow
     def locale_from_accept_language_header
       http_accept_language.compatible_language_from(I18n.available_locales)
     end
+
+    def debug_log_with_backtrace(exception)
+      Rails.logger.debug exception
+      backtrace = ''
+      exception.backtrace.each do |line|
+        backtrace << line
+      end
+      Rails.logger.debug backtrace
+    end
   end
 end

data/app/helpers/pageflow/overview_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module OverviewHelper
+    def overview_page_description(page)
+      if page.configuration['description'].present?
+        raw(page.configuration['description'])
+      else
+        page.title
+      end
+    end
+  end
+end

data/app/helpers/pageflow/text_direction_helper.rb

@@ -0,0 +1,7 @@
+module Pageflow
+  module TextDirectionHelper
+    def text_direction(locale)
+      PublicI18n.text_direction(locale)
+    end
+  end
+end

data/app/policies/pageflow/user_policy.rb

@@ -65,6 +65,14 @@ module Pageflow
       read?
     end
 
+    def suspend?
+      deny_sign_in?
+    end
+
+    def destroy?
+      deny_sign_in?
+    end
+
     def admin?
       @user.admin?
     end
@@ -84,5 +92,17 @@ module Pageflow
     def delete_own_user?
       Pageflow.config.authorize_user_deletion.call(@managed_user) == true
     end
+
+    private
+
+    attr_reader :managed_user
+
+    def deny_sign_in?
+      if Pageflow.config.allow_multiaccount_users
+        user.admin?
+      else
+        AccountRoleQuery.new(user, managed_user.accounts.first).has_at_least_role?(:manager)
+      end
+    end
   end
 end

data/app/views/admin/accounts/_account_details.html.arb

@@ -1,5 +1,7 @@
-attributes_table_for account do
-  row :name, :class => 'name'
-  row :default_file_rights, :class => 'default_file_rights'
+extensible_attributes_table_for(account,
+                                Pageflow.config_for(account)
+                                  .admin_attributes_table_rows.for(:account)) do
+  row :name, class: 'name'
+  row :default_file_rights, class: 'default_file_rights'
   row :created_at
 end

data/app/views/admin/accounts/_theming_details.html.arb

@@ -1,6 +1,8 @@
-attributes_table_for account.default_theming do
-  row :cname, :class => 'cname'
-  row :theme, :class => 'theme' do
+extensible_attributes_table_for(account.default_theming,
+                                Pageflow.config_for(account)
+                                  .admin_attributes_table_rows.for(:theming)) do
+  row :cname, class: 'cname'
+  row :theme, class: 'theme' do
     account.default_theming.theme.name
   end
   row :default_author, class: 'default_author'

data/app/views/admin/entries/_attributes_table.html.arb

@@ -1,4 +1,6 @@
-attributes_table_for entry do
+extensible_attributes_table_for(entry,
+                                Pageflow.config_for(entry)
+                                  .admin_attributes_table_rows.for(:entry)) do
   row :title, :class => 'title'
   if authorized?(:see_own_role_on, :entries)
     row :own_role do

data/app/views/components/pageflow/admin/extensible_attributes_table.rb

@@ -0,0 +1,88 @@
+module Pageflow
+  module Admin
+    class ExtensibleAttributesTable < ActiveAdmin::Views::AttributesTable
+      module BuilderMethods
+        def extensible_attributes_table_for(model, additional_rows, &block)
+          attributes_table_for(model) do
+            row_inserter = RowInserter.new(self, additional_rows)
+            RowDelegator.new(self, row_inserter).instance_eval(&block)
+            row_inserter.at_end_of_table
+          end
+        end
+      end
+
+      class RowInserter
+        def initialize(context, additional_rows)
+          @context = context
+          @additional_rows = additional_rows
+          @rendered_rows = []
+        end
+
+        def row(name, options = {}, &block)
+          render_additional_rows(rows_at(:before, name))
+          context.row(name, options, &block)
+          render_additional_rows(rows_at(:after, name))
+        end
+
+        def at_end_of_table
+          render_additional_rows(not_yet_rendered_rows)
+        end
+
+        private
+
+        attr_reader :context, :additional_rows, :rendered_rows
+
+        def render_additional_rows(additional_rows)
+          additional_rows.each do |additional_row|
+            block =
+              additional_row[:block] &&
+              ->(*args) { context.instance_exec(*args, &additional_row[:block]) }
+
+            context.row(additional_row[:name],
+                        additional_row[:options],
+                        &block)
+          end
+
+          rendered_rows.concat(additional_rows)
+        end
+
+        def rows_at(position, name)
+          additional_rows.select { |additional_row| additional_row[position] == name }
+        end
+
+        def not_yet_rendered_rows
+          additional_rows - rendered_rows
+        end
+      end
+
+      class RowDelegator
+        def initialize(context, row_handler)
+          @context = context
+          @row_handler = row_handler
+        end
+
+        def row(name, options = {}, &block)
+          @row_handler.row(name, options, &block)
+        end
+
+        private
+
+        def respond_to_missing?(name, _include_private = false)
+          @context.respond_to?(name)
+        end
+
+        # rubocop:disable Style/MethodMissing
+        # Normally we would delegate to super if context does not
+        # respond_to? method. But Arbre appears to report not to
+        # repond to helpers like authorized? even if it does.
+        #
+        # This is also the reason we can not use SimpleDelegator here
+        # and also delegate_missing in Rails 5 would not work.
+        def method_missing(method, *args, &block)
+          @context.public_send(method, *args, &block)
+        end
+        # rubocop:enable Style/MethodMissing
+      end
+    end
+  end
+end

data/app/views/layouts/pageflow/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<%= content_tag(:html, lang: I18n.locale) do %>
+<%= content_tag(:html, lang: I18n.locale, dir: @page_text_direction) do %>
 <head>
   <title><%= @page_title.presence || 'Pageflow' %></title>
 

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

@@ -9,7 +9,7 @@
 <% end %>
 
 <main class="ui-layout-center">
-  <div id="entry_preview"></div>
+  <%= content_tag(:div, '', id: 'entry_preview', dir: text_direction(@entry.locale)) %>
   <div id="main_content"></div>
   <div id="editor_indicators"></div>
 </main>

data/app/views/pageflow/entries/overview/_page.html.erb

@@ -1,6 +1,8 @@
 <%= link_to "##{page.perma_id}", :class => "ov_page #{page.template}", :data => {:link => page.id} do %>
     <div class="ov_page_description">
-      <p><%= raw(page.configuration['description']) unless page.configuration.blank? %></p>
+      <p>
+        <%= overview_page_description(page) %>
+      </p>
     </div>
     <%= image_tag("#{page.thumbnail_url(:thumbnail_overview_desktop)}") %>
     <div class="pictogram"></div>