RubyGems - pageflow - Versions diffs - 0.9.2 → 0.10.0 - Mend

pageflow 0.9.2 → 0.10.0

Potentially problematic release.

This version of pageflow might be problematic. Click here for more details.

Files changed (263) hide show

data/app/views/admin/accounts/_widgets_inline_help.html.erb ADDED

@@ -0,0 +1,5 @@
+<li class="inline_help_item">
+  <p>
+    <%= t('pageflow.admin.accounts.widgets_inline_help') %>
+  </p>
+</li>

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

@@ -3,10 +3,13 @@
 <head>
   <title><%= @page_title.presence || 'Pageflow' %></title>
+  <script>
+    window.PAGEFLOW_EDITOR = <%= @editor_scope ? 'true' : 'false' %>;
+  </script>
   <%= javascript_include_tag "pageflow/application", "data-turbolinks-track" => true %>
   <%= csrf_meta_tags %>
-  <%= render 'layouts/pageflow/meta_tags' %>
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, minimum-scale=1, maximum-scale=1" />
   <meta name="apple-mobile-web-app-capable" content="yes" />

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

@@ -0,0 +1,9 @@
+<% widgets.each do |widget| %>
+  <%= form.semantic_fields_for(widget) do |fields| %>
+    <%= fields.input(:type_name,
+                     label: t(widget.role, scope: 'pageflow.widgets.roles'),
+                     input_html: {name: "widgets[#{widget.role}]"},
+                     include_blank: t('pageflow.widgets.none'),
+                     collection: admin_widget_types_collection_for_role(config, widget.role)) %>
+  <% end %>
+<% end %>

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

@@ -1,3 +1,3 @@
 json.key_format!(camelize: :lower)
-json.(Pageflow.config, :confirm_encoding_jobs, :available_locales)
+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)

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

@@ -1,4 +1,4 @@
-json.(entry, :id, :published_until, :slug, :enabled_feature_names)
+json.(entry, :id, :entry_title, :published_until, :slug, :enabled_feature_names)
 json.pretty_url pretty_entry_url(entry)
@@ -7,7 +7,7 @@ json.published(entry.published?)
 json.password_protected(entry.password_digest.present?)
 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, :locale)
+  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.home_url entry.home_button.url_value
   json.home_button_enabled entry.home_button.enabled_value
 end

data/app/views/pageflow/editor/entries/_other_entry.json.jbuilder ADDED

	@@ -0,0 +1 @@
1	+ json.(other_entry, :id, :slug, :title)

data/app/views/pageflow/editor/entries/index.json.jbuilder CHANGED

	@@ -1 +1 @@
1	- json.array!(@entries, :partial => '~~entry~~', :as => :~~entry~~)
1	+ json.array!(@entries, :partial => 'other_entry', :as => :other_entry)

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

@@ -3,6 +3,7 @@
   "config": <%= editor_config_seeds %>,
   "entry": <%= render_json_seed(@entry) %>,
+  "storylines": <%= @entry.storylines.to_json.html_safe %>,
   "chapters": <%= @entry.chapters.to_json.html_safe %>,
   "pages": <%= @entry.pages.to_json.html_safe %>,
@@ -11,5 +12,7 @@
   "account": <%= render_json_seed(@entry.account) %>,
   "theming": <%= render_json_seed(@entry.theming) %>,
   "widget_types": <%= widget_types_json_seeds(@entry_config) %>,
-  "page_types": <%= page_type_json_seeds(@entry_config) %>
+  "page_types": <%= page_type_json_seeds(@entry_config) %>,
+  "common": <%= common_entry_seed(@entry).to_json.html_safe %>
 }

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

@@ -6,6 +6,10 @@ if file.url.present?
   json.url(file.url)
 end
+if file.original_url.present?
+  json.original_url(file.original_url)
+end
 if file_type.editor_partial.present?
   json.partial!(:object => file, :partial => file_type.editor_partial)
 end

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

@@ -4,3 +4,4 @@ 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?
 json.scroll_indicator_modes theming.theme.supports_scroll_indicator_modes?
+json.change_to_parent_page_at_storyline_boundary theming.theme.change_to_parent_page_at_storyline_boundary?

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

@@ -7,11 +7,11 @@
   <h1 class="hidden"><%= entry.title %></h1>
