pageflow 0.1.0 → 0.2.0

data/app/views/pageflow/entries/_theming.css.erb

@@ -0,0 +1 @@
+<% # To be overriden in application views %>

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

@@ -1,5 +1,6 @@
 <% content_for(:head) do %>
     <%= entry_theme_stylesheet_link_tag(@entry) %>
+    <%= entry_stylesheet_link_tag(@entry) %>
     <%= stylesheet_link_tag 'pageflow/editor', media: "all" %>
     <%= javascript_include_tag 'pageflow/editor' %>
 <% end %>
@@ -30,6 +31,7 @@
     pageflow.features.detect().then(function() {
       pageflow.app.start({
         root: '<%= edit_entry_path(@entry).html_safe %>',
+        config: <%= editor_config_seeds %>,
 
         entry: <%= render_json_seed(@entry) %>,
         chapters: <%= @entry.chapters.to_json.html_safe %>,
@@ -39,7 +41,7 @@
         videoFiles: <%= render_json_seed(@entry.video_files.with_usage_id) %>,
         audioFiles: <%= render_json_seed(@entry.audio_files.with_usage_id) %>,
 
-        page_types: <%= page_type_json_seeds %>,
+        page_types: <%= page_type_json_seeds %>
       });
     });
   });

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

@@ -49,8 +49,8 @@
       </p>
 
       <h2 class="hidden">Globale Links</h2>
-      <%= link_to(raw(entry.theme.imprint_link_label), entry.theme.imprint_link_url, :target => '_blank', :tabindex => 2, :class => 'legal') %>
-      <%= link_to(raw(entry.theme.copyright_link_label), entry.theme.copyright_link_url, :target => '_blank', :tabindex => 2, :class => 'copy') %>
+      <%= link_to(raw(entry.theming.imprint_link_label), entry.theming.imprint_link_url, :target => '_blank', :tabindex => 2, :class => 'legal') %>
+      <%= link_to(raw(entry.theming.copyright_link_label), entry.theming.copyright_link_url, :target => '_blank', :tabindex => 2, :class => 'copy') %>
     </div>
     <a title="Impressum">
       <span class="hint">impressum</span>

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

@@ -35,5 +35,7 @@
         background-image: url('<%= video_file.poster.url(:link_thumbnail_large) %>');
       }
     <% end %>
-    
+
+    <%= render 'pageflow/entries/theming' %>
+
 <% end %>

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

@@ -1,23 +1,23 @@
 <% @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.theme.name}/favicon.ico"), :type => 'image/ico' %>
+  <%= 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' %>
 <% end %>
 
 <%= cache @entry do %>
 
-    <%= render 'pageflow/entries/ie8_hint' %>
-    <%= render 'pageflow/entries/loading_spinner' %>
-    <%= render 'pageflow/entries/multimedia_alert' %>
-    <%= render @entry %>
+  <%= render 'pageflow/entries/ie8_hint' %>
+  <%= render 'pageflow/entries/loading_spinner' %>
+  <%= render 'pageflow/entries/multimedia_alert' %>
+  <%= render @entry %>
 
-    <script>
-        pageflow.manualStart.enabled = <%= @entry.manual_start ? 'true' : 'false' %>;
-        pageflow.pages = <%= @entry.pages.to_json(:only => [:id, :perma_id, :configuration]).html_safe %>;
-    </script>
+  <script>
+    pageflow.manualStart.enabled = <%= @entry.manual_start ? 'true' : 'false' %>;
+    pageflow.pages = <%= @entry.pages.to_json(:only => [:id, :perma_id, :configuration]).html_safe %>;
+  </script>
 
-    <%= render 'pageflow/entries/analytics', :entry => @entry %>
+  <%= render 'pageflow/entries/analytics', :entry => @entry %>
 <% end %>

data/config/initializers/page_type_helpers.rb

@@ -2,6 +2,7 @@ Pageflow.after_configure do
   Pageflow.config.page_types.each do |page_type|
     page_type.view_helpers.each do |helper|
       Pageflow::EntriesController.helper(helper)
+      Pageflow::RevisionsController.helper(helper)
     end
   end
 end

data/config/locales/activerecord.de.yml

@@ -28,32 +28,44 @@ de:
         too_short: ist zu kurz (nicht weniger als %{count} Zeichen)
         wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
     models:
-      account:
+      user:
+        one: "Nutzer"
+        other: "Nutzer"
+
+      "pageflow/account": &pageflow_account
         one: "Konto"
         other: "Konten"
-      membership:
+      "pageflow/membership": &pageflow_membership
         one: "Mitgliedschaft"
         other: "Mitgliedschaften"
