pageflow 0.4.0 → 0.5.0

data/app/state_machines/pageflow/image_file_state_machine.rb

@@ -32,5 +32,9 @@ module Pageflow
     def publish!
       process!
     end
+
+    def retryable?
+      processing_failed?
+    end
   end
 end

data/app/views/pageflow/audio_files/_audio_file.html.erb

@@ -0,0 +1 @@
+<%= audio_file_audio_tag(audio_file.id, unique_id: 'single') %>

data/app/views/pageflow/audio_files/_script_tag.html.erb

@@ -0,0 +1,3 @@
+<script type="application/json" data-audio>
+  <%= audio_file_sources.to_json.html_safe %>
+</script>

data/app/views/pageflow/config/_editor_seeds.json.jbuilder

@@ -1,2 +1,3 @@
 json.key_format!(camelize: :lower)
 json.(Pageflow.config, :confirm_encoding_jobs)
+json.file_types(Pageflow.config.file_types, :collection_name, :type_name, :param_key, :i18n_key)

data/app/views/pageflow/editor/audio_files/_audio_file.json.jbuilder

@@ -1,14 +1,8 @@
-json.(audio_file, :id, :state, :rights, :usage_id)
 json.encoding_progress(audio_file.encoding_progress.to_i)
-json.file_name audio_file.attachment.original_filename
 
 json.format(file_format(audio_file))
 json.duration(file_duration(audio_file))
 
-if audio_file.attachment_on_s3.present?
-  json.url(audio_file.attachment_on_s3.url)
-end
-
 if audio_file.state == 'encoded'
   json.sources(audio_file_sources(audio_file)) do |source|
     json.src source[:src]

data/app/views/pageflow/editor/files/_file.json.jbuilder

@@ -0,0 +1,16 @@
+json.(file, :id, :state, :rights, :usage_id)
+json.retryable(file.retryable?)
+json.file_name(file.attachment.original_filename)
+
+if file.url.present?
+  json.url(file.url)
+end
+
+if file_type.editor_partial.present?
+  json.partial!(:object => file, :partial => file_type.editor_partial)
+end
+
+if file.respond_to?(:thumbnail_url)
+  json.thumbnail_url(file.thumbnail_url(:thumbnail))
+  json.link_thumbnail_url(file.thumbnail_url(:link_thumbnail_large))
+end

data/app/views/pageflow/editor/files/create.json.jbuilder

@@ -1 +1 @@
-json.partial!(:object => @file, :partial => "pageflow/editor/#{@collection_name}/#{@model_name.to_s}")
+json.partial!(partial: 'pageflow/editor/files/file', object: @file, locals: {file_type: file_type})

data/app/views/pageflow/editor/files/index.json.jbuilder

@@ -1 +1,4 @@
-json.array!(@files, :partial => "pageflow/editor/#{@collection_name}/#{@model_name.to_s}", :as => @model_name)
+json.partial!(collection: @files,
+              partial: 'pageflow/editor/files/file',
+              locals: {file_type: file_type},
+              as: :file)

data/app/views/pageflow/editor/image_files/_image_file.json.jbuilder

@@ -1,10 +1,3 @@
-json.(image_file, :id, :state, :rights, :usage_id, :width, :height)
-json.file_name(image_file.attachment.original_filename)
-json.url(image_file.attachment.url(:large))
+json.(image_file, :width, :height)
 
 json.dimensions(file_dimensions(image_file))
-
-if image_file.processed_attachment.present?
-  json.thumbnail_url(image_file.attachment.url(:thumbnail))
-  json.link_thumbnail_url(image_file.attachment.url(:link_thumbnail_large))
-end

data/app/views/pageflow/editor/video_files/_video_file.json.jbuilder

@@ -1,15 +1,9 @@
-json.(video_file, :id, :state, :rights, :usage_id)
 json.encoding_progress(video_file.encoding_progress.to_i)
-json.file_name(video_file.attachment.original_filename)
 
 json.format(file_format(video_file))
 json.dimensions(file_dimensions(video_file))
 json.duration(file_duration(video_file))
 