-  <img src="<%= image_path("pageflow/themes/#{entry.theming.theme.directory_name}/logo_print.png") %>" class="print_image" alt="<%= t('.print_logo') %>">
+  <img src="<%= image_path("pageflow/themes/#{entry.theming.theme.directory_name}/logo_print.png") %>" class="print_image" alt="<%= t('pageflow.public.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 %>
+    <%= render entry.pages, entry: entry %>
     <%= render 'pageflow/entries/indicators', :theme => entry.theming.theme %>
   <% end %>

data/app/views/pageflow/entries/_ie8_hint.html.erb CHANGED

@@ -1,8 +1,8 @@
 <!--[if lt IE 9]>
 <div class="ie8_hint">
-  <%= raw t('.deprecated_browser') %>
+  <%= raw t('pageflow.public.deprecated_browser') %>
   <p>
-    <a href="#" class="close"><%= t('.close') %></a>
+    <a href="#" class="close"><%= t('pageflow.public.close') %></a>
   </p>
 </div>
 <![endif]-->

data/app/views/pageflow/entries/_indicators.html.erb CHANGED

@@ -1,13 +1,13 @@
 <% if theme.has_scroll_back_indicator? %>
   <div class="scroll_back_indicator scroll_indicator indicator" data-direction="up">
-    <%= t('.scroll_back_indicator') %>
+    <%= t('pageflow.public.scroll_back_indicator') %>
   </div>
 <% end %>
 <div class="scroll_next_indicator scroll_indicator indicator" data-direction="down">
-  <%= t('pageflow.entries.entry.scroll_indicator') %>
+  <%= t('pageflow.public.scroll_indicator') %>
 </div>
 <div class="hidden_text_indicator indicator">
-  <%= t('pageflow.entries.entry.swipe_indicator') %>
+  <%= t('pageflow.public.swipe_indicator') %>
 </div>

data/app/views/pageflow/entries/_mobile_navigation.html.erb CHANGED

@@ -1,11 +1,12 @@
 <div class="navigation_mobile" data-widget="default_mobile_navigation">
+  <div class="parent_page" title="<%= t('pageflow.public.back') %>"></div>
   <div class="menu index"></div>
   <div class="menu sharing"></div>
   <div class="menu imprint"></div>
   <div class="overview_mobile">
-      <span class="heading-1"><%= t('.overview') %></span>
+      <span class="heading-1"><%= t('pageflow.public.overview') %></span>
       <div class="wrapper">
-        <ul>
+        <ul class="pages">
           <%= render :partial => 'pageflow/entries/navigation/page',
                      :collection => entry_mobile_navigation_pages(entry),
                      :locals => {:image_style => :thumbnail_overview_mobile, :image_width => nil} %>
@@ -27,12 +28,12 @@
       </ul>
     </div>
     <div class="sub_share">
-      <a target="_blank"><%= I18n.t('pageflow.widgets.share_menu.entry') %></a>
-      <a target="_blank"><%= I18n.t('pageflow.widgets.share_menu.current_page') %></a>
+      <a target="_blank"><%= I18n.t('pageflow.public.share_this_entry') %></a>
+      <a target="_blank"><%= I18n.t('pageflow.public.share_this_page') %></a>
     </div>
   </div>
   <div class="imprint_mobile">
-      <span class="heading-1"><%= t('.imprint') %></span>
+      <span class="heading-1"><%= t('pageflow.public.imprint') %></span>
       <div class="wrapper">
         <ul>
           <li class="credits">

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

@@ -1,21 +1,21 @@
 <div class="multimedia_alert">
   <div class="multimedia_alert_box">
     <div class="alert_block">
-    <h1 class="alert_headline"><%= t('.alert') %></h1>
+    <h1 class="alert_headline"><%= t('pageflow.public.notice') %></h1>
     <div class="alert_icon speaker"></div>
       <p>
-        <%= t('.sound_hint') %>
+        <%= t('pageflow.public.sound_hint') %>
       </p>
     </div>
     <div class="alert_block">
       <div class="alert_icon scrolling"></div>
       <p class="scroll_hint desktop">
-        <%= t('.scroll_hint') %>
+        <%= t('pageflow.public.scroll_hint') %>
       </p>
       <p class="scroll_hint mobile">
-        <%= t('.swipe_hint') %>
+        <%= t('pageflow.public.swipe_hint') %>
       </p>
