pageflow 0.4.0 → 0.5.0

data/spec/factories/video_files.rb

@@ -25,10 +25,10 @@ module Pageflow
         state 'not_uploaded_to_s3'
       end
 
-      trait :upload_to_s3_failed do
+      trait :uploading_to_s3_failed do
         attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'video.mp4'))
         attachment_on_s3 nil
-        state 'upload_to_s3_failed'
+        state 'uploading_to_s3_failed'
       end
 
       trait :waiting_for_confirmation do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -673,6 +673,8 @@ files:
 - app/assets/images/pageflow/arrow_left_sprite.png
 - app/assets/images/pageflow/arrow_right_sprite.png
 - app/assets/images/pageflow/audio5js.swf
+- app/assets/images/pageflow/audio_loop_pictogram.png
+- app/assets/images/pageflow/audio_loop_pictogram_small.png
 - app/assets/images/pageflow/audio_pictogram.png
 - app/assets/images/pageflow/audio_pictogram_small.png
 - app/assets/images/pageflow/audio_sprite.png
@@ -720,12 +722,16 @@ files:
 - app/assets/images/pageflow/mobile_sharing.png
 - app/assets/images/pageflow/ov-audio.png
 - app/assets/images/pageflow/ov-image.png
+- app/assets/images/pageflow/ov-internal_links.png
 - app/assets/images/pageflow/ov-text.png
 - app/assets/images/pageflow/ov-video.png
 - app/assets/images/pageflow/overview_mobile_mask.png
 - app/assets/images/pageflow/page_thumbnail_mask.png
+- app/assets/images/pageflow/placeholder_link_thumbnail.jpg
+- app/assets/images/pageflow/placeholder_link_thumbnail_large.jpg
 - app/assets/images/pageflow/placeholder_navigation_thumbnail_large.jpg
 - app/assets/images/pageflow/placeholder_navigation_thumbnail_small.jpg
+- app/assets/images/pageflow/placeholder_thumbnail.jpg
 - app/assets/images/pageflow/placeholder_thumbnail_overview_desktop.jpg
 - app/assets/images/pageflow/placeholder_thumbnail_overview_mobile.jpg
 - app/assets/images/pageflow/scroll_down_indicator.png
@@ -745,8 +751,6 @@ files:
 - app/assets/images/pageflow/themes/default/loading_spinner_bg.png
 - app/assets/images/pageflow/themes/default/logo_header.png
 - app/assets/images/pageflow/themes/default/logo_header_invert.png
-- app/assets/images/pageflow/themes/default/logo_navi.png
-- app/assets/images/pageflow/themes/default/logo_navi_invert.png
 - app/assets/images/pageflow/themes/default/logo_print.png
 - app/assets/images/pageflow/themes/default/menu_sprite.png
 - app/assets/images/pageflow/themes/default/scroll_indicator_sprite.png
@@ -770,44 +774,46 @@ files:
 - app/assets/javascripts/pageflow/editor/api.js
 - app/assets/javascripts/pageflow/editor/api/failure.js
 - app/assets/javascripts/pageflow/editor/api/failures.js
+- app/assets/javascripts/pageflow/editor/api/file_type.js
+- app/assets/javascripts/pageflow/editor/api/file_types.js
 - app/assets/javascripts/pageflow/editor/base.js
-- app/assets/javascripts/pageflow/editor/collections/audio_files_collection.js
 - app/assets/javascripts/pageflow/editor/collections/chapter_pages_collection.js
 - app/assets/javascripts/pageflow/editor/collections/chapters_collection.js
 - app/assets/javascripts/pageflow/editor/collections/file_usages_collection.js
-- app/assets/javascripts/pageflow/editor/collections/image_files_collection.js
-- app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js
+- app/assets/javascripts/pageflow/editor/collections/files_collection.js
 - app/assets/javascripts/pageflow/editor/collections/mixins/ordered_collection.js
 - app/assets/javascripts/pageflow/editor/collections/multi_collection.js
 - app/assets/javascripts/pageflow/editor/collections/other_entries_collection.js
 - app/assets/javascripts/pageflow/editor/collections/pages_collection.js
 - app/assets/javascripts/pageflow/editor/collections/saving_records_collection.js
 - app/assets/javascripts/pageflow/editor/collections/subset_collection.js
-- app/assets/javascripts/pageflow/editor/collections/video_files_collection.js
 - app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js
 - app/assets/javascripts/pageflow/editor/initializers/additional_initializers.js
 - app/assets/javascripts/pageflow/editor/initializers/boot.js
 - app/assets/javascripts/pageflow/editor/initializers/edit_lock.js