-if video_file.attachment_on_s3.present?
-  json.url(video_file.attachment_on_s3.url)
-end
-
 if video_file.state == 'encoded'
   json.sources(video_file_sources(video_file)) do |source|
     json.src source[:high_src]
@@ -18,7 +12,5 @@ if video_file.state == 'encoded'
 end
 
 if video_file.poster.present?
-  json.thumbnail_url(video_file.poster.url(:thumbnail))
-  json.link_thumbnail_url(video_file.poster.url(:link_thumbnail_large))
   json.poster_url(video_file.poster.url(:large))
 end

data/app/views/pageflow/entries/_entry.html.erb

@@ -1,4 +1,4 @@
-<div id="outer_wrapper">
+<%= content_tag :div, :id => 'outer_wrapper', :data => {:theme => entry.theming.theme.name} do %>
   <%= render 'pageflow/entries/skip_links' %>
   <h1 class="hidden"><%= entry.title %></h1>
   <img src="<%= image_path("pageflow/themes/#{entry.theming.theme.directory_name}/logo_print.png") %>" class="print_image" alt="Logo image for print version">
@@ -13,4 +13,4 @@
   <%= render 'pageflow/entries/header', :entry => entry %>
   <%= render 'pageflow/entries/navigation', :entry => entry %>
   <%= render 'pageflow/entries/overview', :entry => entry %>
-</div>
+<% end %>

data/app/views/pageflow/entries/_multimedia_alert.html.erb

@@ -3,16 +3,23 @@
     <div class="alert_block">
     <h1 class="alert_headline">Hinweis</h1>
     <div class="alert_icon speaker"></div>
-      <p>Dieses multimediale Reportage-Format nutzt neben Texten und Fotos auch
-        Audios und Videos. Bitte prüfen Sie daher vor dem Start, ob die
-        Lautsprecher Ihres Systems eingeschaltet sind.</p>
+      <p>
+        Für dieses multimediale Reportage-Format nutzen wir neben
+        Texten und Fotos auch Audios und Videos. Daher sollten die
+        Lautsprecher des Systems eingeschaltet sein.
+      </p>
     </div>
     <div class="alert_block">
       <div class="alert_icon scrolling"></div>
-      <p class="scroll_hint desktop">Zur jeweils nächsten Kapitelseite gelangen Sie, indem Sie das Mausrad
-        oder die Pfeiltasten auf der Tastatur bedienen.</p>
-      <p class="scroll_hint mobile">Zur jeweils nächsten Kapitelseite gelangen Sie durch Wischen.</p>
+      <p class="scroll_hint desktop">
+        Mit dem Mausrad oder den Pfeiltasten auf der Tastatur wird die
+        jeweils nächste Kapitelseite aufgerufen.
+      </p>
+      <p class="scroll_hint mobile">
+        Durch Wischen wird die jeweils nächste Kapitelseite
+        aufgerufen.
+      </p>
       <a class="close" href="#" tabindex="1">Los geht's</a>
     </div>
   </div>
-</div>
+</div>

data/app/views/pageflow/entries/_social_meta_tags.html.erb

@@ -1,6 +1,6 @@
 <%= tag :link, :rel => "canonical", :href => pretty_entry_url(entry) %>
 
-<%= tag :meta, :property => "og:image:url", :content => entry.thumbnail.url(:medium).gsub('https://', 'http://') %>
+<%= tag :meta, :property => "og:image:url", :content => entry.thumbnail_url(:medium).gsub('https://', 'http://') %>
 
 <%= tag :meta, :property => "og:title", :content => "#{entry.title} - #{entry.theming.cname_domain}" %>
 <%= tag :meta, :property => "og:description", :name => "description", :content => entry_summary(entry) %>

data/app/views/pageflow/entries/edit.html.erb

@@ -19,7 +19,7 @@
 <div class="dialog_container">
 </div>
 
-<%= form_for [:editor, @entry, Pageflow::ImageFile.new], :html => {:multipart => true, :id => 'upload'} do |f| %>
+<%= form_for editor_entry_files_path(@entry, collection_name: 'image_files'), :html => {:multipart => true, :id => 'upload'} do |f| %>
   <%= f.file_field :attachment, :multiple => true, :name => 'image_file[attachment]' %>
 <% end %>
 
