pageflow 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUxZDk3ZWY0NmIxNjVhYjE5MDdlODYzNDZmMjZiNGE5NjNmMzFmMA==
+    MTNhNTM1MWI5MWJmN2NmYmFkNjJjM2IyNWYxYTA4N2NiNmZhYmJmNw==
   data.tar.gz: !binary |-
-    ZGRkZmMzODVhMGMyZjE4ZjBkYmZlYTZiM2NlYjc4MTA1NzljZGUyOQ==
+    MGMxMTY1ZGQwZDQwZDE1ZmU3ZjViMTkzNTgxODJhMmMzYjZiZDMyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NDNmNDJjNWMyZGI0N2M2Y2M4YzNhNDI1MTVlNDNhODkyNTAwM2UyODBmY2U1
-    ZTgzYzNjYjNmNTMzZmZlZDQyMGJjZDc5M2I4MzQ3MzA0ZTEyNTkwNzk1ZTgz
-    YWFkNTkxYTA0ODkxNGE1YmNkMTFkNGRlMGQwOWRhYmY2MGQ3YmM=
+    ODY1MzZiZDZlNTc1OGYzZjg2MjcyYjUyODA4NDBkMmVlYTJkZDIzYjQ5NjRk
+    Y2QyODE5OTIxZWE4OTU2Nzk2Mzg3NGJhYWM4MTgxNTA5OWVkZmZjNGJmM2Uw
+    M2IwM2FjNDg5OTdhMTA4NDkyY2E5MWYzNmRhYjcyZjYxMWViMDk=
   data.tar.gz: !binary |-
-    YmE0ZDhjMWVmZDk2NjQxNGIwODg5MjJkODcwNGUyZTFjNWZkZjdhNzEwMTk5
-    NTU3NzUzNmI5ODY2MjM3ZmVjMGI0NTJlMDM4MTc4NDYwN2M3ZWZjNTlmNGE5
-    NTIyZDliMTczMjAxYTYyZjZlMzY2M2IzNTgzZjI0ZWYzMWVhYzk=
+    YjYxOGQ2ZDYzNmU0ZGZiYjI4Nzk3ODljOTkxZTI4Zjk3NzRlMmI3ZjAxMDIx
+    ZGUwNDE4N2NkODFjNjJjYjlhYmEwNTZhNDg1OTE1MDUzMzIwZmFhMjdlMGZj
+    ZDQ4ZDg4MTIwOGE5ZTJhN2NiMGYzMDFmMDdkMzc0YjBhZjRlZTU=

data/Rakefile

@@ -14,7 +14,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+require File.expand_path('spec/support/pageflow/rails_version', File.dirname(__FILE__))
+APP_RAKEFILE = File.expand_path("../spec/dummy/rails-#{Pageflow::RailsVersion.detect}/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/admins/pageflow/accounts.rb

@@ -17,14 +17,14 @@ module Pageflow
       render 'account_details', :account => account
       render 'theming_details', :account => account
 
-      div :class => 'columns' do
-        render 'entries_panel', :account => account
-        render 'users_panel', :account => account
-      end
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(:theming),
+                :i18n => 'pageflow.admin.resource_tabs',
+                :build_args => [account.default_theming])
     end
 
     controller do
       helper ThemesHelper
+      helper WidgetsHelper
 
       def new
         @account = Account.new
@@ -35,6 +35,22 @@ module Pageflow
         @account = Account.new(permitted_params[:account])
         @account.build_default_theming(permitted_params[:account][:default_theming_attributes])
         super
+        update_widgets
+      end
+
+      def update
+        super
+        update_widgets
+      end
+
+      def update_widgets
+        @account.default_theming.widgets.batch_update!(widgets_params) if @account.valid?
+      end
+
+      def widgets_params
+        params.fetch(:widgets, {}).map do |role, type_name|
+          {role: role, type_name: type_name}
+        end
       end
 
       def permitted_params

data/admins/pageflow/entry.rb

@@ -81,16 +81,15 @@ module Pageflow
       render 'attributes_table', :entry => entry
       render 'links', :entry => entry
 
-      div :class => 'columns' do
-        render 'members', :entry => entry
-        render 'revisions', :entry => entry
-      end
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(:entry),
+                :i18n => 'pageflow.admin.resource_tabs',
+                :build_args => [entry])
     end
 
     controller do
       helper FoldersHelper
       helper EntriesHelper
