pageflow 0.5.0 → 0.6.0

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

@@ -17,6 +17,16 @@
       <%= theming.input :imprint_link_url %>
       <%= theming.input :copyright_link_label %>
       <%= theming.input :copyright_link_url %>
+
+      <% theming.object.widgets.resolve(:include_placeholders => true).each do |widget| %>
+        <%= f.semantic_fields_for(widget) do |w| %>
+          <%= w.input(:type_name,
+                      :label => t(widget.role, :scope => 'pageflow.widgets.roles'),
+                      :input_html => {:name => "widgets[#{widget.role}]"},
+                      :include_blank => t('pageflow.widgets.none'),
+                      :collection => widget_types_collection_for_role(widget.role)) %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
   <%= f.actions do %>

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

@@ -0,0 +1,22 @@
+module Pageflow
+  module Admin
+    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|
+              link_to(entry.title, admin_entry_path(entry))
+            end
+          end
+          else
+            div :class => "blank_slate_container" do
+            span :class => "blank_slate" do
+              I18n.t('admin.accounts.no_entries')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+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') do |membership|
+              if authorized? :manage, User
+                link_to membership.user.full_name, admin_user_path(membership.user), :class => 'view_creator'
+              else
+                membership.user.full_name
+              end
+            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'})
+              end
+            end
+          end
+        else
+          div :class => "blank_slate_container" do
+            span :class => "blank_slate" do
+              I18n.t('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'}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+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
+          scope(:publications)
+          scope(:publications_and_user_snapshots)
+          scope(:frozen)
+
+          table_for_collection :class => 'revisions', :i18n => Pageflow::Revision do
+            row_attributes do |revision|
+              {:class => revision_css_class(revision)}
+            end
+
+            column :frozen_at
+            column :creator do |revision|
+              if authorized? :manage, User
+                link_to revision.creator.full_name, admin_user_path(revision.creator)
+              else
+                revision.creator.full_name
+              end
+            end
+            column :published_until  do |revision|
+              if revision.published_until
+                I18n.l(revision.published_until)
+              elsif revision.published?
+                I18n.t('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'))
+            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')}))
+            end
+          end
+        end
+
+        para(I18n.t('admin.entries.published_revision_legend'), :class => 'legend published')
+
+        text_node(button_to(t('admin.entries.snapshot'),
+                            snapshot_admin_entry_path(entry),
+                            :method => :post))
+      end
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+module Pageflow
+  module Admin
+    class TabsView < ViewComponent
+      builder_method :tabs_view
+
+      attr_reader :tabs, :options
+
+      def build(tabs, options = {})
+        super(class: 'admin_tabs_view')
+
+        @tabs = tabs
+        @options = options
+
+        build_tab_list
+        build_tab_containers
+      end
+
+      private
+
+      def build_tab_list
+        ul(class: 'tabs') do
+          tabs.each do |tab_options|
+            build_tab_item(tab_options)
+          end
+        end
+      end
+
+      def build_tab_item(tab_options)
+        li(class: tab_class(tab_options[:name])) do
+          link_to(t(tab_options[:name], scope: options[:i18n]), tab_href(tab_options[:name]))
+        end
+      end
+
+      def tab_href(name)
+        params = request.query_parameters.except(:page, :scope)
+        params_string = params.merge(tab: name).to_param
+        "?#{params_string}".html_safe
+      end
+
+      def build_tab_containers
+        tabs.each do |tab_options|
+          build_tab_container(tab_options)
+        end
+      end
+
+      def build_tab_container(tab_options)
+        div(class: tab_container_class(tab_options[:name])) do
+          insert_tag(tab_options[:component], *options.fetch(:build_args, []))
+        end
+      end
+
+      def tab_class(tab_name)
+        [
+          tab_name,
+          current_tab?(tab_name) ? 'active' : nil
+        ].compact.join(' ')
+      end
+
+      def tab_container_class(tab_name)
+        [
+          'tab_container',
+          "#{tab_name}_tab_container",
+          current_tab?(tab_name) ? 'active' : nil
+        ].compact.join(' ')
+      end
+
+      def current_tab?(name)
+        name.to_s == current_tab_name.to_s
+      end
+
+      def current_tab_name
+        options[:current_tab] ||
+          request.params[:tab] ||
+          tabs.first[:name]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Pageflow
+  module Admin
+    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('admin.accounts.no_members')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,19 +2,19 @@
 <html>
 <head>
   <title><%= @page_title.presence || 'Pageflow' %></title>
-  <%= stylesheet_link_tag    "pageflow/application", media: "all", "data-turbolinks-track" => true %>
-  <%= stylesheet_link_tag    "pageflow/print_view", media: "print", "data-turbolinks-track" => true %>
+
   <%= javascript_include_tag "pageflow/application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
 
-  <%= render 'layouts/pageflow/loading_spinner_inline_script' %>
+  <%= 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" />
 
   <%= yield :head %>
 
+  <%= stylesheet_link_tag 'pageflow/print_view', media: 'print', 'data-turbolinks-track' => true %>
+  <%= render 'layouts/pageflow/loading_spinner_inline_script' %>
+
   <%= render 'layouts/pageflow/ie_include_tags' %>
 </head>
 <%= content_tag :body, :class => [@body_class, 'load_images has_no_mobile_platform non_js'].compact.flatten.join(' ') do %>

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

@@ -1,9 +1,12 @@
-json.(entry, :id, :title, :summary, :credits, :published_until, :manual_start, :slug)
+json.(entry, :id, :published_until, :slug)
 
 json.pretty_url pretty_entry_url(entry)
 