@@ -37,9 +37,11 @@
         chapters: <%= @entry.chapters.to_json.html_safe %>,
         pages: <%= @entry.pages.to_json.html_safe %>,
 
-        imageFiles: <%= render_json_seed(@entry.image_files.with_usage_id) %>,
-        videoFiles: <%= render_json_seed(@entry.video_files.with_usage_id) %>,
-        audioFiles: <%= render_json_seed(@entry.audio_files.with_usage_id) %>,
+        files: {
+          <% Pageflow.config.file_types.each do |file_type| %>
+            <%= file_type.collection_name %>: <%= render_json_partial(partial: 'pageflow/editor/files/file', collection: @entry.files(file_type.model), locals: {file_type: file_type}, as: :file) %>,
+          <% end %>
+        },
 
         theming: <%= render_json_seed(@entry.theming) %>,
         page_types: <%= page_type_json_seeds %>

data/app/views/pageflow/entries/navigation/_bar_top.html.erb

@@ -18,7 +18,7 @@
       <span class="button"></span>
     </a>
   </li>
-  <li class="navigation_menu" tabindex="2">
+  <li class="navigation_menu share" tabindex="2">
     <div class="navigation_menu_box navigation_share_box">
       <%= link_to "http://www.facebook.com/sharer/sharer.php?s=100&p%5Burl%5D=#{ERB::Util.url_encode(pretty_entry_url(entry))}&p%5Btitle%5D=#{ERB::Util.url_encode(entry.title)}", :target => "_blank", :tabindex => "2", :class => "share facebook" do %>
           <span class="hint">über facebook teilen</span>

data/app/views/pageflow/entries/navigation/_page.html.erb

@@ -1,10 +1,10 @@
 <li class="<%= page.template %>">
   <%= link_to "##{page.perma_id}", :data => {:link => page.id} do %>
-      <%= image_tag(page.thumbnail.url(image_style), :width => image_width) %>
+      <%= image_tag(page.thumbnail_url(image_style), :width => image_width) %>
   <% end %>
   <div class="navigation_site_detail">
     <%= page.title %>
 
-    <%= image_tag("pageflow/#{page.template}_pictogram.png", :style => "background-image: url('#{page.thumbnail.url(:navigation_thumbnail_large)}')") %>
+    <%= image_tag("pageflow/#{page.template}_pictogram.png", :style => "background-image: url('#{page.thumbnail_url(:navigation_thumbnail_large)}')") %>
   </div>
 </li>

data/app/views/pageflow/entries/overview/_chapter.html.erb

@@ -1,7 +1,9 @@
 <% chapter.pages.in_groups_of(4, false).each_with_index do |page_group, index| %>
 
     <div class="ov_chapter">
-      <span class="heading-5"><%= "Kapitel #{chapter.position + 1}" if index == 0 %></span>
+      <% if chapters_count > 1 %>
+        <span class="heading-5"><%= "Kapitel #{chapter.position + 1}" if index == 0 %></span>
+      <% end %>
       <span class="heading-4"><%= chapter.title if index == 0 %></span>
       <%= render :partial => 'pageflow/entries/overview/page', :collection => page_group, :locals => {:chapter => chapter} %>
     </div>

data/app/views/pageflow/entries/overview/_entry.html.erb

@@ -7,7 +7,8 @@
 
     <div class="wrapper">
       <div class="scroller">
-        <%= render :partial => 'pageflow/entries/overview/chapter', :collection => entry.chapters %>
+        <%= render :partial => 'pageflow/entries/overview/chapter', :collection => entry.chapters,
+                   :locals => {:chapters_count => entry.chapters.count} %>
       </div>
     </div>
 

data/app/views/pageflow/entries/overview/_page.html.erb

@@ -2,6 +2,6 @@
     <div class="ov_page_description">
       <p><%= raw(page.configuration['description']) unless page.configuration.blank? %></p>
     </div>
