pageflow 0.6.0 → 0.7.0

data/app/models/pageflow/published_entry.rb

@@ -14,6 +14,7 @@ module Pageflow
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
              :share_image_id, :share_image_x, :share_image_y,
+             :locale,
              :to => :revision)
 
     def initialize(entry, revision = nil)
@@ -31,7 +32,13 @@ module Pageflow
     end
 
     def thumbnail_url(*args)
-      pages.first.try(:thumbnail_url, *args) || ImageFile.new.processed_attachment.url(*args)
+      thumbnail_file.thumbnail_url(*args)
+    end
+
+    def thumbnail_file
+      share_image_file ||
+        pages.first.try(:thumbnail_file) ||
+        PositionedFile.null
     end
 
     def self.find(id, scope = Entry)
@@ -51,5 +58,9 @@ module Pageflow
     def custom_revision?
       @custom_revision
     end
+
+    def share_image_file
+      PositionedFile.wrap(ImageFile.find_by_id(share_image_id), share_image_x, share_image_y)
+    end
   end
 end

data/app/models/pageflow/revision.rb

@@ -45,6 +45,10 @@ module Pageflow
       super || NullUser.new
     end
 
+    def locale
+      super.presence || I18n.default_locale
+    end
+
     def pages
       super.tap { |p| p.first.is_first = true if p.present? }
     end

data/app/models/pageflow/theming.rb

@@ -20,7 +20,7 @@ module Pageflow
     end
 
     def name
-      I18n.t('admin.themings.name', :account_name => account.name, :theme_name => theme_name)
+      I18n.t('pageflow.admin.themings.name', :account_name => account.name, :theme_name => theme_name)
     end
   end
 end

data/app/models/pageflow/thumbnail_file_resolver.rb

@@ -1,23 +1,23 @@
 module Pageflow
   class ThumbnailFileResolver < Struct.new(:candidates, :configuration)
-    class Null
-      def thumbnail_url(*args)
-        ImageFile.new.processed_attachment.url(*args)
-      end
-
-      def blank?
-        true
-      end
-    end
-
     def find
       candidates.reduce(nil) do |result, candidate|
-        result || file_model(candidate).find_by_id(record_id(candidate))
-      end || Null.new
+        result || find_positioned_file_by_candiate(candidate)
+      end || PositionedFile.null
     end
 
     private
 
+    def find_positioned_file_by_candiate(candidate)
+      PositionedFile.wrap(find_file_by_candidate(candidate),
+                          file_position(candidate, :x),
+                          file_position(candidate, :y))
+    end
+
+    def find_file_by_candidate(candidate)
+      file_model(candidate).find_by_id(record_id(candidate))
+    end
+
     def file_model(candidate)
       file_type(candidate).model
     end
@@ -29,5 +29,13 @@ module Pageflow
     def record_id(candidate)
       configuration[candidate.fetch(:attribute)]
     end
+
+    def file_position(candidate, coordinate)
+      configuration[file_position_attribute(candidate, coordinate)]
+    end
+
+    def file_position_attribute(candidate, coordinate)
+      candidate.fetch(:attribute).gsub(/_id$/, "_#{coordinate}")
+    end
   end
 end

data/app/views/admin/entries/_attributes_table.html.arb

@@ -9,12 +9,12 @@ attributes_table_for entry do
     span :'data-published' => entry.published? do
       if entry.published?
         if entry.published_until
-          I18n.t('admin.entries.published_until', :published_until => I18n.l(entry.published_until))
+          I18n.t('pageflow.admin.entries.published_until', :published_until => I18n.l(entry.published_until))
         else
-          I18n.t('admin.entries.published_forever')
+          I18n.t('pageflow.admin.entries.published_forever')
         end
       else
-        I18n.t('admin.entries.not_published')
+        I18n.t('pageflow.admin.entries.not_published')
       end
     end
   end

data/app/views/admin/entries/_links.html.arb

