pageflow 0.10.0 → 0.11.0

data/admins/pageflow/membership.rb

@@ -11,6 +11,7 @@ module Pageflow
       belongs_to :user, :parent_class => User, :polymorphic => true
 
       helper Pageflow::Admin::MembershipsHelper
+      helper Pageflow::Admin::FormHelper
 
       def permitted_params
         params.permit(:membership => [:user_id, :entry_id])

data/admins/pageflow/revisions.rb

@@ -21,6 +21,8 @@ module Pageflow
     controller do
       include EditLocking
 
+      helper Pageflow::Admin::FormHelper
+
       def permitted_params
         params.permit(:revision => [:published_until])
       end

data/admins/pageflow/user.rb

@@ -27,7 +27,7 @@ module Pageflow
     filter :first_name
     filter :email
 
-    action_item :only => :index do
+    action_item(:invite, only: :index) do
       link_to I18n.t('pageflow.admin.users.invite_user'), new_admin_user_path, :data => {:rel => 'invite_user'}
     end
 
@@ -61,37 +61,44 @@ module Pageflow
         end
 
         panel I18n.t('activerecord.models.entry.other') do
-          if user.memberships.any?
-            table_for user.memberships, :class => 'memberships', :i18n => Membership do
-              column :entry do |membership|
+          embedded_index_table(user.memberships.includes(:entry).references(:pageflow_entry),
+                               blank_slate_text: I18n.t('pageflow.admin.users.empty')) do
+            table_for_collection sortable: true, class: 'memberships', i18n: Membership do
+              column :entry, sortable: 'pageflow_entries.title' do |membership|
                 link_to(membership.entry.title, admin_entry_path(membership.entry))
               end
+              column :created_at, sortable: 'pageflow_memberships.created_at'
               column do |membership|
                 if authorized?(:destroy, membership)