-    <%= image_tag("#{page.thumbnail.url(:thumbnail_overview_desktop)}") %>
+    <%= image_tag("#{page.thumbnail_url(:thumbnail_overview_desktop)}") %>
     <div class="pictogram"></div>
 <% end %>

data/app/views/pageflow/entries/show.css.erb

@@ -16,26 +16,6 @@
       <% end %>
     <% end %>
 
-    <% @entry.image_files.each do |image_file| %>
-      .image_file_link_thumbnail_<%= image_file.id %> {
-        background-image: url('<%= image_file.attachment.url(:link_thumbnail) %>');
-      }
-
-      .image_file_link_thumbnail_large_<%= image_file.id %> {
-        background-image: url('<%= image_file.attachment.url(:link_thumbnail_large) %>');
-      }
-    <% end %>
-
-    <% @entry.video_files.each do |video_file| %>
-      .video_file_link_thumbnail_<%= video_file.id %> {
-        background-image: url('<%= video_file.poster.url(:link_thumbnail) %>');
-      }
-
-      .video_file_link_thumbnail_large_<%= video_file.id %> {
-        background-image: url('<%= video_file.poster.url(:link_thumbnail_large) %>');
-      }
-    <% end %>
-
+    <%= file_thumbnails_css(@entry) %>
     <%= render 'pageflow/entries/theming' %>
-
 <% end %>

data/app/views/pageflow/entries/show.json.jbuilder

@@ -1,3 +1,8 @@
-json.image_files @entry.image_files.with_usage_id, :partial => 'pageflow/editor/image_files/image_file', :as => :image_file
-json.audio_files @entry.audio_files.with_usage_id, :partial => 'pageflow/editor/audio_files/audio_file', :as => :audio_file
-json.video_files @entry.video_files.with_usage_id, :partial => 'pageflow/editor/video_files/video_file', :as => :video_file
+Pageflow.config.file_types.each do |file_type|
+  json.set!(file_type.collection_name) do
+    json.partial!(collection: @entry.files(file_type.model),
+                  partial: 'pageflow/editor/files/file',
+                  locals: {file_type: file_type},
+                  as: :file)
+  end
+end

data/app/views/pageflow/file_types/_thumbnails.css.erb

@@ -0,0 +1,7 @@
+<% revision.files(file_type.model).each do |file| %>
+  <% styles.each do |style| %>
+    .<%= file_thumbnail_css_class(file, style) %> {
+      background-image: url('<%= file.thumbnail_url(style) %>');
+    }
+  <% end %>
+<% end %>

data/app/views/pageflow/files/show.html.erb

@@ -0,0 +1 @@
+<%= render(@file) %>

data/app/views/pageflow/page_types/_page_type.json.jbuilder

@@ -1,5 +1,9 @@
 json.(page_type, :name, :translation_key)
 
+json.thumbnail_candidates(page_type.thumbnail_candidates) do |candidate|
+  json.(candidate, :attribute, :file_collection)
+end
+
 if page_type.json_seed_template
   json.partial!(:template => page_type.json_seed_template, :locals => {:page_type => page_type})
 end

data/app/views/pageflow/pages/templates/_audio.html.erb

@@ -1,6 +1,5 @@
 <div class="blackLayer"></div>
 <div class="content_and_background audioPage">
-
   <div class="backgroundArea">
     <%= background_image_div(configuration, 'background_image') %>
     <%= shadow_div :opacity => configuration['gradient_opacity'] %>
@@ -42,14 +41,16 @@
     <div class="scroller">
       <div>
         <div class="contentWrapper">
-          <div class="audio-js-box">
-            <%= audio_tag(configuration['audio_file_id'], :unique_id => page.id) %>
-          </div>
           <div class="contentText audioPage">
-           <p><%= raw configuration['text'] %></p>
+            <p class="non_js_audio">
+              <%= audio_file_non_js_link(configuration['audio_file_id']) %>
+            </p>
+            <p><%= raw configuration['text'] %></p>
           </div>
         </div>
       </div>
     </div>
   </div>
+
+  <%= audio_file_script_tag(configuration['audio_file_id'], :unique_id => page.id) %>
 </div>