+- app/assets/javascripts/pageflow/editor/initializers/error_listener.js
 - app/assets/javascripts/pageflow/editor/initializers/files_polling.js
 - app/assets/javascripts/pageflow/editor/initializers/routing.js
 - app/assets/javascripts/pageflow/editor/initializers/setup_collections.js
 - app/assets/javascripts/pageflow/editor/initializers/setup_config.js
+- app/assets/javascripts/pageflow/editor/initializers/setup_file_types.js
 - app/assets/javascripts/pageflow/editor/initializers/setup_page_types.js
 - app/assets/javascripts/pageflow/editor/models/audio_file.js
 - app/assets/javascripts/pageflow/editor/models/chapter.js
 - app/assets/javascripts/pageflow/editor/models/configuration.js
 - app/assets/javascripts/pageflow/editor/models/edit_lock.js
 - app/assets/javascripts/pageflow/editor/models/edit_lock_container.js
+- app/assets/javascripts/pageflow/editor/models/encoded_file.js
 - app/assets/javascripts/pageflow/editor/models/encoding_confirmation.js
 - app/assets/javascripts/pageflow/editor/models/entry.js
 - app/assets/javascripts/pageflow/editor/models/entry_publication.js
 - app/assets/javascripts/pageflow/editor/models/file_stage.js
 - app/assets/javascripts/pageflow/editor/models/file_usage.js
+- app/assets/javascripts/pageflow/editor/models/hosted_file.js
 - app/assets/javascripts/pageflow/editor/models/image_file.js
 - app/assets/javascripts/pageflow/editor/models/mixins/delayed_destroying.js
-- app/assets/javascripts/pageflow/editor/models/mixins/encoded_file.js
 - app/assets/javascripts/pageflow/editor/models/mixins/failure_tracking.js
-- app/assets/javascripts/pageflow/editor/models/mixins/file.js
+- app/assets/javascripts/pageflow/editor/models/mixins/file_with_type.js
 - app/assets/javascripts/pageflow/editor/models/mixins/files_count_watcher.js
 - app/assets/javascripts/pageflow/editor/models/mixins/polling.js
 - app/assets/javascripts/pageflow/editor/models/mixins/retryable.js
@@ -817,6 +823,7 @@ files:
 - app/assets/javascripts/pageflow/editor/models/page.js
 - app/assets/javascripts/pageflow/editor/models/page_configuration_file_selection_handler.js
 - app/assets/javascripts/pageflow/editor/models/theming.js
+- app/assets/javascripts/pageflow/editor/models/uploaded_file.js
 - app/assets/javascripts/pageflow/editor/models/video_file.js
 - app/assets/javascripts/pageflow/editor/object.js
 - app/assets/javascripts/pageflow/editor/renderer.js
@@ -864,7 +871,6 @@ files:
 - app/assets/javascripts/pageflow/editor/templates/publish_entry.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/select_button.jst.ejs
 - app/assets/javascripts/pageflow/editor/templates/tabs_view.jst.ejs
-- app/assets/javascripts/pageflow/editor/views/audio_file_item_view.js
 - app/assets/javascripts/pageflow/editor/views/back_button_decorator_view.js
 - app/assets/javascripts/pageflow/editor/views/blank_entry_view.js
 - app/assets/javascripts/pageflow/editor/views/chapter_item_view.js
@@ -872,6 +878,7 @@ files:
 - app/assets/javascripts/pageflow/editor/views/configuration_editor_tab_view.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editor_view.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/audio.js
+- app/assets/javascripts/pageflow/editor/views/configuration_editors/audio_loop.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/background_image.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/background_video.js
 - app/assets/javascripts/pageflow/editor/views/configuration_editors/groups/general.js
@@ -899,7 +906,6 @@ files:
 - app/assets/javascripts/pageflow/editor/views/files_view.js
 - app/assets/javascripts/pageflow/editor/views/help_button_view.js
 - app/assets/javascripts/pageflow/editor/views/help_view.js
-- app/assets/javascripts/pageflow/editor/views/image_file_item_view.js
 - app/assets/javascripts/pageflow/editor/views/image_positioning_view.js
 - app/assets/javascripts/pageflow/editor/views/input_view.js
 - app/assets/javascripts/pageflow/editor/views/inputs/check_box_input_view.js