-      helper Admin::RevisionsHelper
+      helper Pageflow::Admin::RevisionsHelper
 
       def scoped_collection
         params.key?(:folder_id) ? super.where(:folder_id => params[:folder_id]) : super

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

@@ -1,4 +1,6 @@
-pageflow.AudioPlayer = function(sources, tag) {
+pageflow.AudioPlayer = function(sources, options) {
+  options = options || {};
+
   var codecMapping = {
     vorbis: 'audio/ogg',
     mp4: 'audio/mp4',
@@ -6,16 +8,23 @@ pageflow.AudioPlayer = function(sources, tag) {
   };
 
   var ready = new $.Deferred();
+  var loaded = new $.Deferred();
+
   var audio = new Audio5js({
-    reusedTag: tag,
+    reusedTag: options.tag,
     swf_path: pageflow.assetUrls.audioSwf,
     throw_errors: false,
     format_time: false,
     codecs: ['vorbis', 'mp4', 'mp3'],
-    ready: ready.resolve
+    ready: ready.resolve,
+    loop: options.loop
   });
 
   audio.readyPromise = ready.promise();
+  audio.loadedPromise = loaded.promise();
+
+  audio.on('load', loaded.resolve);
+
   audio.src = function(sources) {
     ready.then(function() {
       var source = _.detect(sources || [], function(source) {
@@ -59,16 +68,16 @@ pageflow.AudioPlayer = function(sources, tag) {
   return audio;
 };
 
-pageflow.AudioPlayer.fromAudioTag = function(element) {
+pageflow.AudioPlayer.fromAudioTag = function(element, options) {
   return new pageflow.AudioPlayer(element.find('source').map(function() {
     return {
       src: $(this).attr('src'),
       type: $(this).attr('type')
     };
-  }).get(), element[0]);
+  }).get(), {tag: element[0], loop: options.loop});
 };
 
-pageflow.AudioPlayer.fromScriptTag = function(element) {
+pageflow.AudioPlayer.fromScriptTag = function(element, options) {
   var sources = element.length ? JSON.parse(element.text()) : [];
-  return new pageflow.AudioPlayer(sources);
+  return new pageflow.AudioPlayer(sources, options);
 };

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

@@ -26,6 +26,8 @@
 //= require backbone-rails
 //= require_self
 
+//= require ./cookies
+//= require ./events
 //= require ./page_type
 //= require ./asset_urls
 //= require ./preload
@@ -33,9 +35,12 @@
 //= require ./features
 //= require ./audio_player
 //= require ./video_player
+//= require ./visited
 //= require ./print_layout
 //= require ./history
 //= require ./manual_start
+//= require ./widget_types
+//= require ./built_in_widget_types
 
 //= require ./settings
 

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

@@ -0,0 +1,11 @@
+pageflow.widgetTypes.register('default_navigation', {
+  enhance: function(element) {
+    element.navigation();
+  }
+});
+
+pageflow.widgetTypes.register('default_mobile_navigation', {
+  enhance: function(element) {
+    element.navigationMobile();
+  }
+});

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

@@ -0,0 +1,43 @@
+/**
+ *  https://developer.mozilla.org/en-US/docs/Web/API/document.cookie
+ */
+
+pageflow.cookies = {
+  getItem: function (sKey) {
+    if (!sKey) { return null; }
+    return decodeURIComponent(document.cookie.replace(new RegExp("(?:(?:^|.*;)\\s*" + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, "\\$&") + "\\s*\\=\\s*([^;]*).*$)|^.*$"), "$1")) || null;
+  },
+  setItem: function (sKey, sValue, vEnd, sPath, sDomain, bSecure) {
+    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)) { return false; }
+    var sExpires = "";
+    if (vEnd) {
+      switch (vEnd.constructor) {
+        case Number:
+          sExpires = vEnd === Infinity ? "; expires=Fri, 31 Dec 9999 23:59:59 GMT" : "; max-age=" + vEnd;
+          break;
+        case String:
+          sExpires = "; expires=" + vEnd;
+          break;
+        case Date:
+          sExpires = "; expires=" + vEnd.toUTCString();
+          break;
+      }
+    }
+    document.cookie = encodeURIComponent(sKey) + "=" + encodeURIComponent(sValue) + sExpires + (sDomain ? "; domain=" + sDomain : "") + (sPath ? "; path=" + sPath : "") + (bSecure ? "; secure" : "");
+    return true;
+  },
+  removeItem: function (sKey, sPath, sDomain) {
+    if (!this.hasItem(sKey)) { return false; }
+    document.cookie = encodeURIComponent(sKey) + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT" + (sDomain ? "; domain=" + sDomain : "") + (sPath ? "; path=" + sPath : "");
+    return true;
+  },
+  hasItem: function (sKey) {
+    if (!sKey) { return false; }
+    return (new RegExp("(?:^|;\\s*)" + encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, "\\$&") + "\\s*\\=")).test(document.cookie);
+  },
+  keys: function () {
+    var aKeys = document.cookie.replace(/((?:^|\s*;)[^\=]+)(?=;|$)|^\s*|\s*(?:\=[^;]*)?(?:\1|$)/g, "").split(/\s*(?:\=[^;]*)?;\s*/);
+    for (var nLen = aKeys.length, nIdx = 0; nIdx < nLen; nIdx++) { aKeys[nIdx] = decodeURIComponent(aKeys[nIdx]); }
+    return aKeys;
+  }
+};

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

@@ -1,7 +1,7 @@
 //= require cocktail
 //= require backbone.marionette
+//= require pageflow/ui
 //= require ./sync
-//= require ./renderer
 
 //= require jquery.ui.all
 //= require jquery/layout
@@ -11,13 +11,6 @@
 //= require jquery-fileupload/jquery.fileupload
 //= require jquery-fileupload/jquery.fileupload-fp
 
-//= require wysihtml5
-//= require parser_rules/simple
-
-//= require i18n
-//= require i18n/translations
-
-//= require ./object
 //= require ./api
 
 //= require_self
@@ -39,13 +32,12 @@
 //= require ./views/file_item_view
 //= require ./views/chapter_item_view
 //= require ./views/page_item_view
-//= require ./views/configuration_editor_tab_view
-//= require ./views/configuration_editor_view
 //= require_tree ./views/configuration_editors
 //= require_tree ./views
 
 //= require ./initializers/setup_config
 //= require ./initializers/setup_file_types
+//= require ./initializers/setup_widget_types
 //= require ./initializers/setup_collections
 //= require ./initializers/setup_page_types
 //= require ./initializers/edit_lock

data/app/assets/javascripts/pageflow/editor/collections/widgets_collection.js

@@ -0,0 +1,16 @@
+pageflow.WidgetsCollection = Backbone.Collection.extend({
+  model: pageflow.Widget,
+
+  initialize: function(models, options) {
+    options = options || {};
+    this.subject = options.subject;
+  },
+
+  url: function() {
+    return this.subject.widgetsUrlRoot() + '/widgets';
+  },
+});
+
+pageflow.WidgetsCollection.createForSubject = function(subject) {
+  return new pageflow.WidgetsCollection([], {subject: subject});
+};

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

@@ -27,9 +27,10 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
     }));
   },
 
