pageflow 0.5.0 → 0.6.0

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

@@ -20,21 +20,25 @@
   </li>
   <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 %>
+      <%= 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", :data => { :"share-page" => "http://www.facebook.com/sharer/sharer.php?s=100&p%5Burl%5D=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId" } do %>
           <span class="hint">über facebook teilen</span>
           <span class="share_facebook button"></span>
           <p>facebook</p>
       <% end %>
-      <%= link_to "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share twitter" do %>
+      <%= 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">über twitter teilen</span>
           <span class="share_twitter button"></span>
           <p>twitter</p>
       <% end %>
-      <%= link_to "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share google" do %>
+      <%= 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">über Google+ teilen</span>
           <span class="share_google button"></span>
           <p>google</p>
       <% end %>
+      <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>
+      </div>
     </div>
     <a title="Angebot weiterempfehlen">
       <span class="hint">teilen</span>

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

@@ -1,10 +1,10 @@
-<li class="<%= page.template %>">
+<li class="<%= page_navigation_css_class(page) %>">
   <%= link_to "##{page.perma_id}", :data => {:link => page.id} do %>
       <%= 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('#{asset_path(page.thumbnail_url(:navigation_thumbnail_large))}')") %>
   </div>
 </li>

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

@@ -1,3 +1,3 @@
 <%= render 'pageflow/entries/header', :entry => @entry %>
-<%= render 'pageflow/entries/navigation', :entry => @entry %>
 <%= render 'pageflow/entries/overview', :entry => @entry %>
+<%= render_widgets(@entry, only: :editor) %>

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

@@ -1,10 +1,16 @@
 <% @page_title = @entry.title %>
 
 <% content_for(:head) do %>
-  <%= entry_theme_stylesheet_link_tag(@entry) %>
-  <%= entry_stylesheet_link_tag(@entry) %>
-  <%= render 'pageflow/entries/social_meta_tags', :entry => @entry %>
-  <%= tag :link, :rel => 'icon', :href => image_path("#{@entry.theming.theme.directory_name}/favicon.ico"), :type => 'image/ico' %>
+  <%= cache [@entry, :head] do %>
+    <%= stylesheet_link_tag('pageflow/application', media: 'all', 'data-turbolinks-track' => true) %>
+    <%= entry_theme_stylesheet_link_tag(@entry) %>
+    <%= entry_stylesheet_link_tag(@entry) %>
+
+    <%= social_share_meta_tags_for(@entry.share_target) %>
+    <%= render_widget_head_fragments(@entry) %>
+
+    <%= tag :link, :rel => 'icon', :href => image_path("pageflow/themes/#{@entry.theming.theme.directory_name}/favicon.ico"), :type => 'image/ico' %>
+  <% end %>
 <% end %>
 
 <%= cache @entry do %>
@@ -16,7 +22,9 @@
 
   <script>
     pageflow.manualStart.enabled = <%= @entry.manual_start ? 'true' : 'false' %>;
+    pageflow.visited.enabled = <%= @entry.emphasize_new_pages ? 'true' : 'false' %>;
     pageflow.pages = <%= @entry.pages.to_json(:only => [:id, :perma_id, :configuration]).html_safe %>;
+    pageflow.entryId = <%= @entry.id %>;
   </script>
 
   <%= render 'pageflow/entries/analytics', :entry => @entry %>

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

@@ -1 +1,6 @@
+<% content_for(:head) do %>
+  <%= tag(:meta, name: :robots, content: 'noindex,nofollow') %>
+  <%= stylesheet_link_tag('pageflow/application', media: 'all', 'data-turbolinks-track' => true) %>
+<% end %>
+
 <%= render(@file) %>

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

@@ -12,7 +12,7 @@
       <span class="title"><%= configuration['title'] %></span>
       <span class="subtitle"><%= configuration['subtitle'] %></span>
     </h2>
-    <%= background_image_tag(configuration['background_image_id'], {"class" => "print_image"}) %>
+    <%= background_image_tag(configuration['background_image_id'], {:class => "print_image"}) %>
   </div>
 
   <div class="content">

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