-      entry:
+      "pageflow/entry": &pageflow_entry
         one: "Beitrag"
         other: "Beiträge"
-      folder:
+      "pageflow/folder": &pageflow_folder
         one: "Ordner"
         other: "Ordner"
-      user:
-        one: "Nutzer"
-        other: "Nutzer"
-      revision:
+      "pageflow/revision": &pageflow_revision
         one: "Revision"
         other: "Revisionen"
+      "pageflow/theming": &pageflow_theming
+        one: "Theming"
+        other: "Themings"
+
+      # Active Admin expects non namespaced translation keys
+      account: *pageflow_account
+      membership: *pageflow_membership
+      entry: *pageflow_entry
+      folder: *pageflow_folder
+      revision: *pageflow_revision
+      theming: *pageflow_theming
     attributes:
-      account:
+      "pageflow/account":
         name: "Name"
         default_file_rights: "Standard Urheber"
-        cname: "CNAME"
-        default_theme: "Standard Theme"
+        default_theming: "Standard Theming"
         landing_page_name: "Einstiegsseite"
-      user:
+        created_at : "Erstellt am"
+      "user":
         email: "E-Mail-Adresse"
         unconfirmed_email: "Noch nicht bestätigte E-Mail-Adresse"
         full_name: "Name"
@@ -73,7 +85,7 @@ de:
         membership: "Mitgliedschaft"
         role: "Rolle"
         account: "Konto"
-      entry:
+      "pageflow/entry":
         title: "Titel"
         summary: "Zusammenfassung"
         credits: "Credits"
@@ -83,13 +95,13 @@ de:
         url: "Permalink"
         account: "Konto"
         manual_start: "Multimedia Hinweis vor dem Start anzeigen"
-      folder:
+      "pageflow/folder":
         account: "Konto"
         name: "Name"
-      membership:
+      "pageflow/membership":
         user: "Redakteur"
         entry: "Beitrag"
-      revision:
+      "pageflow/revision":
         created_at: "Erstellt am"
         updated_at: "Geändert am"
         published_at: "Publiziert am"
@@ -97,9 +109,9 @@ de:
         creator: "Erstellt von"
         frozen_at: "Stand vom"
         created_with: "Erstellt durch"
-      chapter:
+      "pageflow/chapter":
         title: "Titel"
-      page:
+      "pageflow/page":
         template: "Seitentyp"
         text: "Text"
         tagline: "Tagline"
@@ -124,17 +136,24 @@ de:
         linked_pages_layout: "Hervorgehobenes Element"
         hide_title: "Titel ausblenden"
         text_position: "Textposition"
-      image_file:
+      "pageflow/image_file":
         dimensions: "Maße"
-      video_file:
+      "pageflow/video_file":
         format: "Format"
         dimensions: "Maße"
         duration: "Länge"
-      audio_file:
+      "pageflow/audio_file":
         format: "Format"
         duration: "Länge"
+      "pageflow/theming":
+        cname: "CNAME"
+        theme_name: "Theme"
+        imprint_link_label: "Impressum-Link Text"
+        imprint_link_url: "Impressum-Link URL"
+        copyright_link_label: "Copyright-Link Text"
+        copyright_link_url: "Copyright-Link URL"
     values:
-      page:
+      "pageflow/page":
         template:
           background_image: "Hintergrund-Bild"
           background_video: "Hintergrund-Video"

data/config/locales/admin/accounts.yml

@@ -3,4 +3,3 @@ de:
     accounts:
       no_members: "Keine Benutzer"
       no_entries: "Keine Beiträge"
-      cname_hint: "Verwendet für Social Network Sharing."

data/config/locales/admin/entries.yml

@@ -3,7 +3,7 @@ de:
     entries:
       entries: "Beiträge"
       title_hint: "Dieses Feld bestimmt die URL, unter der der Beitrag öffentlich erreichbar ist."
-      editor: "Editor öffnen"
+      editor: "Editor"
       remove: "Entfernen"
       edit: "Bearbeiten"
       depublish: "Beitrag depublizieren"
@@ -11,7 +11,8 @@ de:
       show: "Anzeigen"
       restore: "Wiederherstellen"
       confirm_restore: "Soll der Beitrag wirklich auf den Stand dieser Revision zurückgesetzt werden? Vor dem Zurücksetzen wird eine automatische Sicherung des aktuellen Standes erstellt."
-      show_public: "Öffentliche Seite anzeigen"
+      show_public: "Öffentlich"
+      preview: "Vorschau"
       members: "Redakteure"
       no_members: "Es sind keine Redakteure zugeordnet."
 
@@ -36,3 +37,6 @@ de:
       not_published: "Nicht veröffentlicht"
 
       add_folder: "Ordner hinzufügen"