@@ -930,7 +936,6 @@ files:
 - app/assets/javascripts/pageflow/editor/views/sortable_collection_view.js
 - app/assets/javascripts/pageflow/editor/views/tabs_view.js
 - app/assets/javascripts/pageflow/editor/views/uploader_view.js
-- app/assets/javascripts/pageflow/editor/views/video_file_item_view.js
 - app/assets/javascripts/pageflow/features.js
 - app/assets/javascripts/pageflow/features/high_bandwidth.js
 - app/assets/javascripts/pageflow/features/ie_platform.js
@@ -945,6 +950,7 @@ files:
 - app/assets/javascripts/pageflow/manual_start.js
 - app/assets/javascripts/pageflow/page_type.js
 - app/assets/javascripts/pageflow/page_types/audio.js
+- app/assets/javascripts/pageflow/page_types/audio_loop.js
 - app/assets/javascripts/pageflow/page_types/background_image.js
 - app/assets/javascripts/pageflow/page_types/background_video.js
 - app/assets/javascripts/pageflow/page_types/internal_links.js
@@ -1054,6 +1060,7 @@ files:
 - app/assets/stylesheets/pageflow/page.css.scss
 - app/assets/stylesheets/pageflow/page_types.css.scss
 - app/assets/stylesheets/pageflow/page_types/audio.css.scss
+- app/assets/stylesheets/pageflow/page_types/audio_loop.css.scss
 - app/assets/stylesheets/pageflow/page_types/background-image.css.scss
 - app/assets/stylesheets/pageflow/page_types/background-video.css.scss
 - app/assets/stylesheets/pageflow/page_types/internal_links.css.scss
@@ -1076,24 +1083,23 @@ files:
 - app/controllers/pageflow/application_controller.rb
 - app/controllers/pageflow/chapters_controller.rb
 - app/controllers/pageflow/edit_locks_controller.rb
-- app/controllers/pageflow/editor/audio_files_controller.rb
 - app/controllers/pageflow/editor/encoding_confirmations_controller.rb
 - app/controllers/pageflow/editor/entries_controller.rb
 - app/controllers/pageflow/editor/entry_publications_controller.rb
 - app/controllers/pageflow/editor/file_usages_controller.rb
 - app/controllers/pageflow/editor/files_controller.rb
-- app/controllers/pageflow/editor/image_files_controller.rb
-- app/controllers/pageflow/editor/video_files_controller.rb
 - app/controllers/pageflow/entries_controller.rb
+- app/controllers/pageflow/files_controller.rb
 - app/controllers/pageflow/pages_controller.rb
 - app/controllers/pageflow/revisions_controller.rb
-- app/controllers/pageflow/video_files_controller.rb
 - app/helpers/pageflow/admin/memberships_helper.rb
 - app/helpers/pageflow/admin/revisions_helper.rb
 - app/helpers/pageflow/admin/users_helper.rb
+- app/helpers/pageflow/audio_files_helper.rb
 - app/helpers/pageflow/background_image_helper.rb
 - app/helpers/pageflow/config_helper.rb
 - app/helpers/pageflow/entries_helper.rb
+- app/helpers/pageflow/file_thumbnails_helper.rb
 - app/helpers/pageflow/files_helper.rb
 - app/helpers/pageflow/folders_helper.rb
 - app/helpers/pageflow/info_box_helper.rb
@@ -1112,6 +1118,7 @@ files:
 - app/jobs/pageflow/submit_file_to_zencoder_job.rb
 - app/jobs/pageflow/upload_file_to_s3_job.rb
 - app/mailers/pageflow/user_mailer.rb
+- app/models/concerns/pageflow/hosted_file.rb
 - app/models/concerns/pageflow/suspendable.rb
 - app/models/concerns/pageflow/uploaded_file.rb
 - app/models/pageflow/account.rb
@@ -1134,6 +1141,7 @@ files:
 - app/models/pageflow/published_entry.rb
 - app/models/pageflow/revision.rb
 - app/models/pageflow/theming.rb
+- app/models/pageflow/thumbnail_file_resolver.rb
 - app/models/pageflow/video_file.rb
 - app/models/pageflow/with_file_usage_extension.rb
 - app/models/pageflow/zencoder_attachment.rb
@@ -1162,6 +1170,8 @@ files:
 - app/views/layouts/pageflow/_loading_spinner_inline_script.html.erb
 - app/views/layouts/pageflow/_meta_tags.html.erb
 - app/views/layouts/pageflow/application.html.erb