@@ -1,7 +1,7 @@
 <div class="blackLayer"></div>
 <div class="content_and_background backgroundVideo">
   <div class="backgroundArea">
-    <%= poster_image_div(configuration['video_file_id'], configuration['poster_image_id']) %>
+    <%= mobile_poster_image_div(configuration) %>
     <span class="hint">Video Loop</span>
     <%= lookup_video_tag(configuration['video_file_id'],
         configuration['poster_image_id'], :class => 'background', :loop => true, :unique_id => page.id, :preload => page.is_first) %>
@@ -16,7 +16,7 @@
             <span class="title"><%= configuration['title'] %></span>
             <span class="subtitle"><%= configuration['subtitle'] %></span>
           </h2>
-          <%= poster_image_tag(configuration['video_file_id'], configuration['poster_image_id'], {"class" => "print_image"}) %>
+          <%= poster_image_tag(configuration['video_file_id'], configuration['poster_image_id'], {:class => "print_image"}) %>
         </div>
         <div class="contentText">
           <p><%= raw configuration['text'] %></p>

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

@@ -1,4 +1,3 @@
-
 <div class="blackLayer"></div>
 <div class="content_and_background videoPage">
   <div class="page_header">
@@ -7,11 +6,13 @@
       <span class="title"><%= configuration['title'] %></span>
       <span class="subtitle"><%= configuration['subtitle'] %></span>
     </h2>
-    <%= poster_image_tag(configuration['video_file_id'], configuration['poster_image_id'], {"class" => "print_image"}) %>
+    <%= poster_image_tag(configuration['video_file_id'], configuration['poster_image_id'], {:class => "print_image"}) %>
   </div>
   <div class="backgroundArea">
     <div class="videoWrapper">
-      <%= lookup_video_tag(configuration['video_file_id'], configuration['poster_image_id'], :unique_id => page.id, :preload => page.is_first) %>
+      <%= lookup_video_tag(configuration['video_file_id'], configuration['poster_image_id'],
+                           :mobile_poster_image_id => configuration['mobile_poster_image_id'],
+                           :unique_id => page.id, :preload => page.is_first) %>
     </div>
     <%= shadow_div :opacity => configuration['gradient_opacity'] %>
   </div>

data/app/views/pageflow/{entries/_social_meta_tags.html.erb → social_share/_entry_meta_tags.html.erb}

@@ -1,9 +1,9 @@
 <%= tag :link, :rel => "canonical", :href => pretty_entry_url(entry) %>
 
-<%= tag :meta, :property => "og:image:url", :content => entry.thumbnail_url(:medium).gsub('https://', 'http://') %>
+<%= social_share_entry_image_tags(entry) %>
 
 <%= tag :meta, :property => "og:title", :content => "#{entry.title} - #{entry.theming.cname_domain}" %>
 <%= tag :meta, :property => "og:description", :name => "description", :content => entry_summary(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 => "article" %>
+<%= tag :meta, :property => "og:type", :content => "website" %>

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

@@ -0,0 +1,3 @@
+<% image_urls.each do |image_url| %>
+  <%= tag :meta, :property => "og:image", :content => social_share_normalize_protocol(image_url) %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<%= tag :link, :rel => "canonical", :href => social_share_page_url(page) %>
+
+<%= 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) %>
+<%= 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" %>

data/config/initializers/admin_resource_tabs.rb

@@ -0,0 +1,7 @@
+Pageflow.configure do |config|
+  config.admin_resource_tabs.register(:entry, name: :members, component: Pageflow::Admin::MembersTab)
+  config.admin_resource_tabs.register(:entry, name: :revisions, component: Pageflow::Admin::RevisionsTab)
+
+  config.admin_resource_tabs.register(:theming, name: :entries, component: Pageflow::Admin::EntriesTab)
+  config.admin_resource_tabs.register(:theming, name: :users, component: Pageflow::Admin::UsersTab)
+end

data/config/initializers/paperclip.rb