-      <a class="close" href="#" tabindex="1"><%= t('.close') %></a>
+      <a class="close" href="#" tabindex="1"><%= t('pageflow.public.lets_go') %></a>
     </div>
   </div>
-</div>
+</div>

data/app/views/pageflow/entries/_non_js_hint.html.erb CHANGED

@@ -1,5 +1,5 @@
 <div class="non_js_notice">
   <noscript>
-    <%= t('.js_hint') %>
+    <%= t('pageflow.public.javascript_hint') %>
   </noscript>
 </div>

data/app/views/pageflow/entries/_skip_links.html.erb CHANGED

@@ -1,11 +1,11 @@
 <ul id="skipLinks">
   <li>
-    <a href="#content" class="content_link" tabindex="1"><%= t('.goto_content') %></a>
+    <a href="#content" class="content_link" tabindex="1"><%= t('pageflow.public.skip_links_content') %></a>
   </li>
   <li>
-    <a href="#header" tabindex="1"><%= t('.goto_topnavigation') %></a>
+    <a href="#header" tabindex="1"><%= t('pageflow.public.skip_links_top_navigation') %></a>
   </li>
   <li>
-    <a href="#navigation" tabindex="1"><%= t('.goto_navigation') %></a>
+    <a href="#navigation" tabindex="1"><%= t('pageflow.public.skip_links_navigation') %></a>
   </li>
 </ul>

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

@@ -1,3 +1,5 @@
+<% @editor_scope = true %>
 <% content_for(:head) do %>
     <%= stylesheet_link_tag('pageflow/application_with_simulated_media_queries', media: 'all', 'data-turbolinks-track' => true) %>
     <%= entry_theme_stylesheet_link_tag(@entry) %>
@@ -38,10 +40,10 @@
 </script>
 <% I18n.with_locale(@entry.locale) do %>
-  <%= page_type_templates %>
+  <%= page_type_templates(@entry) %>
+  <%= render('pageflow/editor/entries/indicators_seed', theme: @entry.theming.theme) %>
 <% end %>
 <%= render('pageflow/editor/entries/help_entries_seed', config: @entry_config) %>
-<%= render('pageflow/editor/entries/indicators_seed', theme: @entry.theming.theme) %>
 <%= render('pageflow/editor/entries/analytics', entry: @entry) %>

data/app/views/pageflow/entries/navigation/_bar_bottom.html.erb CHANGED

@@ -1,21 +1,22 @@
 <a class="scroll_indicator bottom" tabindex="2">
-  <span class="hint"><%= t('.scroll_down') %></span>
+  <span class="hint"><%= t('pageflow.public.scroll_down') %></span>
 </a>
 <ul class="navigation_bar_bottom">
   <li class="indicator">
   </li>
   <li class="fullscreen">
-    <a class="navigation_bullet navigation_fullscreen" tabindex="2" title="<%= t('.open_fullscreen') %>" data-active-title="<%= t('.close_fullscreen') %>">
+    <a class="navigation_bullet navigation_fullscreen" tabindex="2"
+       title="<%= t('pageflow.public.enter_fullscreen') %>" data-active-title="<%= t('pageflow.public.leave_fullscreen') %>">
       <span class="button"></span>
     </a>
   </li>
   <li class="hide_text">
-    <a class="navigation_bullet navigation_hide_text" tabindex="2" title="<%= t('.hide_text') %>" data-active-title="<%= t('.show_text') %>">
+    <a class="navigation_bullet navigation_hide_text" tabindex="2" title="<%= t('pageflow.public.hide_text') %>" data-active-title="<%= t('pageflow.public.show_text') %>">
       <span class="button"></span>
     </a>
   </li>
   <li class="navigation_menu mute">
-    <div class="navigation_menu_box navigation_volume_box" title="<%= t('.volume') %>">
+    <div class="navigation_menu_box navigation_volume_box" title="<%= t('pageflow.public.volume') %>">
       <div class="volume-control" style="display: block;">
         <div class="volume-slider">
           <div class="volume-level" style="width: 100%;"><span class="volume-control-text"></span></div>
@@ -24,7 +25,7 @@
       </div>
     </div>
     <a class="navigation_menu" tabindex="2">