-  metaData: function() {
+  metaData: function(tab) {
     this.region.show(new pageflow.EditMetaDataView({
-      model: this.entry
+      model: this.entry,
+      tab: tab
     }));
   },
 

data/app/assets/javascripts/pageflow/editor/edit_widget.jst.ejs

@@ -0,0 +1,2 @@
+<div class="widget_type">
+</div>

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

@@ -0,0 +1,3 @@
+pageflow.app.addInitializer(function(options) {
+  pageflow.editor.widgetTypes = options.widget_types;
+});

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

@@ -19,7 +19,7 @@ pageflow.Configuration = Backbone.Model.extend({
    * routes to lookup configuration via its page.
    */
   getRoutableId: function() {
-    return this.page.id;
+    return this.parent.id;
   },
 
   getImageFileUrl: function(attribute) {
@@ -36,17 +36,26 @@ pageflow.Configuration = Backbone.Model.extend({
     return this.getReference(attribute, pageflow.imageFiles);
   },
 
-  getImageFilePosition: function(attribute, coord) {
-    var propertyName = this._imageFilePositionProperty(attribute, coord);
+  getFilePosition: function(attribute, coord) {
+    var propertyName = this._filePositionProperty(attribute, coord);
     return this.has(propertyName) ? this.get(propertyName) : 50;
   },
 
-  setImageFilePosition: function(attribute, coord, value) {
-    var propertyName = this._imageFilePositionProperty(attribute, coord);
+  setFilePosition: function(attribute, coord, value) {
+    var propertyName = this._filePositionProperty(attribute, coord);
     this.set(propertyName, value);
   },
 
-  _imageFilePositionProperty: function(attribute, coord) {
+  setFilePositions: function(attribute, x, y) {
+    var attributes = {};
+
+    attributes[this._filePositionProperty(attribute, 'x')] = x;
+    attributes[this._filePositionProperty(attribute, 'y')] = y;
+
+    this.set(attributes);
+  },
+
+  _filePositionProperty: function(attribute, coord) {
     return attribute.replace(/_id$/, '_' + coord);
   },
 
@@ -93,15 +102,15 @@ pageflow.Configuration = Backbone.Model.extend({
   },
 
   _appendSuffix: function(sources) {
-    var page = this.page;
+    var parent = this.parent;
 
-    if (!page || !page.id) {
+    if (!parent || !parent.id) {
       return sources;
     }
 
     return _.map(sources, function(source) {
       var clone = _.clone(source);
-      clone.src = clone.src + '?e=' + page.id;
+      clone.src = clone.src + '?e=' + parent.id;
       return clone;
     });
   }

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

@@ -66,6 +66,7 @@ pageflow.EditLockContainer = Backbone.Model.extend({
   release: function() {
     if (this.lock) {
       var promise = this.lock.destroy();
+      delete sessionStorage[this.storageKey];
       this.lock = null;
       return promise;
     }

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

@@ -3,12 +3,21 @@ pageflow.Entry = Backbone.Model.extend({
   urlRoot: '/entries',
   modelName: 'entry',
   i18nKey: 'pageflow/entry',
+  collectionName: 'entries',
 
-  mixins: [pageflow.filesCountWatcher, pageflow.polling, pageflow.failureTracking],
+  autoSaveWidgets: true,
+
+  mixins: [pageflow.filesCountWatcher,
+           pageflow.polling,
+           pageflow.failureTracking,
+           pageflow.widgetSubject],
 
   initialize: function(attributes, options) {
     options = options || {};
 
+    this.configuration = new pageflow.EntryConfiguration(this.get('configuration') || {});
+    this.configuration.parent = this;
+
     this.files = options.files || pageflow.files;
     this.chapters = options.chapters || pageflow.chapters;
     this.chapters.parentModel = this;
@@ -26,7 +35,8 @@ pageflow.Entry = Backbone.Model.extend({
       this.pages.sort();
     });
 
-    this.listenTo(this, 'change:title change:summary change:credits change:manual_start change:home_url change:home_button_enabled', function() {
+    this.listenTo(this.configuration, 'change', function() {
+      this.trigger('change:configuration');
       this.save();
     });
   },
@@ -87,6 +97,6 @@ pageflow.Entry = Backbone.Model.extend({
   },
 
   toJSON: function() {
-    return _.pick(this.attributes, 'title', 'summary', 'credits', 'manual_start', 'home_url', 'home_button_enabled');
+    return this.configuration.toJSON();
   }
 });

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

@@ -0,0 +1,4 @@
+pageflow.EntryConfiguration = pageflow.Configuration.extend({
+  modelName: 'entry',
+  i18nKey: 'pageflow/entry'
+});

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

@@ -0,0 +1,11 @@
+pageflow.EntryConfigurationFileSelectionHandler = function(options) {
+  this.call = function(file) {
+    pageflow.entry.configuration.setReference(options.attributeName, file);
+  };
+
+  this.getReferer = function() {
+    return '/meta_data/' + (options.returnToTab || 'general');
+  };
+};
+
+pageflow.editor.registerFileSelectionHandler('entryConfiguration', pageflow.EntryConfigurationFileSelectionHandler);

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

@@ -15,6 +15,10 @@ pageflow.ImageFile = pageflow.UploadedFile.extend({
 
   readyState: 'processed',
 
+  getBackgroundPositioningImageUrl: function() {
+    return this.get('url');
+  },
+
   isPositionable: function() {
     return this.isReady();
   }