-json.home_url entry.home_button.url_value
-json.home_button_enabled entry.home_button.enabled_value
-
 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.home_url entry.home_button.url_value
+  json.home_button_enabled entry.home_button.enabled_value
+end

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

@@ -11,6 +11,6 @@ if file_type.editor_partial.present?
 end
 
 if file.respond_to?(:thumbnail_url)
-  json.thumbnail_url(file.thumbnail_url(:thumbnail))
-  json.link_thumbnail_url(file.thumbnail_url(:link_thumbnail_large))
+  json.thumbnail_url(asset_path(file.thumbnail_url(:thumbnail)))
+  json.link_thumbnail_url(asset_path(file.thumbnail_url(:link_thumbnail_large)))
 end

data/app/views/pageflow/editor/widgets/_widget.json.jbuilder

@@ -0,0 +1,2 @@
+json.id(widget.role)
+json.(widget, :type_name)

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

@@ -0,0 +1 @@
+json.array!(@widgets, partial: 'pageflow/editor/widgets/widget', as: :widget)

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

@@ -1,4 +1,8 @@
-<%= content_tag :div, :id => 'outer_wrapper', :data => {:theme => entry.theming.theme.name} do %>
+<%= content_tag(:div,
+                :id => 'outer_wrapper',
+                :data => {:theme => entry.theming.theme.name},
+                :class => entry_css_class(entry)) 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">
@@ -11,6 +15,6 @@
   <% end %>
 
   <%= render 'pageflow/entries/header', :entry => entry %>
-  <%= render 'pageflow/entries/navigation', :entry => entry %>
   <%= render 'pageflow/entries/overview', :entry => entry %>
+  <%= render_widgets(entry) %>
 <% end %>

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

@@ -0,0 +1,56 @@
+<div class="navigation_mobile" data-widget="default_mobile_navigation">
+  <div class="menu index"></div>
+  <div class="menu sharing"></div>
+  <div class="menu imprint"></div>
+  <div class="overview_mobile">
+      <span class="heading-1">Übersicht</span>
+      <div class="wrapper">
+        <ul>
+          <%= render :partial => 'pageflow/entries/navigation/page',
+                     :collection => entry_mobile_navigation_pages(entry),
+                     :locals => {:image_style => :thumbnail_overview_mobile, :image_width => nil} %>
+        </ul>
+      </div>
+  </div>
+  <div class="sharing_mobile">
+    <div class="wrapper">
+      <ul>
+        <li>
+          <%= 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 %>
+        </li>
+        <li>
+          <%= 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 %>
+        </li>
+        <li>
+          <%= 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 %>
+        </li>
+      </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>
+    </div>
+  </div>
+  <div class="imprint_mobile">
+      <span class="heading-1">Impressum</span>
+      <div class="wrapper">
+        <ul>
+          <li class="credits">
+            <%= render 'pageflow/entries/navigation/credits_box_content', :entry =>  entry %>
+          </li>
+        </ul>
+      </div>
+  </div>
+</div>

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

@@ -1,4 +1,6 @@
-<%= content_tag :div, class: ["navigation", entry.home_button.enabled? ? 'with_home_button' : nil].compact.join(' ') do %>
+<%= content_tag(:div,
+                class: ["navigation", entry.home_button.enabled? ? 'with_home_button' : nil].compact.join(' '),
+                data: {widget: 'default_navigation'}) do %>
   <%= render 'pageflow/entries/navigation/bar_top', :entry => entry %>
   <div class="scroller">
     <ul class="navigation_thumbnails">
@@ -8,56 +10,4 @@
     </ul>
   </div>
   <%= render 'pageflow/entries/navigation/bar_bottom', :entry => entry %>
-</div>
-<div class="navigation_mobile">
-  <div class="menu index"></div>
-  <div class="menu sharing"></div>
-  <div class="menu imprint"></div>
-  <div class="overview_mobile">
-      <span class="heading-1">Übersicht</span>
-      <div class="wrapper">
-        <ul>
-          <%= render :partial => 'pageflow/entries/navigation/page',
-                     :collection => entry_mobile_navigation_pages(entry),
-                     :locals => {:image_style => :thumbnail_overview_mobile, :image_width => nil} %>
-        </ul>
-      </div>
-  </div>
-  <div class="sharing_mobile">
-      <div class="wrapper">
-        <ul>
-          <li>
-            <%= 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>
-              <span class="share_facebook button"></span>
-              <p>facebook</p>
-            <% end %>
-          </li>
-          <li>
-            <%= link_to "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share twitter" do %>
-              <span class="hint">über twitter teilen</span>
-              <span class="share_twitter button"></span>
-              <p>Twitter</p>
-            <% end %>
-          </li>
-          <li>
-            <%= link_to "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share google" do %>
-              <span class="hint">über Google+ teilen</span>
-              <span class="share_google button"></span>
-              <p>Google+</p>
-            <% end %>
-          </li>
-        </ul>
-      </div>
-  </div>
-  <div class="imprint_mobile">
-      <span class="heading-1">Impressum</span>
-      <div class="wrapper">
-        <ul>
-          <li class="credits">
-            <%= render 'pageflow/entries/navigation/credits_box_content', :entry =>  entry %>
-          </li>
-        </ul>
-      </div>
-  </div>
 <% end %>

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

@@ -1,4 +1,5 @@
 <% 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) %>
     <%= entry_stylesheet_link_tag(@entry) %>
     <%= stylesheet_link_tag 'pageflow/editor', media: "all" %>
@@ -44,6 +45,7 @@
         },
 
         theming: <%= render_json_seed(@entry.theming) %>,
+        widget_types: <%= widget_types_json_seeds %>,
         page_types: <%= page_type_json_seeds %>
       });
     });