-      <span class="navigation_bg navigation_mute" title="<%= t('.volume') %>" data-muted-title="<%= t('.mute_off') %>" data-not-muted-title="<%= t('.mute_on') %>"></span>
+      <span class="navigation_bg navigation_mute" title="<%= t('pageflow.public.volume') %>" data-muted-title="<%= t('pageflow.public.mute_off') %>" data-not-muted-title="<%= t('pageflow.public.mute_on') %>"></span>
     </a>
   </li>
 </ul>

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

@@ -1,20 +1,20 @@
 <ul class="navigation_bar_top">
   <li class="menu_li">
-    <a id="navigation" class="navigation_bullet navigation_main" tabindex="2" title="<%= t('.open_top_navigation') %>" data-active-title="<%= t('.close_top_navigation') %>">
-      <span class="hint"><%= t('.open_top_navigation') %></span>
+    <a id="navigation" class="navigation_bullet navigation_main" tabindex="2" title="<%= t('pageflow.public.open_navigation') %>" data-active-title="<%= t('pageflow.public.close_navigation') %>">
+      <span class="hint"><%= t('pageflow.public.open_navigation') %></span>
       <span class="button"></span>
     </a>
   </li>
   <%= render('pageflow/entries/navigation/home_button', home_button: entry.home_button) %>
   <li>
-    <a class="navigation_bullet navigation_top" <%= "href=##{entry.pages.first.perma_id} data-link=#{entry.pages.first.id}" unless entry.pages.nil? || entry.pages.first.nil? %> tabindex="2" title="<%= t('.navigate_top') %>">
-      <span class="hint"><%= t('.navigate_top') %></span>
+    <a class="navigation_bullet navigation_top" <%= "href=##{entry.pages.first.perma_id} data-link=#{entry.pages.first.id}" unless entry.pages.nil? || entry.pages.first.nil? %> tabindex="2" title="<%= t('pageflow.public.navigate_top') %>">
+      <span class="hint"><%= t('pageflow.public.navigate_top') %></span>
       <span class="button"></span>
     </a>
   </li>
   <li>
-    <a class="navigation_bullet navigation_index" tabindex="2" title="<%= t('.open_overview') %>" data-active-title="<%= t('.close_overview') %>">
-      <span class="hint"><%= t('.open_overview') %></span>
+    <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>
@@ -24,12 +24,12 @@
       <%= render 'pageflow/entries/share_menu/twitter_link', entry: entry %>
       <%= render 'pageflow/entries/share_menu/google_link', entry: entry %>
       <div class="sub_share">
-        <a tabindex="2" target="_blank"><%= I18n.t('pageflow.widgets.share_menu.entry') %></a>
-        <a tabindex="2" target="_blank"><%= I18n.t('pageflow.widgets.share_menu.current_page') %></a>
+        <a tabindex="2" target="_blank"><%= I18n.t('pageflow.public.share_this_entry') %></a>
+        <a tabindex="2" target="_blank"><%= I18n.t('pageflow.public.share_this_page') %></a>
       </div>
     </div>
-    <a title="<%= t('.share') %>">
-      <span class="hint"><%= t('.share') %></span>
+    <a title="<%= t('pageflow.public.share') %>">
+      <span class="hint"><%= t('pageflow.public.share') %></span>
       <span class="navigation_bg navigation_share button"></span>
     </a>
   </li>
@@ -37,12 +37,12 @@
     <div class="navigation_menu_box navigation_credits_box">
       <%= render 'pageflow/entries/navigation/credits_box_content', :entry => entry %>
     </div>
-    <a title="<%= t('.imprint') %>">
-      <span class="hint"><%= t('.imprint') %></span>
+    <a title="<%= t('pageflow.public.imprint') %>">
+      <span class="hint"><%= t('pageflow.public.imprint') %></span>
       <span class="navigation_bg navigation_credits button"></span>
     </a>
   </li>
 </ul>
 <a class="scroll_indicator top" tabindex="2">
-  <span class="hint"><%= t('.scroll_up') %></span>
+  <span class="hint"><%= t('pageflow.public.scroll_up') %></span>
 </a>

data/app/views/pageflow/entries/navigation/_home_button.html.erb CHANGED

@@ -1,7 +1,7 @@
 <% if home_button.enabled? %>
   <li>