+
+      edit_config: "Konfiguration ändern"
+      remove_logo: "Logo löschen"

data/config/locales/admin/themings.yml

@@ -0,0 +1,7 @@
+de:
+  admin:
+    themings:
+      cname_hint: "Verwendet für Social Network Sharing."
+      show: "Anzeigen"
+      remove_logo: "Logo entfernen"
+      name: "%{account_name}"

data/config/locales/admin/users/me.de.yml

@@ -3,7 +3,7 @@ de:
     users:
       me:
         change_password_hint: "Freilassen um bisheriges Passwort beizubehalten."
-        delete_account_hint: "Sie möchten die Anwenung nicht mehr nutzen?"
+        delete_account_hint: "Sie möchten die Anwendung nicht mehr nutzen?"
         delete_account: "Benutzerkonto löschen"
         updated: "Ihr Profil wurde aktualisiert."
-        deleted: "Ihr Benutzerkonto wurde gelöscht."
+        deleted: "Ihr Benutzerkonto wurde gelöscht."

data/config/locales/editor.de.yml

@@ -25,8 +25,14 @@ de:
           active: "Wird zu S3 übertragen."
           finished: "Erfolgreich zu S3 übertragen."
           failed: "Fehler beim übertragen zu S3."
+        fetching_meta_data:
+          pending: "Metadaten noch nicht abgerufen."
+          active: "Metadaten werden abgerufen."
+          finished: "Metadaten erfolgreich abgerufen."
+          failed: "Fehler beim Abrufen der Metadaten."
         encoding:
           pending: "Noch nicht encodiert."
+          action_required: "Bestätigung erforderlich."
           active: "Encoding läuft."
           finished: "Erfolgreich encodiert."
           failed: "Fehler beim Encoding."
@@ -36,17 +42,17 @@ de:
           finished: "Erfolgreich verarbeitet."
           failed: "Fehler beim Verarbeiten."
     inline_help:
-      page:
+      "pageflow/page":
         invert: "Dunkle Schrift und helle Schattierung anzeigen."
         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"
         thumbnail_image_id: "Dieses Bild wird in der Navigationsleiste und anderen Verweisen auf die Seite gezeigt."
-      entry:
+      "pageflow/entry":
         title: "Vom Browser angezeigter Titel der Seite."
         summary: "Zusammenfassung die an Soziale Netzwerke weitergeben wird."
         credits: "Text wird zusammen mit dem Impressumsverweis angezeigt."
         manual_start: "Besucher muss den Start des Beitrags durch einen Klick bestätigen."
-      chapter:
+      "pageflow/chapter":
         title: "Wird auf der Übersichtsseite angezeigt."

data/config/locales/quotas.de.yml

@@ -1,3 +1,3 @@
 de:
   quotas:
-    exceeded: "Quota verbraucht."
+    exhausted: "Quota verbraucht."

data/config/routes.rb

@@ -1,48 +1,55 @@
 Pageflow::Engine.routes.draw do
-  resources :entries, :only => [:edit, :update], :shallow => true do
-    get :partials, :on => :member
+  constraints Pageflow.config(:ignore_not_configured => true).editor_route_constraint do
+    resources :entries, :only => [:edit, :update], :shallow => true do
+      get :partials, :on => :member
 
-    resources :revisions, :only => [:show, :create] do
-      delete :current, :to => 'revisions#depublish_current', :on => :collection
-    end
-
-    resources :chapters, :only => [:create, :update, :destroy] do
-      collection do
-        patch :order
+      resources :revisions, :only => [:show] do
+        delete :current, :to => 'revisions#depublish_current', :on => :collection
       end
 
-      resources :pages, :only => [:create, :update, :destroy] do
+      resources :chapters, :only => [:create, :update, :destroy] do
         collection do
           patch :order
         end
+
+        resources :pages, :only => [:create, :update, :destroy] do
+          collection do
+            patch :order
+          end
+        end
       end
+
+      resource :edit_lock
     end
 
-    resource :edit_lock
-  end
+    namespace :editor do
+      resources :entries, :only => :index, :shallow => true do
+        resources :image_files, :only => [:index, :create, :update] do
+          get :retry, :on => :member
+        end
 
-  namespace :editor do
-    resources :entries, :only => :index, :shallow => true do
-      resources :image_files, :only => [:index, :create, :update] do
-        get :retry, :on => :member
-      end
+        resources :video_files, :only => [:index, :create, :update] do
+          get :retry, :on => :member
+        end
 
-      resources :video_files, :only => [:index, :create, :update] do
-        get :retry, :on => :member
-      end
+        resources :audio_files, :only => [:index, :create, :update] do
+          get :retry, :on => :member
+        end
 