@@ -107,7 +107,7 @@ Paperclip.interpolates(:class_basename) do |attachment, style|
 end
 
 Paperclip.interpolates(:pageflow_placeholder) do |attachment, style|
-  ActionController::Base.helpers.asset_path("pageflow/placeholder_#{style}.jpg")
+  "pageflow/placeholder_#{style}.jpg"
 end
 
 Paperclip.interpolates(:pageflow_attachments_version) do |attachment, style|

data/config/initializers/view_components.rb

@@ -1,3 +1,11 @@
 # View components cannot be discovered via the auto loader since they
 # are never referenced by class name.
-Dir[Pageflow::Engine.root.join('app/views/components/**/*.rb')].each { |f| require(f) }
+Rails.application.config.to_prepare do
+  Dir[Pageflow::Engine.root.join('app/views/components/**/*.rb')].each do |f|
+    relative_path = f.gsub(Pageflow::Engine.root.join('app/views/components/').to_s, '')
+    class_name = relative_path.gsub(/.rb$/, '').classify
+
+    # trigger autoloading
+    class_name.constantize
+  end
+end

data/config/initializers/widget_types.rb

@@ -0,0 +1,4 @@
+Pageflow.configure do |config|
+  config.widget_types.register(Pageflow::BuiltInWidgetType.navigation, default: true)
+  config.widget_types.register(Pageflow::BuiltInWidgetType.mobile_navigation, default: true)
+end

data/config/locales/activerecord.de.yml

@@ -97,6 +97,9 @@ de:
         manual_start: "Multimedia Hinweis vor dem Start anzeigen"
         home_url: "Home-Button URL"
         home_button_enabled: "Home-Button anzeigen"
+        emphasize_chapter_beginning: "Kapitelanfang hervorheben"
+        emphasize_new_pages: "Neue Seiten hervorheben"
+        share_image_id: "Social Sharing Bild"
       "pageflow/folder":
         account: "Konto"
         name: "Name"
@@ -122,7 +125,7 @@ de:
         description: "Beschreibung für Übersicht"
         additional_title: "Titel für Infobox"
         additional_description: "Beschreibung für Infobox"
-        gradient_opacity: "Intensität des Farbverlaufs"
+        gradient_opacity: "Intensität der Abblendung"
         invert: "Farben invertieren"
         transition: "Übergangseffekt"
         display_in_navigation: "In Navigationsleiste anzeigen"
@@ -134,6 +137,7 @@ de:
         video_file_id: "Video"
         audio_file_id: "Audio"
         poster_image_id: "Posterbild"
+        mobile_poster_image_id: "Posterbild (mobil)"
         linked_page_ids: "Seiten verknüpfen"
         linked_pages_layout: "Hervorgehobenes Element"
         hide_title: "Titel ausblenden"

data/config/locales/admin/tabs.de.yml

@@ -0,0 +1,8 @@
+de:
+  pageflow:
+    admin:
+      resource_tabs:
+        members: "Mitglieder"
+        revisions: "Revisionen"
+        entries: "Beiträge"
+        users: "Benutzer"

data/config/locales/editor.de.yml

@@ -7,9 +7,7 @@ de:
         options: "Optionen"
         links: "Verweise"
         widgets: "Erscheinungsbild"
-    screens:
-      ratio16to9: "16:9"
-      ratio4to3: "4:3"
+        social: "Social"
     files:
       tabs:
         image_files: "Bilder"
@@ -48,8 +46,9 @@ de:
         gradient_opacity: "Wählen Sie die Intensität des Farbverlaufs so, dass ein ausreichender Kontrast zwischen Text und Hintegrund gewährleistet ist."
         description: "Dieser Text wird auf der Übersichtseite angezeigt, wenn Sie den Mauszeiger über dem Vorschaubild einer Seite platzieren."
         additional_title: "Die Infobox wird über den Steuerelementen zum Starten und Stoppen der Wiedegabe angezeigt."
-        text: "Empfohlene Textlänge: 220 Zeichen"
+        text: "Dieser ist der Textbereich der Seite."
         thumbnail_image_id: "Dieses Bild wird in der Navigationsleiste und anderen Verweisen auf die Seite gezeigt."