-    <%= link_to(home_button.url, class: "navigation_bullet navigation_home", tabindex: "2", title: t('.show_home')) do %>
-      <span class="hint"><%= t('.show_home') %></span>
+    <%= link_to(home_button.url, class: "navigation_bullet navigation_home", tabindex: "2", title: t('pageflow.public.show_home')) do %>
+      <span class="hint"><%= t('pageflow.public.show_home') %></span>
       <span class="button"></span>
     <% end %>
   </li>

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

@@ -1,5 +1,5 @@
 <li class="<%= page_navigation_css_class(page) %>">
-  <%= link_to "##{page.perma_id}", :data => {:link => page.id} do %>
+  <%= link_to "##{page.perma_id}", :data => {:link => page.id, :chapter_id => page.chapter_id} do %>
       <%= image_tag(page.thumbnail_url(image_style), :width => image_width) %>
   <% end %>
   <div class="navigation_site_detail">

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

@@ -2,7 +2,7 @@
     <div class="ov_chapter">
       <% if chapters_count > 1 %>
-        <span class="heading-5"><%= "#{t('.chapter')} #{chapter.position + 1}" if index == 0 %></span>
+        <span class="heading-5"><%= "#{t('pageflow.public.chapter')} #{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} %>

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

@@ -1,19 +1,20 @@
 <section class="overview">
   <div class="content">
     <a class="close button">
-      <span class="label"><%= t('.close') %></span>
+      <span class="label"><%= t('pageflow.public.close') %></span>
     </a>
-    <h2><%= t('.overview') %></h2>
+    <h2><%= t('pageflow.public.overview') %></h2>
-    <a class="scroll_indicator left button" tabindex="1" title="<%= t('.scroll_left') %>"><span class="hint"><%= t('.scroll_left') %></span></a>
+    <a class="scroll_indicator left button" tabindex="1" title="<%= t('pageflow.public.scroll_left') %>"><span class="hint"><%= t('pageflow.public.scroll_left') %></span></a>
     <div class="wrapper">
       <div class="scroller">
-        <%= render :partial => 'pageflow/entries/overview/chapter', :collection => entry.chapters,
-                   :locals => {:chapters_count => entry.chapters.count} %>
+        <%= render(partial: 'pageflow/entries/overview/chapter',
+                   collection: entry.main_storyline_chapters,
+                   locals: {chapters_count: entry.main_storyline_chapters.count}) %>
       </div>
     </div>
-    <a class="scroll_indicator right button" tabindex="1" title="<%= t('.scroll_right') %>"><span class="hint"><%= t('.scroll_right') %></span></a>
+    <a class="scroll_indicator right button" tabindex="1" title="<%= t('pageflow.public.scroll_right') %>"><span class="hint"><%= t('pageflow.public.scroll_right') %></span></a>
   </div>
 </section>

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

@@ -6,7 +6,7 @@
               :"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.widgets.share_menu.share_with_facebook') %></span>
+    <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 CHANGED

@@ -6,7 +6,7 @@
               :"share-page" => "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId"
             }) do %>
-    <span class="hint"><%= t('pageflow.widgets.share_menu.share_with_google') %></span>
+    <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 CHANGED

@@ -6,7 +6,7 @@
               :"share-page" => "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId"
             }) do %>
-    <span class="hint"><%= t('pageflow.widgets.share_menu.share_with_twitter') %></span>
+    <span class="hint"><%= t('pageflow.public.share_on_twitter') %></span>
     <span class="share_twitter button"></span>
     <p>twitter</p>
 <% end %>

data/app/views/pageflow/entries/show.html.erb CHANGED

@@ -1,4 +1,4 @@
-<% @page_title = @entry.title %>
+<% @page_title = pretty_entry_title(@entry) %>
 <% content_for(:head) do %>
   <%= cache [@entry, :head, @entry.share_target] do %>
@@ -10,6 +10,7 @@
     <%= render_widget_head_fragments(@entry) %>
     <%= tag :link, :rel => 'icon', :href => image_path("pageflow/themes/#{@entry.theming.theme.directory_name}/favicon.ico"), :type => 'image/ico' %>
+    <%= meta_tags_for_entry(@entry) %>
   <% end %>
 <% end %>
@@ -31,5 +32,7 @@
     pageflow.enabledFeatureNames = <%= @entry.enabled_feature_names.to_json.html_safe %>;
   </script>
+  <%= public_i18n_javascript_tag(@entry) %>
   <%= render 'pageflow/entries/analytics', :entry => @entry %>
 <% end %>