-      resources :audio_files, :only => [:index, :create, :update] do
-        get :retry, :on => :member
-      end
+        resources :file_usages, :only => [:create, :destroy]
+        resources :encoding_confirmations, :only => [:create] do
+          post :check, :on => :collection
+        end
 
-      resources :file_usages, :only => [:create, :destroy]
+        resources :entry_publications, :only => [:create] do
+          post :check, :on => :collection
+        end
+      end
     end
 
-    resources :quotas, :only => [:show]
+    root :to => redirect('/admin')
   end
 
-  root :to => redirect('/admin')
-
   get ':entry_id/videos/:id', :to => 'video_files#show', :as => :short_video_file
 
   resources :entries, :only => [:show]

data/db/migrate/20140624135420_create_themings.rb

@@ -0,0 +1,15 @@
+class CreateThemings < ActiveRecord::Migration
+  def change
+    create_table :pageflow_themings do |t|
+      t.string :imprint_link_url
+      t.string :imprint_link_label
+      t.string :copyright_link_url
+      t.string :copyright_link_label
+
+      t.belongs_to :account
+      t.belongs_to :theme
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140624135421_create_themings_for_existing_accounts.rb

@@ -0,0 +1,26 @@
+class CreateThemingsForExistingAccounts < ActiveRecord::Migration
+  def up
+    # For each account create a theming. Copy link attributes from
+    # theme to theming. Store account_id on theming so we can identify
+    # it as the accounts default_theming later on.
+    execute(<<-SQL)
+      INSERT INTO pageflow_themings
+        (account_id, theme_id, imprint_link_label, imprint_link_url, copyright_link_label, copyright_link_url, created_at, updated_at)
+        SELECT a.id, default_theme_id, imprint_link_label, imprint_link_url, copyright_link_label, copyright_link_url, a.created_at, a.updated_at
+          FROM pageflow_accounts AS a
+          LEFT JOIN pageflow_themes AS t ON t.id = a.default_theme_id;
+    SQL
+  end
+
+  def down
+    # Copy link attributes back to themes.
+    execute(<<-SQL)
+      UPDATE pageflow_themes AS t
+        LEFT JOIN pageflow_themings AS g ON g.theme_id = t.id
+        SET t.imprint_link_label = g.imprint_link_label,
+            t.imprint_link_url = g.imprint_link_url,
+            t.copyright_link_label = g.copyright_link_label,
+            t.copyright_link_url = g.copyright_link_url
+    SQL
+  end
+end

data/db/migrate/20140624135422_change_theme_references_to_theming_references.rb

@@ -0,0 +1,45 @@
+class ChangeThemeReferencesToThemingReferences < ActiveRecord::Migration
+  def up
+    add_reference :pageflow_accounts, :default_theming, :index => true
+    add_reference :pageflow_entries, :theming, :index => true
+
+    # Use theming created for account as default_theming.
+    execute(<<-SQL)
+      UPDATE pageflow_accounts SET default_theming_id =
+        (SELECT id FROM pageflow_themings where pageflow_accounts.id = pageflow_themings.account_id LIMIT 1);
+    SQL
+
+    # Use default theming from entry's account as theming
+    execute(<<-SQL)
+      UPDATE pageflow_entries SET theming_id =
+        (SELECT default_theming_id FROM pageflow_accounts where pageflow_accounts.id = pageflow_entries.account_id);
+    SQL
+
+    remove_reference :pageflow_accounts, :default_theme
+    remove_reference :pageflow_entries, :theme
+  end
+
+  def down
+    add_reference :pageflow_accounts, :default_theme, :index => true
+    add_reference :pageflow_entries, :theme, :index => true
+
+    # Set default_theme_id to theme_id of account's default_theming.
+    execute(<<-SQL)
+      UPDATE pageflow_accounts SET default_theme_id =
+        (SELECT id FROM pageflow_themes where pageflow_themes.id =
+          (SELECT theme_id FROM pageflow_themings
+             WHERE pageflow_accounts.default_theming_id = pageflow_themings.id LIMIT 1));
+    SQL
+
+    # Set theme_id to theme_id of entries's theming.
+    execute(<<-SQL)
+      UPDATE pageflow_entries SET theme_id =
+        (SELECT id FROM pageflow_themes where pageflow_themes.id =
+          (SELECT theme_id FROM pageflow_themings
+             WHERE pageflow_entries.theming_id = pageflow_themings.id LIMIT 1));
+    SQL
+
+    remove_reference :pageflow_accounts, :default_theming
+    remove_reference :pageflow_entries, :theming
+  end
+end