@@ -1,9 +1,9 @@
 para do
   if authorized?(:edit, Pageflow::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

data/app/views/admin/revisions/_form.html.erb

@@ -2,7 +2,7 @@
   <%= f.inputs do %>
     <%= f.input(:published_until,
                 :as => :string,
-                :hint => t('admin.revisions.published_until_hint'),
+                :hint => t('pageflow.admin.revisions.published_until_hint'),
                 :input_html => {
                   :value => f.object.published_until && I18n.l(f.object.published_until.to_date)
                 }) %>

data/app/views/admin/users/_form.html.erb

@@ -7,13 +7,19 @@
         <%= quota_state_description(:users, @user.account) %>
       <% end %>
 
-      <%= f.input :email, :hint => f.object.new_record? && I18n.t('admin.users.email_invitation_hint') %>
+      <%= f.input :email, :hint => f.object.new_record? && I18n.t('pageflow.admin.users.email_invitation_hint') %>
       <%= f.input :first_name %>
       <%= f.input :last_name %>
+      <%= f.input :locale,
+                  as: :select,
+                  include_blank: false,
+                  collection: available_locales_collection %>
+
       <% if authorized?(:read, Pageflow::Account) %>
         <%= f.input :account, :include_blank => false %>
       <% end %>
-      <%= f.input :role, :collection => collection_for_user_roles, :include_blank => false, :hint => authorized?(:read, Pageflow::Account) ? I18n.t('admin.users.role_hint.admin') : I18n.t('admin.users.role_hint.other') %>
+
+      <%= f.input :role, :collection => collection_for_user_roles, :include_blank => false, :hint => authorized?(:read, Pageflow::Account) ? I18n.t('pageflow.admin.users.role_hint.admin') : I18n.t('pageflow.admin.users.role_hint.others') %>
     <% end %>
     <%= f.actions %>
   <% end %>

data/app/views/admin/users/delete_me.html.erb

@@ -1,12 +1,12 @@
 <%= semantic_form_for current_user, :url => delete_me_admin_users_path, :method => 'delete', :html => {:class => 'delete_account'} do |form| %>
   <%= form.inputs do %>
     <li>
-      <p><%= t('.warning_html') %></p>
+      <p><%= t('pageflow.admin.users.delete_me.warning_html') %></p>
     </li>
     <%= form.input :current_password %>
   <% end %>
   <%= form.actions do %>
-    <%= form.action :submit, :label => t('.delete_label') %>
-    <%= form.action :cancel, :label => t('.cancel_label') %>
+    <%= form.action :submit, :label => t('pageflow.admin.users.delete_me.delete_label') %>
+    <%= form.action :cancel, :label => t('pageflow.admin.users.delete_me.cancel_label') %>
   <% end %>
 <% end %>

data/app/views/admin/users/me.html.erb

@@ -1,13 +1,21 @@
 <%= semantic_form_for current_user, :url => me_admin_users_path, :html => {:class => 'profile'} do |form| %>
   <%= form.inputs :first_name, :last_name %>
+
+  <%= form.inputs  do %>
+    <%= form.input :locale,
+                   as: :select,
+                   include_blank: false,
+                   collection: available_locales_collection %>
+  <% end %>
+
   <%= form.inputs do %>
-    <%= form.input :current_password, :hint => t('.change_password_hint') %>
+    <%= form.input :current_password, :hint => t('pageflow.admin.users.me.change_password_hint') %>
     <%= form.input :password %>
     <%= form.input :password_confirmation %>
   <% end %>
   <%= form.actions %>
   <p>
-    <%= t('.delete_account_hint') %>
-    <%= link_to(t('.delete_account'), delete_me_admin_users_path, :class => 'delete_account') %>
+    <%= t('pageflow.admin.users.me.delete_account_hint') %>
+    <%= link_to(t('pageflow.admin.users.me.delete_account'), delete_me_admin_users_path, :class => 'delete_account') %>
   </p>
 <% end %>

data/app/views/components/pageflow/admin/entries_tab.rb

@@ -12,7 +12,7 @@ module Pageflow
           else
             div :class => "blank_slate_container" do
             span :class => "blank_slate" do
-              I18n.t('admin.accounts.no_entries')
+              I18n.t('pageflow.admin.accounts.no_entries')
             end
           end
         end

data/app/views/components/pageflow/admin/grouped_folder_list.rb

@@ -26,9 +26,9 @@ module Pageflow
         ul(:class => 'folders') do
           li('data-role' => 'all') do
             if @active_id
-              link_to(t('admin.folders.all'), main_app.admin_entries_path, :class => 'name')
+              link_to(t('pageflow.admin.folders.all'), main_app.admin_entries_path, :class => 'name')
             else
-              span(t('admin.folders.all'), :class => 'name')
+              span(t('pageflow.admin.folders.all'), :class => 'name')
             end
           end
         end
@@ -64,19 +64,19 @@ module Pageflow
       end
 
       def edit_folder_link(folder)
-        link_to(t('admin.folders.edit'),
+        link_to(t('pageflow.admin.folders.edit'),
                 main_app.edit_admin_folder_path(folder),
-                :title => t('admin.folders.edit'),
+                :title => t('pageflow.admin.folders.edit'),
                 :class => 'edit_folder')
       end
 
       def delete_folder_link(folder)
-        link_to(t('admin.folders.destroy'),
+        link_to(t('pageflow.admin.folders.destroy'),
                 main_app.admin_folder_path(folder),
                 :method => :delete,
-                :title => t('admin.folders.destroy'),
+                :title => t('pageflow.admin.folders.destroy'),
                 :class => 'delete',
-                :data => {:confirm => t('admin.folders.confirm_destroy')})
+                :data => {:confirm => t('pageflow.admin.folders.confirm_destroy')})
       end
 
       def folders_by_account(account)

data/app/views/components/pageflow/admin/members_tab.rb

@@ -4,7 +4,7 @@ module Pageflow
       def build(entry)
         if entry.memberships.any?
           table_for entry.memberships, :class => 'memberships' do
-            column t('activerecord.attributes.user.full_name') do |membership|
+            column t('activerecord.attributes.user.full_name'), class: 'name' do |membership|
               if authorized? :manage, User
                 link_to membership.user.full_name, admin_user_path(membership.user), :class => 'view_creator'
               else
@@ -13,20 +13,20 @@ module Pageflow
             end
             column do |membership|
               if authorized?(:destroy, membership)
-                link_to(I18n.t('admin.entries.remove'), admin_entry_membership_path(membership.entry, membership), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation'), :rel => 'delete_membership'})
+                link_to(I18n.t('pageflow.admin.entries.remove'), admin_entry_membership_path(membership.entry, 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.entries.no_members')
+              I18n.t('pageflow.admin.entries.no_members')
             end
           end
         end
         if authorized? :manage, Pageflow::Entry
           span do
-            link_to I18n.t('admin.users.add'), new_admin_entry_membership_path(entry), :class => 'button', :data => {:rel => 'add_member'}
+            link_to I18n.t('pageflow.admin.users.add'), new_admin_entry_membership_path(entry), :class => 'button', :data => {:rel => 'add_member'}
           end
         end
       end

data/app/views/components/pageflow/admin/revisions_tab.rb

@@ -2,7 +2,7 @@ module Pageflow
   module Admin
     class RevisionsTab < ViewComponent
       def build(entry)
-        embedded_index_table entry.revisions, :blank_slate_text => I18n.t('admin.entries.no_revisions') do
+        embedded_index_table entry.revisions, :blank_slate_text => I18n.t('pageflow.admin.entries.no_revisions') do
           scope(:publications)
           scope(:publications_and_user_snapshots)
           scope(:frozen)
@@ -24,25 +24,25 @@ module Pageflow
               if revision.published_until
                 I18n.l(revision.published_until)
               elsif revision.published?
-                I18n.t('admin.entries.forever')
+                I18n.t('pageflow.admin.entries.forever')
               else
                 '-'
               end
             end
             column :created_with do |revision|
-              span(I18n.t(revision.created_with, :scope => 'admin.entries.revision_created_with'),
-                   :title => I18n.t(revision.created_with, :scope => 'admin.entries.revision_created_with_hint'))
+              span(I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with'),
+                   :title => I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with_hint'))
             end
             column do |revision|
-              text_node(link_to(t('admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))
-              text_node(link_to(t('admin.entries.restore'), restore_admin_revision_path(revision), :method => :post, :class => 'restore', :data => {:confirm => I18n.t('admin.entries.confirm_restore')}))
+              text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))
+              text_node(link_to(t('pageflow.admin.entries.restore'), restore_admin_revision_path(revision), :method => :post, :class => 'restore', :data => {:confirm => I18n.t('pageflow.admin.entries.confirm_restore')}))
             end
           end
         end
 
-        para(I18n.t('admin.entries.published_revision_legend'), :class => 'legend published')
+        para(I18n.t('pageflow.admin.entries.published_revision_legend'), :class => 'legend published')
 
-        text_node(button_to(t('admin.entries.snapshot'),
+        text_node(button_to(t('pageflow.admin.entries.snapshot'),
                             snapshot_admin_entry_path(entry),
                             :method => :post))
       end

data/app/views/components/pageflow/admin/users_tab.rb

@@ -12,7 +12,7 @@ module Pageflow
         else
           div :class => "blank_slate_container" do
             span :class => "blank_slate" do
-              I18n.t('admin.accounts.no_members')
+              I18n.t('pageflow.admin.accounts.no_members')
             end
           end
         end

data/app/views/layouts/pageflow/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<%= content_tag(:html, lang: I18n.locale) do %>
 <head>
   <title><%= @page_title.presence || 'Pageflow' %></title>
 
@@ -24,4 +24,4 @@
   </script>
   <%= yield %>
 <% end %>
-</html>
+<% end %>

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

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

data/app/views/pageflow/devise/mailer/reset_password_instructions.html.erb

@@ -1,7 +1,9 @@
-<p>Hallo <%= @resource.first_name %>,</p>
+<% I18n.with_locale(@resource.locale) do %>
+  <p><%= t('.salutation', first_name: @resource.first_name, last_name: @resource.last_name) %>,</p>
 
-<p>für dein persönliches Pageflow-Benutzerkonto wurde ein Link zur Passwortänderung angefordert. Du kannst diese Aktion durchführen, indem du folgenden Link anklickst.</p>
+  <p><%= t('.instruction') %></p>
 
-<p><%= link_to edit_password_url(@resource, :reset_password_token => @resource.reset_password_token), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+  <p><%= link_to edit_password_url(@resource, :reset_password_token => @resource.reset_password_token), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
 
-<p>Falls Du diese Anfrage zur Passwortänderung gar nicht selbst gestartet hast, ignorier diese Mail einfach. Dein Passwort wird nicht geändert, bevor du den oben stehenden Link nicht bestätigt hast und im Anschluss ein neues Passwort anlegst.</p>
+  <p><%= t('.ignore_hint') %></p>
+<% end %>

data/app/views/pageflow/editor/entries/_entry.json.jbuilder

@@ -6,7 +6,7 @@ json.default_file_rights entry.account.default_file_rights
 json.published(entry.published?)
 
 json.configuration do
-  json.(entry, :title, :summary, :credits, :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages, :share_image_id, :share_image_x, :share_image_y)
+  json.(entry, :title, :summary, :credits, :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages, :share_image_id, :share_image_x, :share_image_y, :locale)
   json.home_url entry.home_button.url_value
   json.home_button_enabled entry.home_button.enabled_value
 end

data/app/views/pageflow/editor/entries/_help_entries_seed.html.erb

@@ -0,0 +1,6 @@
+<div id="help_entries_seed">
+  <nav>
+    <%= help_entries_menu %>
+  </nav>
+  <%= help_entry_sections %>
+</div>

data/app/views/pageflow/editor/entries/seed.json.erb

@@ -0,0 +1,14 @@
+{
+  "root": "<%= edit_entry_path(@entry).html_safe %>",
+  "config": <%= editor_config_seeds %>,
+
+  "entry": <%= render_json_seed(@entry) %>,
+  "chapters": <%= @entry.chapters.to_json.html_safe %>,
+  "pages": <%= @entry.pages.to_json.html_safe %>,
+
+  "files": <%= files_json_seeds(@entry) %>,
+
+  "theming": <%= render_json_seed(@entry.theming) %>,
+  "widget_types": <%= widget_types_json_seeds %>,
+  "page_types": <%= page_type_json_seeds %>
+}

data/app/views/pageflow/editor/entry_publications/_published_message.html.erb

@@ -0,0 +1 @@
+

data/app/views/pageflow/editor/entry_publications/check.json.jbuilder

@@ -10,3 +10,6 @@ json.exhausted_html(render_html_partial('pageflow/editor/quotas/published_entrie
                                         entry: @entry_publication.entry,
                                         quota: @entry_publication.quota,
                                         account: @entry_publication.quota.account))
+json.published_message_html(render_html_partial('published_message',
+                                                 entry: @entry_publication.entry,
+                                                 account: @entry_publication.quota.account))

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

@@ -5,13 +5,13 @@
 
   <%= 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">
+  <img src="<%= image_path("pageflow/themes/#{entry.theming.theme.directory_name}/logo_print.png") %>" class="print_image" alt="<%= t('.print_logo') %>">
   <span class="print_only page_url"><%= request.original_url %></span>
   <%= content_tag :div, :id => 'content', :class => 'entry', :data => {:role => 'slideshow'} do %>
     <%= render entry.pages %>
 
-    <div class="scroll_indicator indicator">Scrollen, um weiterzulesen</div>
-    <div class="hidden_text_indicator indicator">Wischen um Text wieder einzublenden</div>
+    <div class="scroll_indicator indicator"><%= t('.scroll_indicator') %></div>
+    <div class="hidden_text_indicator indicator"><%= t('.swipe_indicator') %></div>
   <% end %>
 
   <%= render 'pageflow/entries/header', :entry => entry %>