pageflow 0.4.0 → 0.5.0

data/app/assets/stylesheets/pageflow/overview.css.scss

@@ -90,7 +90,7 @@
       position: relative;
       float: left;
       width: 265px;
-      height: 395px;
+      height: 400px;
       margin-top: 25px;
       margin-right: 10px;
       background-image: image-url('pageflow/chapter_bg.png');
@@ -121,9 +121,9 @@
         font-weight: bold;
         margin: 10px 17px;
         margin-top: 0;
-        height: 20px;
+        height: 44px;
         font-size: 1.1em;
-        margin-bottom: 21px;
+        overflow: hidden;
       }
 
       .heading-5 {

data/app/assets/stylesheets/pageflow/page_types.css.scss

@@ -1,10 +1,12 @@
 @import "page_types/audio";
+@import "page_types/audio_loop";
 @import "page_types/background-image";
 @import "page_types/background-video";
 @import "page_types/video";
 @import "page_types/internal_links";
 
 @include pageflow-page-type(audio);
+@include pageflow-page-type(audio_loop);
 @include pageflow-page-type(background_image);
 @include pageflow-page-type(background_video);
 @include pageflow-page-type(video);

data/app/assets/stylesheets/pageflow/page_types/audio.css.scss

@@ -10,19 +10,12 @@
 .audioPage .vjs-control-bar {
   position: absolute;
   left: 50%;
-  @include transform(translate(-50%, 0));
 }
 
 .audioPage {
   .vjs-controls.vjs-player {
     display: none;
   }
-  .audio-js-box {
-    margin-bottom: 3em;
-  }
-  audio {
-    pointer-events: all;
-  }
 }
 
 .js .audioPage {
@@ -34,12 +27,8 @@
     }
   }
 