+        mobile_poster_image_id: "Dieses Bild wird in der Mobilvariante der Seite als Posterbild gezeigt."
       "pageflow/entry":
         title: "Vom Browser angezeigter Titel der Seite."
         summary: "Zusammenfassung die an Soziale Netzwerke weitergeben wird."
@@ -57,6 +56,8 @@ de:
         manual_start: "Besucher muss den Start des Beitrags durch einen Klick bestätigen."
         home_button_enabled: "Link zu einer Übersichtsseite anzeigen."
         home_button_enabled_disabled: "Diese Funktion steht in diesem Theme nicht zur Verfügung."
+        emphasize_chapter_beginning: "Die erste Seite eines jeden Kapitels wird hervorgehoben."
+        emphasize_new_pages: "Seit dem letzten Besuch neu hinzugefügte Seiten werden besonders gekennzeichnet."
         home_url: "URL der Übersichtseite. Leer lassen, um Standard zu übernehmen."
         home_url_disabled: "Diese Funktion steht in diesem Theme nicht zur Verfügung."
       "pageflow/chapter":

data/config/locales/pageflow/editor/background_positioning.de.yml

@@ -0,0 +1,13 @@
+de:
+  pageflow:
+    editor:
+      background_positioning:
+        title: "Bildauschnitt anpassen"
+        help: "Stellen Sie ein, welcher Teil des Bildes beim Zuschneiden sichtbar bleiben soll."
+        preview_title: "Vorschau"
+        previews:
+          banner: "Banner"
+          ratio16to9: "16:9 Landscape"
+          ratio4to3: "4:3 Landscape"
+          ratio16to9Portrait: "16:9 Portrait"
+          ratio4to3Portrait: "4:3 Portrait"

data/config/locales/pageflow/ui.de.yml

@@ -0,0 +1,6 @@
+de:
+  pageflow:
+    ui:
+      select_input_view:
+        placeholder: "Standard (%{text})"
+        blank: "(Kein)"

data/config/locales/pageflow/widgets.de.yml

@@ -0,0 +1,14 @@
+de:
+  pageflow:
+    widgets:
+      none: '(Kein)'
+      roles:
+        navigation: "Navigationsleiste"
+        mobile_navigation: "Mobile Navigation"
+        analytics: "Zählpixel"
+      type_names:
+        default_navigation: "Navigationsleiste mit Thumbnails"
+        default_mobile_navigation: "Navigationsmenü mit Thumbnails"
+      share_menu:
+        entry: "Diesen Beitrag"
+        current_page: "Diese Seite"

data/config/routes.rb

@@ -38,6 +38,12 @@ Pageflow::Engine.routes.draw do
           post :check, :on => :collection
         end
       end
+
+      resources :subjects, path: '/subjects/:collection_name', only: [] do
+        resources :widgets, :only => [:index] do
+          patch :batch, :on => :collection
+        end
+      end
     end
 
     root :to => redirect('/admin')

data/config/spring.rb

@@ -1 +1,2 @@
-Spring.application_root = File.join(__FILE__, '../../spec/dummy')
+require File.expand_path('../spec/support/pageflow/rails_version', File.dirname(__FILE__))
+Spring.application_root = File.join(__FILE__, "../../spec/dummy/rails-#{Pageflow::RailsVersion.detect}")

data/db/migrate/20141027102310_create_widgets.rb

@@ -0,0 +1,11 @@
+class CreateWidgets < ActiveRecord::Migration
+  def change
+    create_table :pageflow_widgets do |t|
+      t.belongs_to :subject, polymorphic: true
+      t.string :type_name
+      t.string :role
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141028125408_add_emphasize_chapter_beginning_to_revisions.rb

@@ -0,0 +1,5 @@
+class AddEmphasizeChapterBeginningToRevisions < ActiveRecord::Migration
+  def change
+    add_column :pageflow_revisions, :emphasize_chapter_beginning, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20141119164526_add_emphasize_new_pages_to_revisions.rb