-                  link_to(I18n.t('pageflow.admin.users.delete'), admin_user_membership_path(user, membership), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation'), :rel => 'delete_membership'})
+                  link_to(I18n.t('pageflow.admin.users.delete'),
+                          admin_user_membership_path(user, membership),
+                          method: :delete,
+                          data: {
+                            confirm: I18n.t('active_admin.delete_confirmation'),
+                            rel: 'delete_membership'
+                          })
                 end
               end
             end
-          else
-            div :class => "blank_slate_container" do
-              span :class => "blank_slate" do
-                I18n.t('pageflow.admin.users.empty')
-              end
-            end
           end
 
           span do
-            link_to I18n.t('pageflow.admin.users.add_entry'), new_admin_user_membership_path(user), :class => 'button', :data => {:rel => 'add_membership'}
+            link_to(I18n.t('pageflow.admin.users.add_entry'),
+                    new_admin_user_membership_path(user),
+                    class: 'button',
+                    data: {
+                      rel: 'add_membership'
+                    })
           end
         end
       end
     end
 
-    action_item :only => :show do
+    action_item(:edit, only: :show) do
       link_to I18n.t('pageflow.admin.users.edit'), edit_admin_user_path(user), :data => {:rel => 'edit_user'}
     end
 
-    action_item :only => :show do
+    action_item(:toggle_suspended, only: :show) do
       if user != current_user
         if user.suspended?
           link_to I18n.t('pageflow.admin.users.unsuspend'), unsuspend_admin_user_path(user), :method => :post, :data => {:rel => 'unsuspend_user'}
@@ -101,7 +108,7 @@ module Pageflow
       end
     end
 
-    action_item :only => :show do
+    action_item(:delete, only: :show) do
       if user != current_user
         link_to I18n.t('pageflow.admin.users.delete'), admin_user_path(user), :method => :delete, :data => {:rel => 'delete_user', :confirm => I18n.t('pageflow.admin.users.confirm_delete')}
       end
@@ -120,7 +127,8 @@ module Pageflow
 
     collection_action 'delete_me', :title => I18n.t('pageflow.admin.users.account'), :method => [:get, :delete] do
       if request.delete?
-        if current_user.destroy_with_password(params.require(:user)[:current_password])
+        if authorized?(:delete_own_user, current_user) &&
+           current_user.destroy_with_password(params.require(:user)[:current_password])
           redirect_to admin_root_path, :notice => I18n.t('pageflow.admin.users.me.updated')
         end
       end
@@ -146,6 +154,7 @@ module Pageflow
 
       helper Pageflow::Admin::UsersHelper
       helper Pageflow::Admin::LocalesHelper
+      helper Pageflow::Admin::FormHelper
       helper Pageflow::QuotaHelper
 
       def build_new_resource

data/app/assets/javascripts/pageflow/admin.js

@@ -1,2 +1,4 @@
+//= require jquery-ui/droppable
+
 //= require ./admin/accounts
 //= require ./admin/entries

data/app/assets/javascripts/pageflow/admin/entries.js

@@ -35,7 +35,7 @@ jQuery(function($) {
 
         drop: function(event, ui) {
           var folderId = $(this).data('id');
-          var entryId = $(ui.draggable).attr('id').replace('entry_', '');
+          var entryId = $(ui.draggable).attr('id').replace('pageflow_entry_', '');
 
           $.ajax({
             url: '/admin/entries/' + entryId,

data/app/assets/javascripts/pageflow/base.js

@@ -46,6 +46,7 @@
 //= require ./print_layout
 //= require ./history
 //= require ./manual_start
+//= require ./widgets
 //= require ./widget_types
 //= require ./built_in_widget_types
 //= require ./links
@@ -54,6 +55,7 @@
 //= require ./fullscreen
 //= require ./multimedia_alert
 //= require ./native_scrolling
+//= require ./focus_outline
 
 //= require ./settings
 

data/app/assets/javascripts/pageflow/browser/agent.js

@@ -1,3 +1,7 @@
+/**
+ * Detect browser via user agent. Use only if feature detection is not
+ * an option.
+ */
 pageflow.browser.agent = {
   matchesSilk: function() {
     return navigator.userAgent.match(/\bSilk\b/);
@@ -15,11 +19,43 @@ pageflow.browser.agent = {
     });
   },
 
+  /**
+   * Returns true on iOS Safari.
+   * @return {boolean}
+   */
+  matchesMobileSafari: function() {
+    var matchers = [/iPod/i, /iPad/i, /iPhone/i];
+
+    return _.any(matchers, function(matcher) {
+      return navigator.userAgent.match(matcher);
+    });
+  },
+
+  /**
+   * Returns true on iOS or Android.
+   * @return {boolean}
+   */
   matchesMobilePlatform: function() {
     var matchers = [/iPod/i, /iPad/i, /iPhone/i, /Android/i, /Silk/i, /IEMobile/i];
 
     return _.any(matchers, function(matcher) {
       return navigator.userAgent.match(matcher);
     });
+  },
+
+  /**
+   * Returns true on Internet Explorser version 9, 10 and 11.
+   * @return {boolean}
+   */
+  matchesIEUpTo11: function() {
+    return navigator.userAgent.match(/Trident\//);
+  },
+
+  /**
+   * Returns true in InApp browser of Facebook app.
+   * @return {boolean}
+   */
+  matchesFacebookInAppBrowser: function() {
+    return navigator.userAgent.match(/FBAN/) && navigator.userAgent.match(/FBAV/);
   }
 };

data/app/assets/javascripts/pageflow/browser/facebook.js

@@ -0,0 +1,10 @@
+// Facebook app displays a toolbar at the bottom of the screen on iOS
+// phone which hides parts of the browser viewport. Normally this is
+// hidden once the user scrolls, but since there is no native
+// scrolling in Pageflow, the bar stays and hides page elements like
+// the slim player controls.
+pageflow.browser.feature('facebook toolbar', function(has) {
+  return has.all(has('ios platform'),
+                 has('phone platform'),
+                 pageflow.browser.agent.matchesFacebookInAppBrowser());
+});

data/app/assets/javascripts/pageflow/browser/ios_platform.js

@@ -1,6 +1,3 @@
 pageflow.browser.feature('ios platform', function() {
-  var matchers = [/iPod/i, /iPad/i, /iPhone/i];
-  return _.any(matchers, function(matcher) {
-    return navigator.userAgent.match(matcher);
-  });
+  return pageflow.browser.agent.matchesMobileSafari();
 });

data/app/assets/javascripts/pageflow/editor/models/theming.js

@@ -9,6 +9,10 @@ pageflow.Theming = Backbone.Model.extend({
     return this.get('home_button');
   },
 
+  hasOverviewButton: function() {
+    return this.get('overview_button');
+  },
+
   supportsEmphasizedPages: function() {
     return this.get('emphasized_pages');
   },

data/app/assets/javascripts/pageflow/editor/views/edit_meta_data_view.js

@@ -34,9 +34,16 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
       });
 
       this.input('credits', pageflow.TextAreaInputView);
-      this.input('author', pageflow.TextInputView);
-      this.input('publisher', pageflow.TextInputView);
-      this.input('keywords', pageflow.TextInputView);
+
+      this.input('author', pageflow.TextInputView, {
+        placeholder: pageflow.config.defaultAuthorMetaTag
+      });
+      this.input('publisher', pageflow.TextInputView, {
+        placeholder: pageflow.config.defaultPublisherMetaTag
+      });
+      this.input('keywords', pageflow.TextInputView, {
+        placeholder: pageflow.config.defaultKeywordsMetaTag
+      });
     });
 
     configurationEditor.tab('widgets', function() {
@@ -47,6 +54,10 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
         disabled: !pageflow.theming.hasHomeButton(),
         displayUncheckedIfDisabled: true
       });
+      this.input('overview_button_enabled', pageflow.CheckBoxInputView, {
+        disabled: !pageflow.theming.hasOverviewButton(),
+        displayUncheckedIfDisabled: true
+      });
       if (pageflow.theming.hasHomeButton()) {
         this.input('home_url', pageflow.TextInputView, {
           placeholder: pageflow.theming.get('pretty_url'),
@@ -68,6 +79,9 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
         disableRichtext: true,
         disableLinks: true
       });
+      this.input('share_url', pageflow.TextInputView, {
+        placeholder: pageflow.entry.get('pretty_url')
+      });
     });
 
     this.formContainer.show(configurationEditor);

data/app/assets/javascripts/pageflow/editor/views/editor_view.js

@@ -1,4 +1,15 @@
 pageflow.EditorView = Backbone.View.extend({
+  scrollNavigationKeys: _.values({
+    pageUp: 33,
+    pageDown: 34,
+    end: 35,
+    home: 36,
+    left: 37,
+    up: 38,
+    right: 39,
+    down: 40
+  }),
+
   events: {
     'click a': function(event) {
       // prevent default for all links
@@ -7,6 +18,10 @@ pageflow.EditorView = Backbone.View.extend({
           !$(event.currentTarget).attr('href')) {
         return false;
       }
+    },
+
+    'keydown sidebar': function(event) {
+      this.preventScrollingPreviewWhileFocusInSidebar(event);
     }
   },
 
@@ -39,5 +54,11 @@ pageflow.EditorView = Backbone.View.extend({
     }).render().el);
 
     this.$el.append(new pageflow.HelpView().render().el);
+  },
+
+  preventScrollingPreviewWhileFocusInSidebar: function(event) {
+    if (this.scrollNavigationKeys.indexOf(event.which) >= 0) {
+      event.stopPropagation();
+    }
   }
 });

data/app/assets/javascripts/pageflow/editor/views/entry_preview_view.js

@@ -120,6 +120,7 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
     var previousClasses = this.widgetNames(this.widgets);
     var newClasses = this.widgetNames(newWidgets);
 
+    this.$el.addClass('widgets_present');
     this.$el.removeClass(_.difference(previousClasses, newClasses).join(' '));
     this.$el.addClass(newClasses.join(' '));
   },

data/app/assets/javascripts/pageflow/focus_outline.js

@@ -0,0 +1,44 @@
+(function() {
+  var KEY_TAB = 9;
+
+  pageflow.FocusOutline = pageflow.Object.extend({
+    initialize: function(element) {
+      this.element = element;
+    },
+
+    showOnlyAfterKeyboardInteraction: function() {
+      var focusOutline = this;
+
+      this.disable();
+
+      this.element.on('keydown', function(event) {
+        if (event.which === KEY_TAB) {
+          focusOutline.enable();
+        }
+      });
+
+      this.element.on('mousedown', function() {
+        focusOutline.disable();
+      });
+    },
+
+    disable: function() {
+      if (!this.disabled) {
+        this.disabled = true;
+        this.element.addClass('disable_focus_outline');
+      }
+    },
+
+    enable: function() {
+      if (this.disabled) {
+        this.disabled = false;
+        this.element.removeClass('disable_focus_outline');
+      }
+    }
+  });
+
+  pageflow.FocusOutline.setup = function(element) {
+    pageflow.focusOutline = new pageflow.FocusOutline(element);
+    pageflow.focusOutline.showOnlyAfterKeyboardInteraction();
+  };
+})();