+- app/views/pageflow/audio_files/_audio_file.html.erb
+- app/views/pageflow/audio_files/_script_tag.html.erb
 - app/views/pageflow/config/_editor_seeds.json.jbuilder
 - app/views/pageflow/devise/mailer/confirmation_instructions.html.erb
 - app/views/pageflow/devise/mailer/reset_password_instructions.html.erb
@@ -1173,6 +1183,7 @@ files:
 - app/views/pageflow/editor/entries/_entry.json.jbuilder
 - app/views/pageflow/editor/entries/index.json.jbuilder
 - app/views/pageflow/editor/entry_publications/check.json.jbuilder
+- app/views/pageflow/editor/files/_file.json.jbuilder
 - app/views/pageflow/editor/files/create.json.jbuilder
 - app/views/pageflow/editor/files/index.json.jbuilder
 - app/views/pageflow/editor/image_files/_image_file.json.jbuilder
@@ -1204,11 +1215,14 @@ files:
 - app/views/pageflow/entries/show.css.erb
 - app/views/pageflow/entries/show.html.erb
 - app/views/pageflow/entries/show.json.jbuilder
+- app/views/pageflow/file_types/_thumbnails.css.erb
+- app/views/pageflow/files/show.html.erb
 - app/views/pageflow/page_types/_page_type.json.jbuilder
 - app/views/pageflow/pages/_info_box.html.erb
 - app/views/pageflow/pages/_page.html.erb
 - app/views/pageflow/pages/_video_tag.html.erb
 - app/views/pageflow/pages/templates/_audio.html.erb
+- app/views/pageflow/pages/templates/_audio_loop.html.erb
 - app/views/pageflow/pages/templates/_background_image.html.erb
 - app/views/pageflow/pages/templates/_background_video.html.erb
 - app/views/pageflow/pages/templates/_internal_links.html.erb
@@ -1216,7 +1230,7 @@ files:
 - app/views/pageflow/revisions/create.json.jbuilder
 - app/views/pageflow/user_mailer/invitation.html.erb
 - app/views/pageflow/user_mailer/invitation.text.erb
-- app/views/pageflow/video_files/show.html.erb
+- app/views/pageflow/video_files/_video_file.html.erb
 - config/initializers/page_type_helpers.rb
 - config/initializers/paperclip.rb
 - config/initializers/view_components.rb
@@ -1240,6 +1254,8 @@ files:
 - config/locales/editor/quotas.de.yml
 - config/locales/en.yml
 - config/locales/formtastic.de.yml
+- config/locales/pageflow/audio.de.yml
+- config/locales/pageflow/editor/errors.de.yml
 - config/locales/pageflow/user_mailer.yml
 - config/locales/quotas.de.yml
 - config/locales/rails.de.yml
@@ -1286,6 +1302,8 @@ files:
 - lib/pageflow/built_in_page_type.rb
 - lib/pageflow/configuration.rb
 - lib/pageflow/engine.rb
+- lib/pageflow/file_type.rb
+- lib/pageflow/file_types.rb
 - lib/pageflow/hooks.rb
 - lib/pageflow/page_type.rb
 - lib/pageflow/quota.rb
@@ -1310,6 +1328,7 @@ files:
 - spec/factories/entries.rb
 - spec/factories/file_usages.rb
 - spec/factories/folders.rb
+- spec/factories/hosted_files.rb
 - spec/factories/image_files.rb
 - spec/factories/invited_user.rb
 - spec/factories/memberships.rb

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

@@ -1,7 +0,0 @@
-pageflow.AudioFilesCollection = Backbone.Collection.extend({
-  model: pageflow.AudioFile,
-
-  name: 'audio_files',
-
-  mixins: [pageflow.filesCollection]
-});

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

@@ -1,8 +0,0 @@
-pageflow.ImageFilesCollection = Backbone.Collection.extend({
-  model: pageflow.ImageFile,
-
-  name: 'image_files',
-
-  mixins: [pageflow.filesCollection]
-
-});

data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js