@@ -0,0 +1,5 @@
+class AddEmphasizeNewPagesToRevisions < ActiveRecord::Migration
+  def change
+    add_column :pageflow_revisions, :emphasize_new_pages, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20141119174032_add_sharing_image_to_revisions.rb

@@ -0,0 +1,7 @@
+class AddSharingImageToRevisions < ActiveRecord::Migration
+  def change
+    add_column :pageflow_revisions, :share_image_id, :integer
+    add_column :pageflow_revisions, :share_image_x, :integer
+    add_column :pageflow_revisions, :share_image_y, :integer
+  end
+end

data/lib/pageflow/ability_mixin.rb

@@ -34,6 +34,7 @@ module Pageflow
         can :destroy, Account do |account|
           account.users.empty? && account.entries.empty?
         end
+        can :manage, Theming
 
         can :manage, ::User
 
@@ -51,6 +52,7 @@ module Pageflow
 
         can :manage, Resque
       elsif user.account_manager?
+        can :manage, Theming, :account_id => user.account_id
         can :manage, Folder, :account_id => user.account.id
         can :manage, Entry, :account_id => user.account.id
         can :manage, ::User, :account_id => user.account.id

data/lib/pageflow/admin/tabs.rb

@@ -0,0 +1,18 @@
+module Pageflow
+  module Admin
+    class Tabs
+      def initialize
+        @tabs = {}
+      end
+
+      def register(resource_name, view_component)
+        @tabs[resource_name] ||= []
+        @tabs[resource_name] << view_component
+      end
+
+      def find_by_resource(name)
+        @tabs.fetch(name, [])
+      end
+    end
+  end
+end

data/lib/pageflow/built_in_widget_type.rb

@@ -0,0 +1,27 @@
+module Pageflow
+  class BuiltInWidgetType < WidgetType
+    attr_reader :name, :roles, :partial_path
+
+    def initialize(name, roles, partial_path)
+      @name = name
+      @roles = roles
+      @partial_path = partial_path
+    end
+
+    def translation_key
+      "pageflow.widgets.type_names.#{name}"
+    end
+
+    def render(template, entry)
+      template.render(partial_path, entry: entry)
+    end
+
+    def self.navigation
+      new('default_navigation', ['navigation'], 'pageflow/entries/navigation')
+    end
+
+    def self.mobile_navigation
+      new('default_mobile_navigation', ['mobile_navigation'], 'pageflow/entries/mobile_navigation')
+    end
+  end
+end

data/lib/pageflow/configuration.rb

@@ -64,6 +64,10 @@ module Pageflow
     # @return [FileTypes]
     attr_reader :file_types
 
+    # Used to register new types of widgets to be displayed in entries.
+    # @return [WidgetTypes]
+    attr_reader :widget_types
+
     # Paperclip style definitions of thumbnails used by Pageflow.
     # @return Hash
     attr_accessor :thumbnail_styles
@@ -135,6 +139,16 @@ module Pageflow
     # explicitly confirmed in the editor. Defaults to false.
     attr_accessor :confirm_encoding_jobs
 
+    # Used by Pageflow extensions to provide new tabs to be displayed
+    # in the admin.
+    #
+    # @example
+    #
+    #     config.admin_resource_tabs.register(:entry, Admin::CustomTab)
+    #
+    # @return [Admin::TabsRegistry]
+    attr_reader :admin_resource_tabs
+
     def initialize
       @paperclip_filesystem_default_options = {}
       @paperclip_s3_default_options = {}
@@ -147,6 +161,7 @@ module Pageflow
       @quotas = Quotas.new
       @themes = Themes.new
       @file_types = FileTypes.new(page_types)
+      @widget_types = WidgetTypes.new
 
       @thumbnail_styles = {}
       @css_rendered_thumbnail_styles = Pageflow::PagesHelper::CSS_RENDERED_THUMBNAIL_STYLES
@@ -156,6 +171,8 @@ module Pageflow
       @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
 
       @confirm_encoding_jobs = false
+
+      @admin_resource_tabs = Pageflow::Admin::Tabs.new
     end
 
     # Make a page type available for use in the system.