-  .audio-js-box {
-    margin-bottom: 0;
-  }
-
-  audio {
-    visibility: hidden;
+  .non_js_audio {
+    display: none;
   }
 
   .vjs-slider-handle {

data/app/assets/stylesheets/pageflow/page_types/video.css.scss

@@ -126,6 +126,10 @@
 
   .vjs-control-bar {
     @include transform(translate3d(-50%, 0, 0));
+
+    @include phone {
+      @include transform(translate3d(0, 0, 0));
+    }
   }
   .vjs-tech {
     height: 100%;

data/app/assets/stylesheets/pageflow/player_controls.css.scss

@@ -6,12 +6,20 @@
   font-size: 0.8em;
   color: white;
 
+  @include phone {
+    font-size: 1.2em;
+  }
+
   h3,
   p {
     margin: 15px 3%;
     width: 94%;
   }
 
+  a {
+    color: white;
+  }
+
   &.empty {
     display: none;
   }
@@ -39,10 +47,13 @@
   .controls {
     position: absolute;
     bottom: 10%;
-    left: 0;
-    width: 100%;
+    left: 50%;
     z-index: 2;
 
+    @include phone {
+      left: 5%;
+    }
+
     .control_bar_text {
       position: absolute;
       left: 80px;
@@ -66,7 +77,10 @@
     @include transform(translate3d(-50%, 0,0));
     z-index: 2;
     font-size: 0.8em;
-    max-width: 90%;
+
+    @include phone {
+      font-size: 1.2em;
+    }
   }
 
   .vjs-control-bar {
@@ -242,11 +256,12 @@
       height: 60px;
       border: none;
       background: none;
-      width: 90%;
-      left: 50%;
+      width: 60px;
+      left: 0;
       margin-left: -4px;
       max-width: 435px;
       pointer-events: none;
+      @include transform(translate3d(0,0,0));
     }
 
     .add_info_box {
@@ -256,10 +271,15 @@
       padding-left: 0;
       max-width: 435px;
       min-height: 60px;
-      width: 90%;
+      width: 100%;
+      min-width: 260px;
 
       &.empty {
         display: block;
+        width: 60px;
+        @include transform(translate3d(0,0,0));
+        left: 0;
+        min-width: 0;
 
         &:before {
           display: none;
@@ -294,4 +314,50 @@
       bottom: 50px;
     }
   }
+
+/* Controlbar used to toggle embedded media views */
+
+  .controls {
+    pointer-events: none;
+
+    a, .vjs-control-bar {
+      pointer-events: all;
+    }
+
+    @include phone {
+      max-width: 90%;
+
+      .hint {
+        display: block;
+      }
+
+    }
+
+
+  }
+
+  .vjs-control-bar.view-control {
+    .control_bar_text {
+      top: 20px;
+    }
+
+    @include phone {
+      display: block;
+      top: 50%;
+      margin-top: -31px;
+      bottom: auto;
+      height: 60px;
+      width: 60px;
+      left: 0;
+      margin-left: -3px;
+      max-width: 435px;
+      pointer-events: all;
+      @include transform(translate3d(0, 0, 0));
+
+
+      .control_bar_text {
+        display: none;
+      }
+    }
+  }
 }

data/app/assets/stylesheets/pageflow/themes/default/navigation.css.scss

@@ -192,6 +192,9 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
   .internal_links:after {
     background-image: image-url('pageflow/themes/#{$theme-name}/internal_links_sprite.png');
   }
+  .audio_loop:after {
+    background-image: image-url('pageflow/themes/#{$theme-name}/image_sprite.png');
+  }
 }
 
 .navigation.js .scroller ul a.active img, .navigation_mobile .wrapper a.active {

data/app/assets/stylesheets/pageflow/themes/default/overview.css.scss

@@ -104,6 +104,9 @@ $overview-header-font: $standard-font;
     &.audio .pictogram {
       background-image: image-url('pageflow/ov-audio.png');
     }
+    &.audio_loop .pictogram {
+      background-image: image-url('pageflow/ov-image.png');
+    }
   }
 
   .content .ov_chapter .ov_page.active {

data/app/controllers/pageflow/editor/files_controller.rb

@@ -9,9 +9,7 @@ module Pageflow
         entry = DraftEntry.find(params[:entry_id])
 
         authorize!(:use_files, entry.to_model)
-        @files = entry.send(collection_name).with_usage_id
-        @model_name = model_name
-        @collection_name = collection_name.to_s
+        @files = entry.files(file_type.model)
 
         respond_with(:editor, @files)
       end
@@ -21,27 +19,24 @@ module Pageflow
         authorize!(:edit, entry.to_model)
         verify_edit_lock!(entry)
 
-        @file = entry.create_file(model, file_params)
+        @file = entry.create_file(file_type.model, file_params)
         @file.publish!
 
-        @model_name = model_name
-        @collection_name = collection_name.to_s
-
         respond_with(:editor, @file)
       end
 
       def retry
-        file = model.find(params[:id])
+        file = file_type.model.find(params[:id])
 
         authorize!(:retry, file)
         verify_edit_lock!(file.entry)
         file.retry!
 
-        respond_with(:editor, file)
+        respond_with(:editor, file, location: editor_file_url(file, collection_name: params[:collection_name]))
       end
 
       def update
-        file = model.find(params[:id])
+        file = file_type.model.find(params[:id])
 
         authorize!(:update, file)
         verify_edit_lock!(file.entry)
@@ -50,30 +45,22 @@ module Pageflow
         head(:no_content)
       end
 
-      protected
-
-      def model
-        raise NotImplementedError
-      end
-
       private
 
-      def collection_name
-        model.name.underscore.split('/').last.pluralize.to_sym
+      def file_type
+        @file_type ||= Pageflow.config.file_types.find_by_collection_name!(params[:collection_name])
       end
 
-      def model_name
-        model.name.underscore.split('/').last.to_sym
-      end
+      helper_method :file_type
 
       def file_params
-        params.require(model_name)
+        params.require(file_type.param_key)
           .permit(:attachment => [:tmp_path, :original_name, :content_type])
-          .merge(params.require(model_name).permit(:attachment))
+          .merge(params.require(file_type.param_key).permit(:attachment))
       end
 
       def update_params
-        params.require(model_name).permit(:rights)
+        params.require(file_type.param_key).permit(:rights)
       end
     end
   end

data/app/controllers/pageflow/{video_files_controller.rb → files_controller.rb}

@@ -1,18 +1,22 @@
 module Pageflow
-  class VideoFilesController < Pageflow::ApplicationController
+  class FilesController < Pageflow::ApplicationController
     before_filter :prevent_ssl
 
     def show
       respond_to do |format|
         format.html do
           entry = PublishedEntry.find(params[:entry_id], entry_request_scope)
-          @video_file = entry.video_files.find(params[:id])
+          @file = entry.files(file_type.model).find(params[:id])
         end
       end
     end
 
     protected
 
+    def file_type
+      @file_type ||= Pageflow.config.file_types.find_by_collection_name!(params[:collection_name])
+    end
+
     def entry_request_scope
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end

data/app/helpers/pageflow/audio_files_helper.rb

@@ -0,0 +1,40 @@
+module Pageflow
+  module AudioFilesHelper
+    def audio_file_audio_tag(audio_file_id, options = {})
+      options.merge!(class: ['audio-js', options.delete(:class)].compact * ' ',
+                     controls: true,
+                     preload: 'none')
+      url_options = {unique_id: options.delete(:unique_id)}
+
+      if (audio_file = AudioFile.find_by_id(audio_file_id))
+        content_tag(:audio, options) do
+          audio_file_sources(audio_file, url_options).each do |source|
+            concat(tag(:source, source.slice(:src, :type)))
+          end
+        end
+      end
+    end
+
+    def audio_file_script_tag(audio_file_id, options = {})
+      if (audio_file = AudioFile.find_by_id(audio_file_id))
+        render('pageflow/audio_files/script_tag',
+               audio_file: audio_file,
+               audio_file_sources: audio_file_sources(audio_file, options))
+      end
+    end
+
+    def audio_file_non_js_link(audio_file_id)
+      if (audio_file = AudioFile.find_by_id(audio_file_id))
+        link_to(t('pageflow.audio.open'), short_audio_file_path(audio_file.entry, audio_file))
+      end
+    end
+
+    def audio_file_sources(audio_file, options = {})
+      [
+        {type: 'audio/ogg', src: audio_file.ogg.url(options)},
+        {type: 'audio/mp4', src: audio_file.m4a.url(options)},
+        {type: 'audio/mpeg', src: audio_file.mp3.url(options)}
+      ]
+    end
+  end
+end

data/app/helpers/pageflow/file_thumbnails_helper.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  module FileThumbnailsHelper
+    def file_thumbnails_css(revision)
+      render(partial: 'pageflow/file_types/thumbnails',
+             collection: Pageflow.config.file_types.with_thumbnail_support,
+             as: :file_type,
+             locals: {
+               revision: revision,
+               styles: Pageflow.config.css_rendered_thumbnail_styles
+             })
+    end
+
+    def file_thumbnail_css_class(file, style)
+      return if file.blank?
+      [file.class.model_name.singular, style, file.id] * '_'
+    end
+  end
+end

data/app/helpers/pageflow/pages_helper.rb

@@ -86,27 +86,6 @@ module Pageflow
         }]
     end
 
-    def audio_tag(audio_id, options = {})
-      defaults = {:class => ['audio-js', options.delete(:class)].compact * ' ',
-        :controls => true, :preload => 'none'}
-      options.merge! defaults
-      url_options = {:unique_id => options.delete(:unique_id)}
-
-      if (audio = AudioFile.find_by_id(audio_id))
-        content_tag :audio, options do
-          audio_file_sources(audio, url_options).map do |v|
-            concat tag(:source, :src => v[:src], :type => v[:type])
-          end
-        end
-      end
-    end
-
-    def audio_file_sources(audio_file, options = {})
-      [{:type => 'audio/ogg', :src => audio_file.ogg.url(options)},
-        {:type => 'audio/mp4', :src => audio_file.m4a.url(options)},
-        {:type => 'audio/mpeg', :src => audio_file.mp3.url(options)}]
-    end
-
     def page_media_breakpoints
       {
         :large => :default,
@@ -140,9 +119,9 @@ module Pageflow
     end
 
     def page_thumbnail_image_class(page, hero)
-      model, attachment, property, model_class = page.thumbnail_definition
-      size = hero ? 'large_' : ''
-      "#{model_class}_link_thumbnail_#{size}#{page.configuration[property]}"
+      file_thumbnail_css_class(page.thumbnail_file, hero ? :link_thumbnail : :link_thumbnail_large)
     end
+
+    CSS_RENDERED_THUMBNAIL_STYLES = [:link_thumbnail, :link_thumbnail_large]
   end
 end

data/app/jobs/pageflow/upload_file_to_s3_job.rb

@@ -4,13 +4,13 @@ module Pageflow
 
     extend StateMachineJob
 
-    def self.perform_with_result(file, options)
+    def self.perform_with_result(file, options = {})
       if file && file.attachment_on_filesystem.file?
         if File.exists?(file.attachment_on_filesystem.path)
           file.attachment_on_s3 = file.attachment_on_filesystem
           file.save!
 
-          file.attachment_on_filesystem.destroy
+          file.attachment_on_filesystem.destroy unless file.keep_on_filesystem_after_upload_to_s3?
           :ok
         else
           logger.info "#{file.class.name} #{file.id} not yet transfered to instance."