pageflow 0.10.0 → 0.11.0

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

@@ -3,17 +3,14 @@ module Pageflow
     class EntriesTab < ViewComponent
       def build(theming)
         account = theming.account
-        if account.entries.any?
-          table_for account.entries, :i18n => Pageflow::Entry do
-            column :title do |entry|
+        embedded_index_table(account.entries,
+                             blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
+          table_for_collection(sortable: true, class: 'entries', i18n: Pageflow::Entry) do
+            column :title, sortable: :title do |entry|
               link_to(entry.title, admin_entry_path(entry))
             end
-          end
-          else
-            div :class => "blank_slate_container" do
-            span :class => "blank_slate" do
-              I18n.t('pageflow.admin.accounts.no_entries')
-            end
+            column :created_at
+            column :updated_at
           end
         end
       end

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

@@ -0,0 +1,26 @@
+module Pageflow
+  module Admin
+    class EntryPublicationStateIndicator < ViewComponent
+      builder_method :entry_publication_state_indicator
+
+      def build(entry)
+        if entry.published?
+          span(class: css_class(entry)) do
+            span(tooltip_text(entry), class: 'tooltip_bubble')
+          end
+        end
+      end
+
+      private
+
+      def css_class(entry)
+        ['publication_state_indicator', entry.publication_state] * ' '
+      end
+
+      def tooltip_text(entry)
+        I18n.t(entry.publication_state,
+               scope: 'activerecord.values.pageflow/entry.publication_states')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Pageflow
+  module Admin
+    class IconLinkTo < ViewComponent
+      builder_method :icon_link_to
+
+      def build(path, options = {})
+        text_node(link_to(tooltip_span(options), path, class: options[:class]))
+      end
+
+      def tag_name
+        'span'
+      end
+
+      private
+
+      def tooltip_span(options)
+        content_tag(:span, options[:tooltip], class: 'tooltip_bubble')
+      end
+    end
+  end
+end

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

@@ -2,31 +2,38 @@ module Pageflow
   module Admin
     class MembersTab < ViewComponent
       def build(entry)
-        if entry.memberships.any?
-          table_for entry.memberships, :class => 'memberships' do
-            column t('activerecord.attributes.user.full_name'), class: 'name' do |membership|
+        embedded_index_table(entry.memberships.includes(:user).references(:users),
+                             blank_slate_text: I18n.t('pageflow.admin.entries.no_members')) do
+          table_for_collection class: 'memberships', sortable: true, i18n: Pageflow::Membership do
+            column :user, sortable: 'users.last_name', class: 'name' do |membership|
               if authorized? :manage, User
-                link_to membership.user.full_name, admin_user_path(membership.user), :class => 'view_creator'
+                link_to(membership.user.formal_name, admin_user_path(membership.user),
+                        class: 'view_creator')
               else
                 membership.user.full_name
               end
             end
+            column :created_at, sortable: 'pageflow_memberships.created_at'
             column do |membership|
               if authorized?(:destroy, 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'})
+                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('pageflow.admin.entries.no_members')
-            end
-          end
         end
+
         if authorized? :manage, Pageflow::Entry
           span do
-            link_to I18n.t('pageflow.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

@@ -20,7 +20,7 @@ module Pageflow
                 revision.creator.full_name
               end
             end
-            column :published_until  do |revision|
+            column :published_until do |revision|
               if revision.published_until
                 I18n.l(revision.published_until)
               elsif revision.published?

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

@@ -3,17 +3,13 @@ module Pageflow
     class UsersTab < ViewComponent
       def build(theming)
         account = theming.account
-        if account.users.any?
-          table_for account.users, :i18n => User do
-            column :full_name do |user|
-              link_to user.full_name, admin_user_path(user)
-            end
-          end
-        else
-          div :class => "blank_slate_container" do
-            span :class => "blank_slate" do
-              I18n.t('pageflow.admin.accounts.no_members')
+        embedded_index_table(account.users,
+                             blank_slate_text: I18n.t('pageflow.admin.accounts.no_members')) do
+          table_for_collection sortable: true, class: 'users', i18n: User do
+            column :full_name, sortable: :last_name do |user|
+              link_to user.formal_name, admin_user_path(user)
             end
+            column :created_at
           end
         end
       end

data/app/views/pageflow/admin/users/_cannot_delete.html.erb

@@ -0,0 +1,3 @@
+<p class="cannot_delete">
+  <%= reason %>
+</p>

data/app/views/pageflow/admin/users/_may_delete.html.erb

@@ -0,0 +1,6 @@
+<p class="may_delete">
+  <%= t('pageflow.admin.users.me.delete_account_hint') %>
+    <%= link_to(t('pageflow.admin.users.me.delete_account'),
+                main_app.delete_me_admin_users_path,
+                class: 'delete_account') %>
+</p>

data/app/views/pageflow/admin/widgets/_fields.html.erb

@@ -1,5 +1,5 @@
 <% widgets.each do |widget| %>
-  <%= form.semantic_fields_for(widget) do |fields| %>
+  <%= form.semantic_fields_for(widget, builder: ActiveAdmin::FormBuilder) do |fields| %>
     <%= fields.input(:type_name,
                      label: t(widget.role, scope: 'pageflow.widgets.roles'),
                      input_html: {name: "widgets[#{widget.role}]"},

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

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

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

@@ -7,7 +7,11 @@ json.published(entry.published?)
 json.password_protected(entry.password_digest.present?)
 
 json.configuration do
-  json.(entry, :title, :summary, :credits, :author, :publisher, :keywords, :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages, :share_image_id, :share_image_x, :share_image_y, :locale)
+  json.(entry,
+        :title, :locale, :summary, :credits, :author, :publisher, :keywords,
+        :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages,
+        :share_url, :share_image_id, :share_image_x, :share_image_y)
   json.home_url entry.home_button.url_value
   json.home_button_enabled entry.home_button.enabled_value
+  json.overview_button_enabled entry.overview_button.enabled_value
 end

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

@@ -0,0 +1,5 @@
+<!--[if lte IE 9]>
+<div class="unsupported_browser_hint">
+  <%= raw t('.message') %>
+</div>
+<![endif]-->

data/app/views/pageflow/editor/themings/_theming.json.jbuilder

@@ -1,5 +1,6 @@
 json.pretty_url pretty_theming_url(theming)
 json.home_button theming.theme.has_home_button?
+json.overview_button theming.theme.has_overview_button?
 json.page_change_by_scrolling theming.theme.page_change_by_scrolling?
 json.hide_text_on_swipe theming.theme.hide_text_on_swipe?
 json.emphasized_pages theming.theme.supports_emphasized_pages?

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

@@ -1,3 +1,5 @@
-<div class="loading_spinner" id="loading_spinner" style="position: absolute; width: 100%; height: 100%; background-color: #252526; top: 0; left: 0;">
+<div class="loading_spinner"
+     id="loading_spinner"
+     style="position: absolute; width: 100%; height: 100%; background-color: #3b5159; top: 0; left: 0;">
   <div class="loading_spinner_inner"><div></div></div>
 </div>

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

@@ -1,5 +1,5 @@
 <%= content_tag(:div,
-                class: ["navigation", entry.home_button.enabled? ? 'with_home_button' : nil].compact.join(' '),
+                class: navigation_bar_css_class(entry, class: 'navigation'),
                 data: {widget: 'default_navigation'}) do %>
   <%= render 'pageflow/entries/navigation/bar_top', :entry => entry %>
   <div class="scroller">

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

@@ -47,3 +47,4 @@
 <%= render('pageflow/editor/entries/help_entries_seed', config: @entry_config) %>
 
 <%= render('pageflow/editor/entries/analytics', entry: @entry) %>
+<%= render('pageflow/editor/entries/unsupported_browser_hint') %>

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

@@ -12,12 +12,7 @@
       <span class="button"></span>
     </a>
   </li>
-  <li>
-    <a class="navigation_bullet navigation_index" tabindex="2" title="<%= t('pageflow.public.open_overview') %>" data-active-title="<%= t('pageflow.public.close_overview') %>">
-      <span class="hint"><%= t('pageflow.public.open_overview') %></span>
-      <span class="button"></span>
-    </a>
-  </li>
+  <%= render('pageflow/entries/navigation/overview_button', overview_button: entry.overview_button) %>
   <li class="navigation_menu share" tabindex="2">
     <div class="navigation_menu_box navigation_share_box">
       <%= render 'pageflow/entries/share_menu/facebook_link', entry: entry %>

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

@@ -0,0 +1,8 @@
+<% if overview_button.enabled? %>
+  <li>
+    <a class="navigation_bullet navigation_index" tabindex="2" title="<%= t('pageflow.public.open_overview') %>" data-active-title="<%= t('pageflow.public.close_overview') %>">
+      <span class="hint"><%= t('pageflow.public.open_overview') %></span>
+      <span class="button"></span>
+    </a>
+  </li>
+<% end %>

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

@@ -4,7 +4,6 @@
   <% end %>
   <div class="navigation_site_detail">
     <%= page.title %>
-
-    <%= image_tag("pageflow/#{page.template}_pictogram.png", :style => "background-image: url('#{asset_path(page.thumbnail_url(:navigation_thumbnail_large))}')") %>
+    <div class="thumbnail is_<%= page.template %>" style="background-image: url('<%= asset_path(page.thumbnail_url(:navigation_thumbnail_large)) %>')"></div>
   </div>
 </li>

data/app/views/pageflow/entries/share_menu/_facebook_link.html.erb

@@ -1,12 +1,5 @@
-<%= link_to("http://www.facebook.com/sharer/sharer.php?u=#{ERB::Util.url_encode(pretty_entry_url(entry))}&t=#{ERB::Util.url_encode(entry.title)}",
-            :target => "_blank",
-            :tabindex => "2",
-            :class => "share facebook",
-            :data => {
-              :"share-page" => "http://www.facebook.com/sharer/sharer.php?u=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId"
-            }) do %>
-
-    <span class="hint"><%= t('pageflow.public.share_on_facebook') %></span>
-    <span class="share_facebook button"></span>
-    <p>facebook</p>
+<%= social_share_link(:facebook, entry) do %>
+  <span class="hint"><%= t('pageflow.public.share_on_facebook') %></span>
+  <span class="share_facebook button"></span>
+  <p>facebook</p>
 <% end %>

data/app/views/pageflow/entries/share_menu/_google_link.html.erb

@@ -1,12 +1,5 @@
-<%= link_to("https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}",
-            :target => "_blank",
-            :tabindex => "2",
-            :class => "share google",
-            :data => {
-              :"share-page" => "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId"
-            }) do %>
-
-    <span class="hint"><%= t('pageflow.public.share_on_google') %></span>
-    <span class="share_google button"></span>
-    <p>google</p>
+<%= social_share_link(:google, entry) do %>
+  <span class="hint"><%= t('pageflow.public.share_on_google') %></span>
+  <span class="share_google button"></span>
+  <p>google</p>
 <% end %>

data/app/views/pageflow/entries/share_menu/_twitter_link.html.erb

@@ -1,12 +1,5 @@
-<%= link_to("http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}",
-            :target => "_blank",
-            :tabindex => "2",
-            :class => "share twitter",
-            :data => {
-              :"share-page" => "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId"
-            }) do %>
-
-    <span class="hint"><%= t('pageflow.public.share_on_twitter') %></span>
-    <span class="share_twitter button"></span>
-    <p>twitter</p>
+<%= social_share_link(:twitter, entry) do %>
+  <span class="hint"><%= t('pageflow.public.share_on_twitter') %></span>
+  <span class="share_twitter button"></span>
+  <p>twitter</p>
 <% end %>

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

@@ -15,17 +15,17 @@
   </div>
 
   <div class="content">
-    <div class="controls">
+    <div class="controls" data-role="player_controls">
       <span class="hint"><%= t('pageflow.public.audio') %></span>
       <%= info_box(configuration) %>
       <div class="vjs-control-bar">
         <div class="vjs-controls vjs-default-skin vjs-player">
           <a class="vjs-play-control vjs-play vjs-control" tabindex="4"><span></span></a>
           <div class="vjs-progress-control">
-            <div class="vjs-progress-holder">
+            <div class="vjs-progress-holder vjs-slider">
               <div class="vjs-load-progress"></div>
               <div class="vjs-play-progress"></div>
-              <div class="vjs-slider-handle"></div>
+              <div class="vjs-seek-handle vjs-slider-handle"></div>
             </div>
           </div>
           <div class="vjs-current-time vjs-time-controls vjs-control">
@@ -46,6 +46,9 @@
           </div>
           <div class="player_mute volume-mute-button" tabindex="4"></div>
         </div>
+        <div class="control_bar_text">
+          <%= t('pageflow.public.start_audio') %>
+        </div>
       </div>
     </div>
     <div class="scroller">

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

@@ -19,10 +19,13 @@
     <%= shadow_div :opacity => configuration['gradient_opacity'] %>
   </div>
   <div class="content">
-    <div class="controls">
+    <%= content_tag(:div,
+                    class: 'controls',
+                    data: {role: 'player_controls', control_bar_text: I18n.t('pageflow.public.start_video')}) do %>
+
       <span class="hint"><%= t('pageflow.public.video') %></span>
       <%= info_box(configuration) %>
-    </div>
+    <% end %>
     <div class="scroller">
       <div>
         <div class="contentWrapper">

data/app/views/pageflow/social_share/_entry_meta_tags.html.erb

@@ -1,12 +1,12 @@
-<%= tag :link, :rel => "canonical", :href => pretty_entry_url(entry) %>
+<%= tag :link, rel: "canonical", href: social_share_entry_url(entry) %>
 
 <%= social_share_entry_image_tags(entry) %>
 
-<%= tag :meta, :property => "og:title", :content => pretty_entry_title(entry) %>
-<%= tag :meta, :property => "og:description", :name => "description", :content => social_share_entry_description(entry) %>
-<%= tag :meta, :property => "og:url", :content => pretty_entry_url(entry) %>
-<%= tag :meta, :property => "og:site_name", :content => entry.theming.cname_domain %>
-<%= tag :meta, :property => "og:type", :content => "website" %>
+<%= tag :meta, property: "og:title", content: pretty_entry_title(entry) %>
+<%= tag :meta, property: "og:description", name: "description", content: social_share_entry_description(entry) %>
+<%= tag :meta, property: "og:url", content: social_share_entry_url(entry) %>
+<%= tag :meta, property: "og:site_name", content: entry.theming.cname_domain %>
+<%= tag :meta, property: "og:type", content: "website" %>
 
-<%= tag :meta, :name => "twitter:card", :content => "summary_large_image" %>
-<%= tag :meta, :name => "twitter:description", :content => social_share_entry_description(entry) %>
+<%= tag :meta, name: "twitter:card", content: "summary_large_image" %>
+<%= tag :meta, name: "twitter:description", content: social_share_entry_description(entry) %>

data/app/views/pageflow/social_share/_image_tags.html.erb

@@ -1,7 +1,7 @@
 <% image_urls.each do |image_url| %>
-  <%= tag :meta, :property => "og:image", :content => social_share_normalize_protocol(image_url) %>
+  <%= tag :meta, property: "og:image", content: social_share_normalize_protocol(image_url) %>
 <% end %>
 
 <% if image_urls.first.present? %>
-  <%= tag :meta, :name => "twitter:image:src", :content => social_share_normalize_protocol(image_urls.first) %>
-<% end %>
+  <%= tag :meta, name: "twitter:image:src", content: social_share_normalize_protocol(image_urls.first) %>
+<% end %>

data/app/views/pageflow/social_share/_page_meta_tags.html.erb

@@ -1,12 +1,12 @@
-<%= tag :link, :rel => "canonical", :href => social_share_page_url(page) %>
+<%= tag :link, rel: "canonical", href: social_share_page_url(entry, page) %>
 
-<%= tag :meta, :property => "og:image", :content => social_share_normalize_protocol(page.thumbnail_url(:medium)) %>
+<%= tag :meta, property: "og:image", content: social_share_normalize_protocol(page.thumbnail_url(:medium)) %>
 
-<%= tag :meta, :property => "og:title", :content => social_share_page_title(page) %>
-<%= tag :meta, :property => "og:description", :name => "description", :content => social_share_page_description(page, entry) %>
-<%= tag :meta, :property => "og:url", :content => social_share_page_url(page) %>
-<%= tag :meta, :property => "og:site_name", :content => entry.theming.cname_domain %>
-<%= tag :meta, :property => "og:type", :content => "website" %>
+<%= tag :meta, property: "og:title", content: social_share_page_title(page) %>
+<%= tag :meta, property: "og:description", name: "description", content: social_share_page_description(entry, page) %>
+<%= tag :meta, property: "og:url", content: social_share_page_url(entry, page) %>
+<%= tag :meta, property: "og:site_name", content: entry.theming.cname_domain %>
+<%= tag :meta, property: "og:type", content: "website" %>
 
-<%= tag :meta, :name => "twitter:card", :content => "summary_large_image" %>
-<%= tag :meta, :name => "twitter:description", :content => social_share_page_description(page, entry) %>
+<%= tag :meta, name: "twitter:card", content: "summary_large_image" %>
+<%= tag :meta, name: "twitter:description", content: social_share_page_description(entry, page) %>

data/app/views/pageflow/user_mailer/invitation.html.erb

@@ -2,8 +2,8 @@
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to main_app.edit_user_password_url(@user, :reset_password_token => @user.reset_password_token),
-               main_app.edit_user_password_url(@user, :reset_password_token => @user.reset_password_token) %></p>
+<p><%= link_to main_app.edit_user_password_url(@user, reset_password_token: @password_token),
+               main_app.edit_user_password_url(@user, reset_password_token: @password_token) %></p>
 
 <p><%= t('.ending') %></p>
 

data/app/views/pageflow/user_mailer/invitation.text.erb

@@ -2,7 +2,7 @@
 
 <%= t('.instruction') %>
 
-<%= main_app.edit_user_password_url(@user, :reset_password_token => @user.reset_password_token) %>
+<%= main_app.edit_user_password_url(@user, reset_password_token: @password_token) %>
 
 <%= t('.ending') %>