pageflow 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNhNTM1MWI5MWJmN2NmYmFkNjJjM2IyNWYxYTA4N2NiNmZhYmJmNw==
+    OWJiZGE4ZDViNDg3YmRlYTI0Y2NiNDNhYTFmMzE0ZDY3Y2M4MzYwNA==
   data.tar.gz: !binary |-
-    MGMxMTY1ZGQwZDQwZDE1ZmU3ZjViMTkzNTgxODJhMmMzYjZiZDMyNQ==
+    OGVjOWI4NWI1YTVjZjhiMGEwYmMzMGFhZTQzMGQ1YTI3NmUzNDAyYQ==
 SHA512:
   metadata.gz: !binary |-
-    ODY1MzZiZDZlNTc1OGYzZjg2MjcyYjUyODA4NDBkMmVlYTJkZDIzYjQ5NjRk
-    Y2QyODE5OTIxZWE4OTU2Nzk2Mzg3NGJhYWM4MTgxNTA5OWVkZmZjNGJmM2Uw
-    M2IwM2FjNDg5OTdhMTA4NDkyY2E5MWYzNmRhYjcyZjYxMWViMDk=
+    OTVkOTc4NTk1NGExOTYwOTg4YjVmYWVjNzUyNDMzMDhiMTc4OTlkZDBiZDMy
+    N2JjMzliMDNjOWY3ZWYxMzJlZDc4MzBlYzAyYzVkYTQ4NzI1N2VlMDRjNDNl
+    MGNkMTc0YjYyNjc1NTU3YzlkNzI3ZWRhOWFhMmRiZWM5NDQ0NGM=
   data.tar.gz: !binary |-
-    YjYxOGQ2ZDYzNmU0ZGZiYjI4Nzk3ODljOTkxZTI4Zjk3NzRlMmI3ZjAxMDIx
-    ZGUwNDE4N2NkODFjNjJjYjlhYmEwNTZhNDg1OTE1MDUzMzIwZmFhMjdlMGZj
-    ZDQ4ZDg4MTIwOGE5ZTJhN2NiMGYzMDFmMDdkMzc0YjBhZjRlZTU=
+    OWJkNTJjYzcyN2VhZmRjZjA3MmQ3OWQ0ZTMyZGUwM2U1N2NmNTkxOGMzY2Q5
+    NWZlZTQ5ZWJiZGYzZTU3YWEyNmQwYTZmMmJhNjM5OGFhM2FiOGFkNzJjMDRh
+    MmVjN2IwN2QzYjBjOGUyNmNlYTczOGUzYjRjMTFjMjU4MzllNGE=

data/admins/pageflow/entry.rb

@@ -9,7 +9,7 @@ module Pageflow
       column :title, :sortable => 'title' do |entry|
         link_to entry.title, admin_entry_path(entry)
       end
-      column I18n.t('admin.entries.members'), :class => 'members' do |entry|
+      column I18n.t('pageflow.admin.entries.members'), :class => 'members' do |entry|
         entry_user_badge_list(entry)
       end
       if authorized?(:read, Account)
@@ -21,17 +21,17 @@ module Pageflow
       column :updated_at
       column :class => 'buttons' do |entry|
         if authorized?(:edit, Entry)
-          span(link_to(I18n.t("admin.entries.editor"), pageflow.edit_entry_path(entry), :class => 'editor button'))
+          span(link_to(I18n.t('pageflow.admin.entries.editor'), pageflow.edit_entry_path(entry), :class => 'editor button'))
         end
-        span(link_to(I18n.t("admin.entries.preview"), preview_admin_entry_path(entry), :class => 'preview button'))
+        span(link_to(I18n.t('pageflow.admin.entries.preview'), preview_admin_entry_path(entry), :class => 'preview button'))
         if entry.published?
-          span(link_to(I18n.t("admin.entries.show_public"), pretty_entry_url(entry), :class => 'show_public button'))
+          span(link_to(I18n.t('pageflow.admin.entries.show_public'), pretty_entry_url(entry), :class => 'show_public button'))
         end
       end
     end
 
     sidebar :folders, :only => :index do