data/app/views/pageflow/pages/templates/_audio_loop.html.erb

@@ -0,0 +1,34 @@
+<div class="blackLayer"></div>
+<div class="content_and_background audioPage">
+
+  <div class="backgroundArea">
+    <%= background_image_div(configuration, 'background_image') %>
+    <%= shadow_div :opacity => configuration['gradient_opacity'] %>
+  </div>
+
+  <div class="page_header">
+    <h2>
+      <span class="tagline"><%= configuration['tagline'] %></span>
+      <span class="title"><%= configuration['title'] %></span>
+      <span class="subtitle"><%= configuration['subtitle'] %></span>
+    </h2>
+    <%= background_image_tag(configuration['background_image_id'], {"class" => "print_image"}) %>
+  </div>
+
+  <div class="content">
+    <div class="scroller">
+      <div>
+        <div class="contentWrapper">
+          <div class="contentText audioPage">
+            <p class="non_js_audio">
+              <%= audio_file_non_js_link(configuration['audio_file_id']) %>
+            </p>
+            <p><%= raw configuration['text'] %></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= audio_file_script_tag(configuration['audio_file_id'], :unique_id => page.id) %>
+</div>

data/app/views/pageflow/video_files/_video_file.html.erb

@@ -0,0 +1 @@
+<%= lookup_video_tag(video_file.id, nil, :unique_id => 'single', :preload => true, :controls => true) %>

data/config/initializers/page_type_helpers.rb

@@ -1,5 +1,5 @@
-Pageflow.after_configure do
-  Pageflow.config.page_types.each do |page_type|
+Pageflow.after_configure do |config|
+  config.page_types.each do |page_type|
     page_type.view_helpers.each do |helper|
       Pageflow::EntriesController.helper(helper)
       Pageflow::RevisionsController.helper(helper)

data/config/initializers/paperclip.rb

@@ -32,6 +32,38 @@ Pageflow.configure do |config|
     :path => ':pageflow_filesystem_root/:class/:attachment/:id_partition/:style/:filename',
     :url => 'not_uploaded_yet'
   }
+
+  config.thumbnail_styles = {
+    thumbnail: {
+      geometry: '100x100#',
+      format: :JPG
+    },
+    navigation_thumbnail_small: {
+      geometry: '85x47#',
+      format: :JPG
+    },
+    navigation_thumbnail_large: {
+      geometry: '170x95#',
+      format: :JPG
+    },
+    thumbnail_overview_desktop: {
+      geometry: '230x72#',
+      format: :JPG
+    },
+    thumbnail_overview_mobile: {
+      geometry: '200x112#',
+      format: :JPG
+    },
+
+    link_thumbnail: {
+      geometry: '192x108#',
+      format: :JPG
+    },
+    link_thumbnail_large: {
+      geometry: '394x226#',
+      format: :JPG
+    }
+  }
 end
 
 if Rails.env.development?

data/config/initializers/zencoder.rb

@@ -1,8 +1,8 @@
 require 'zencoder'
 require 'pageflow/zencoder_api'
 
-Pageflow.after_configure do
-  zencoder_options = Pageflow.config.zencoder_options
+Pageflow.after_configure do |config|
+  zencoder_options = config.zencoder_options
   zencoder_options.reverse_merge!(:attachments_version => 'v1')
 
   Zencoder.api_key = zencoder_options.fetch(:api_key) { raise "Missing api_key option in Pageflow.config.zencoder_options." }
@@ -16,7 +16,7 @@ Pageflow.after_configure do
   raise "Missing s3_host_alias option in Pageflow.config.zencoder_options." unless zencoder_options.has_key?(:s3_host_alias)
   raise "Missing s3_protocol option in Pageflow.config.zencoder_options." unless zencoder_options.has_key?(:s3_protocol)
 
-  Pageflow::ZencoderAttachment.default_options.merge!(zencoder_options.slice(:path))
+  Pageflow::ZencoderAttachment.default_options.merge!(zencoder_options.slice(:path, :url, :hls_url, :hls_origin_url))
 end
 
 Paperclip.interpolates(:zencoder_host_alias) do |attachment, style|