@@ -1,42 +0,0 @@
-// Mixin for FilesCollecions
-// Concrete collections need to set attribute "name". i.e. "audio_files"
-pageflow.filesCollection = {
-  initialize: function(models, options) {
-    options = options || {};
-    this.entry = options.entry;
-  },
-
-  comparator: function(file) {
-    var fileName = file.get('file_name');
-    return fileName.toLowerCase ? fileName.toLowerCase() : fileName;
-  },
-
-  url: function() {
-    return '/editor/entries/' + this.getEntry().get('id') + '/' + this.name;
-  },
-
-  getEntry: function() {
-    return this.entry || pageflow.entry;
-  },
-
-  confirmable: function() {
-    return new pageflow.SubsetCollection({
-      parent: this,
-      watchAttribute: 'state',
-
-      filter: function(item) {
-        return item.get('state') === 'waiting_for_confirmation';
-      },
-    });
-  },
-
-  fileType: function() {
-    var plural = _.map(this.name.split('_'), upperCaseFirst).join('');
-
-    return plural.substring(0, plural.length-1);
-
-    function upperCaseFirst(string) {
-      return string.charAt(0).toUpperCase() + string.slice(1);
-    }
-  }
-};

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

@@ -1,8 +0,0 @@
-pageflow.VideoFilesCollection = Backbone.Collection.extend({
-  model: pageflow.VideoFile,
-
-  name: 'video_files',
-
-  mixins: [pageflow.filesCollection]
-
-});

data/app/assets/javascripts/pageflow/editor/models/mixins/encoded_file.js

@@ -1,51 +0,0 @@
-pageflow.encodedFile = {
-  stageMapping: function() {
-    var mapping = {
-      uploading: {
-        activeStates: ['uploading'],
-        finishedStates: ['not_uploaded_to_s3', 'upload_to_s3', 'uploading_to_s3', 'upload_to_s3_failed', 'waiting_for_meta_data', 'fetching_meta_data', 'fetching_meta_data_failed', 'waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
-        failedStates: ['upload_failed']
-      },
-      uploading_to_s3: {
-        activeStates: ['uploading_to_s3'],
-        finishedStates: ['waiting_for_meta_data', 'fetching_meta_data', 'fetching_meta_data_failed', 'waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
-        failedStates: ['upload_to_s3_failed']},
-      fetching_meta_data: {
-        activeStates: ['waiting_for_meta_data', 'fetching_meta_data'],
-        finishedStates: ['waiting_for_confirmation', 'waiting_for_encoding', 'encoding', 'encoded', 'encoding_failed'],
-        failedStates: ['fetching_meta_data_failed']},
-      encoding: {
-        actionRequiredStates: ['waiting_for_confirmation'],
-        activeStates: ['waiting_for_encoding', 'encoding'],
-        finishedStates: ['encoded'],
-        failedStates: ['fetching_meta_data_failed', 'encoding_failed']
-      }
-    };
-
-    if (!pageflow.config.confirmEncodingJobs) {
-      delete mapping.fetching_meta_data;
-    }
-
-    return mapping;
-  },
-
-  isReady: function() {
-    return this.get('state') === 'encoded';
-  },
-
-  isConfirmable: function() {
-    return this.get('state') === 'waiting_for_confirmation';
-  },
-
-  isFailed: function() {
-    return this.get('state').match(/_failed$/);
-  },
-
-  isPending: function() {
-    return !this.isUploading() && !this.isReady() && !this.isFailed();
-  },
-
-  isRetryable: function() {
-    return ['upload_to_s3_failed', 'encoding_failed'].indexOf(this.get('state')) >= 0;
-  },
-};

data/app/assets/javascripts/pageflow/editor/models/mixins/file.js

@@ -1,31 +0,0 @@
-pageflow.file = {
-  cancelUpload: function() {
-    if (this.get('state') === 'uploading') {
-      this.trigger('uploadCancelled');
-      this.destroy();
-    }
-  },
-
-  uploadFailed: function() {
-    this.set('state', 'upload_failed');
-    this.unset('uploading_progress');
-
-    this.trigger('uploadFailed');
-  },
-
-  isUploading: function() {
-    return this.get('state') === 'uploading';
-  },
-
-  isUploaded: function() {
-    return this.get('state') !== 'uploading' && this.get('state') !== 'upload_failed';
-  },
-
-  destroyUsage: function() {
-    var usage = new pageflow.FileUsage({id: this.get('usage_id')});
-
-    usage.destroy();
-
-    this.trigger('destroy', this, this.collection, {});
-  }
-};

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

@@ -1,14 +0,0 @@
-pageflow.AudioFileItemView = pageflow.FileItemView.extend({
-  metaDataViews: function() {
-    return [
-      new pageflow.FileMetaDataItemView({
-        model: this.model,
-        attribute: 'format'
-      }),
-      new pageflow.FileMetaDataItemView({
-        model: this.model,
-        attribute: 'duration'
-      })
-    ];
-  }
-});