-      text_node(link_to(I18n.t('admin.entries.add_folder'), new_admin_folder_path, :class => 'new'))
+      text_node(link_to(I18n.t('pageflow.admin.entries.add_folder'), new_admin_folder_path, :class => 'new'))
       grouped_folder_list(Folder.accessible_by(Ability.new(current_user), :read),
                           :class => authorized?(:manage, Folder) ? 'editable' : nil,
                           :active_id => params[:folder_id],
@@ -40,7 +40,7 @@ module Pageflow
 
     form do |f|
       f.inputs do
-        f.input :title, :hint => I18n.t('admin.entries.title_hint')
+        f.input :title, :hint => I18n.t('pageflow.admin.entries.title_hint')
         if authorized?(:read, Account)
           f.input :account, :include_blank => false
 
@@ -57,10 +57,10 @@ module Pageflow
 
     action_item :only => :show do
       if authorized?(:publish, Entry) && entry.published?
-        button_to(I18n.t("admin.entries.depublish"),
+        button_to(I18n.t('pageflow.admin.entries.depublish'),
                   pageflow.current_entry_revisions_path(entry),
                   :method => :delete,
-                  :data => {:rel => 'depublish', :confirm => I18n.t('admin.entries.confirm_depublish')})
+                  :data => {:rel => 'depublish', :confirm => I18n.t('pageflow.admin.entries.confirm_depublish')})
       end
     end
 

data/admins/pageflow/revisions.rb

@@ -15,7 +15,7 @@ module Pageflow
       revision.entry.restore(:revision => revision, :creator => current_user)
       entry.edit_lock.release(current_user)
 
-      redirect_to(admin_entry_path(entry, :notice => I18n.t('admin.revisions.restored')))
+      redirect_to(admin_entry_path(entry, :notice => I18n.t('pageflow.admin.revisions.restored')))
     end
 
     controller do

data/admins/pageflow/user.rb

@@ -16,7 +16,7 @@ module Pageflow
         end
       end
       column :role, :sortable => 'role' do |user|
-        I18n.t(user.role, :scope => 'admin.users.roles')
+        I18n.t(user.role, :scope => 'pageflow.admin.users.roles')
       end
       column :last_sign_in_at
       column :sign_in_count
@@ -28,7 +28,7 @@ module Pageflow
     filter :email
 
     action_item :only => :index do
-      link_to I18n.t('admin.users.invite_user'), new_admin_user_path, :data => {:rel => 'invite_user'}
+      link_to I18n.t('pageflow.admin.users.invite_user'), new_admin_user_path, :data => {:rel => 'invite_user'}
     end
 
     show do |user|
@@ -43,17 +43,20 @@ module Pageflow
             end
             row :role, :class => 'role' do
               span 'data-user-role' => user.role do
-                I18n.t(user.role, :scope => 'admin.users.roles')
+                I18n.t(user.role, :scope => 'pageflow.admin.users.roles')
               end
             end
 
             row :created_at
             row :last_sign_in_at
             boolean_status_tag_row :suspended?
+            row :locale do
+              I18n.t('language', locale: user.locale)
+            end
           end
 
           para do
-            link_to I18n.t('admin.users.resend_invitation'), resend_invitation_admin_user_path(user), :method => :post, :class => 'button', :data => {:rel => 'resend_invitation'}
+            link_to I18n.t('pageflow.admin.users.resend_invitation'), resend_invitation_admin_user_path(user), :method => :post, :class => 'button', :data => {:rel => 'resend_invitation'}
           end
         end
 
@@ -65,83 +68,84 @@ module Pageflow
               end
               column do |membership|
                 if authorized?(:destroy, membership)
-                  link_to(I18n.t('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('admin.users.empty')
+                I18n.t('pageflow.admin.users.empty')
               end
             end
           end
 
           span do
-            link_to I18n.t('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
-      link_to I18n.t('admin.users.edit'), edit_admin_user_path(user), :data => {:rel => 'edit_user'}
+      link_to I18n.t('pageflow.admin.users.edit'), edit_admin_user_path(user), :data => {:rel => 'edit_user'}
     end
 
     action_item :only => :show do
       if user != current_user
         if user.suspended?
-          link_to I18n.t('admin.users.unsuspend'), unsuspend_admin_user_path(user), :method => :post, :data => {:rel => 'unsuspend_user'}
+          link_to I18n.t('pageflow.admin.users.unsuspend'), unsuspend_admin_user_path(user), :method => :post, :data => {:rel => 'unsuspend_user'}
         else
-          link_to I18n.t('admin.users.suspend'), suspend_admin_user_path(user), :method => :post, :data => {:rel => 'suspend_user'}
+          link_to I18n.t('pageflow.admin.users.suspend'), suspend_admin_user_path(user), :method => :post, :data => {:rel => 'suspend_user'}
         end
       end
     end
 
     action_item :only => :show do
       if user != current_user
-        link_to I18n.t('admin.users.delete'), admin_user_path(user), :method => :delete, :data => {:rel => 'delete_user', :confirm => I18n.t('admin.users.confirm_delete')}
+        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
     end
 
     form(:partial => 'form')
 
-    collection_action 'me', :title => 'Profil', :method => [:get, :patch] do
+    collection_action 'me', :title => I18n.t('pageflow.admin.users.account'), :method => [:get, :patch] do
       if request.patch?
         if current_user.update_with_password(user_profile_params)
           sign_in current_user, :bypass => true
-          redirect_to admin_root_path, :notice => I18n.t('admin.users.me.updated')
+          redirect_to admin_root_path, :notice => I18n.t('pageflow.admin.users.me.updated')
         end
       end
     end
 
-    collection_action 'delete_me', :title => 'Konto entfernen', :method => [:get, :delete] do
+    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])
-          redirect_to admin_root_path, :notice => I18n.t('admin.users.me.updated')
+          redirect_to admin_root_path, :notice => I18n.t('pageflow.admin.users.me.updated')
         end
       end
     end
 
     member_action :resend_invitation, :method => :post do
       InvitedUser.find(params[:id]).send_invitation!
-      redirect_to :back, :notice => I18n.t('admin.users.resent_invitation')
+      redirect_to :back, :notice => I18n.t('pageflow.admin.users.resent_invitation')
     end
 
     member_action :suspend, :method => :post do
       User.find(params[:id]).suspend!
-      redirect_to :back, :notice => I18n.t('admin.users.suspended')
+      redirect_to :back, :notice => I18n.t('pageflow.admin.users.suspended')
     end
 
     member_action :unsuspend, :method => :post do
       User.find(params[:id]).unsuspend!
-      redirect_to :back, :notice => I18n.t('admin.users.unsuspended')
+      redirect_to :back, :notice => I18n.t('pageflow.admin.users.unsuspended')
     end
 
     controller do
       include Pageflow::QuotaVerification
 
       helper Pageflow::Admin::UsersHelper
+      helper Pageflow::Admin::LocalesHelper
       helper Pageflow::QuotaHelper
 
       def build_new_resource
@@ -156,11 +160,11 @@ module Pageflow
       end
 
       def user_profile_params
-        params.require(:user).permit(:first_name, :last_name, :current_password, :password, :password_confirmation)
+        params.require(:user).permit(:first_name, :last_name, :current_password, :password, :password_confirmation, :locale)
       end
 
       def permitted_params
-        result = params.permit(:user => [:first_name, :last_name, :email, :password, :password_confirmation, :account_id, :role])
+        result = params.permit(:user => [:first_name, :last_name, :email, :password, :password_confirmation, :account_id, :role, :locale])
         restrict_attributes(params[:id], result[:user]) if result[:user]
         result
       end

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

@@ -1,3 +1,6 @@
+//= require_self
+//= require ./audio_player/media_events
+
 pageflow.AudioPlayer = function(sources, options) {
   options = options || {};
 
@@ -25,6 +28,10 @@ pageflow.AudioPlayer = function(sources, options) {
 
   audio.on('load', loaded.resolve);
 
+  if (options.mediaEvents) {
+    pageflow.AudioPlayer.mediaEvents(audio);
+  }
+
   audio.src = function(sources) {
     ready.then(function() {
       var source = _.detect(sources || [], function(source) {
@@ -74,7 +81,7 @@ pageflow.AudioPlayer.fromAudioTag = function(element, options) {
       src: $(this).attr('src'),
       type: $(this).attr('type')
     };
-  }).get(), {tag: element[0], loop: options.loop});
+  }).get(), _.extend({tag: element[0]}, options || {}));
 };
 
 pageflow.AudioPlayer.fromScriptTag = function(element, options) {

data/app/assets/javascripts/pageflow/audio_player/media_events.js

@@ -0,0 +1,27 @@
+pageflow.AudioPlayer.mediaEvents = function(player) {
+  function triggerMediaEvent(name) {
+    pageflow.events.trigger('media:' + name, {
+      fileName: player.currentSrc,
+      currentTime: player.position,
+      duration: player.duration,
+      volume: player.volume(),
+      bitrate: 128000
+    });
+  }
+
+  player.on('play', function() {
+    triggerMediaEvent('play');
+  });
+
+  player.on('timeupdate', function() {
+    triggerMediaEvent('timeupdate');
+  });
+
+  player.on('pause', function() {
+    triggerMediaEvent('pause');
+  });
+
+  player.on('ended', function() {
+    triggerMediaEvent('ended');
+  });
+};

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

@@ -14,7 +14,7 @@
 //= require polyfills/bind
 
 //= require jquery
-//= require jquery.ui.widget
+//= require jquery-ui/widget
 //= require jquery_ujs
 //= require ./jquery_utils
 //= require iscroll
@@ -41,6 +41,7 @@
 //= require ./manual_start
 //= require ./widget_types
 //= require ./built_in_widget_types
+//= require ./links
 
 //= require ./settings
 

data/app/assets/javascripts/pageflow/editor/api.js

@@ -22,6 +22,21 @@ pageflow.EditorApi = pageflow.Object.extend({
       this.sideBarRoutings.push(options);
     };
 
+    /**
+     * Set the name of the help entry that shall be selected by
+     * default when the help view is opened. This value is
+     * automatically reset when navigation occurs.
+     */
+    this.setDefaultHelpEntry = function(name) {
+      this.nextDefaultHelpEntry = name;
+    };
+
+    /** @api private */
+    this.applyDefaultHelpEntry = function(name) {
+      this.defaultHelpEntry = this.nextDefaultHelpEntry;
+      this.nextDefaultHelpEntry = null;
+    };
+
     /**
      * Register additional menu item to be displayed on the root sidebar
      * view.

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

@@ -3,7 +3,7 @@
 //= require pageflow/ui
 //= require ./sync
 
-//= require jquery.ui.all
+//= require jquery-ui
 //= require jquery/layout
 
 //= require jquery-fileupload/vendor/load-image
@@ -36,6 +36,7 @@
 //= require_tree ./views
 
 //= require ./initializers/setup_config
+//= require ./initializers/setup_help_entries
 //= require ./initializers/setup_file_types
 //= require ./initializers/setup_widget_types
 //= require ./initializers/setup_collections
@@ -49,3 +50,18 @@
 
 pageflow.app = new Backbone.Marionette.Application();
 pageflow.editor = new pageflow.EditorApi();
+
+pageflow.startEditor = function(options) {
+  jQuery(function() {
+    $.when(
+      $.getJSON('/editor/entries/' + options.entryId + '/seed'),
+      pageflow.features.detect()
+    )
+      .done(function(result) {
+        pageflow.app.start(result[0]);
+      })
+      .fail(function() {
+        alert('Error while starting editor.');
+      });
+  });
+};

data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js

@@ -16,6 +16,8 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
       selectionHandler: handler && pageflow.editor.createFileSelectionHandler(handler, payload),
       tabName: collectionName
     }));
+
+    pageflow.editor.setDefaultHelpEntry('pageflow.help_entries.files');
   },
 
   confirmableFiles: function(preselectedFileType, preselectedFileId) {
@@ -39,6 +41,8 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
       model: this.entry,
       entryPublication: new pageflow.EntryPublication()
     }));
+
+    pageflow.editor.setDefaultHelpEntry('pageflow.help_entries.publish');
   },
 
   chapter: function(id) {
@@ -48,9 +52,13 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
   },
 
   page: function(id, tab) {
+    var page = this.entry.pages.get(id);
+
     this.region.show(new pageflow.EditPageView({
-      model: this.entry.pages.get(id),
+      model: page,
       tab: tab
     }));
+
+    pageflow.editor.setDefaultHelpEntry(page.pageType().help_entry_translation_key);
   }
 });

data/app/assets/javascripts/pageflow/editor/initializers/setup_help_entries.js

@@ -0,0 +1,5 @@
+pageflow.app.addInitializer(function() {
+  Backbone.history.on('route', function() {
+    pageflow.editor.applyDefaultHelpEntry();
+  });
+});

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

@@ -50,15 +50,16 @@ pageflow.EditLockContainer = Backbone.Model.extend({
     });
 
     $(document).ajaxError(function(event, xhr, settings) {
-      if (xhr.status === 409) {
-        container.lock = null;
-        container.trigger('locked',
-                          xhr.responseJSON || {},
-                          {
-                            context: (settings.url.match(/\/edit_lock/) && !settings.polling) ? 'aquire' : 'other'
-                          });
-
-        container.stopPolling();
+      switch(xhr.status) {
+      case 409:
+        container.handleConflict(xhr, settings);
+        break;
+      case 401:
+      case 422:
+        container.handleUnauthenticated();
+        break;
+      default:
+        container.handleError();
       }
     });
   },
@@ -70,5 +71,25 @@ pageflow.EditLockContainer = Backbone.Model.extend({
       this.lock = null;
       return promise;
     }
+  },
+
+  handleConflict: function(xhr, settings) {
+    this.lock = null;
+    this.trigger('locked',
+                 xhr.responseJSON || {},
+                 {
+                   context: (settings.url.match(/\/edit_lock/) && !settings.polling) ? 'aquire' : 'other'
+                 });
+
+    this.stopPolling();
+
+  },
+
+  handleUnauthenticated: function() {
+    this.stopPolling();
+    this.trigger('unauthenticated');
+  },
+
+  handleError: function() {
   }
 });