pageflow 15.7.1 → 16.0.0

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

@@ -10,29 +10,11 @@
     <% end %>
   <% end %>
 
-  <%= f.semantic_fields_for :default_theming do |theming| %>
-    <%= f.inputs do %>
-      <%= theming.input :cname, hint: t('pageflow.admin.themings.cname_hint') %>
-      <%= theming.input :additional_cnames, hint: t('pageflow.admin.themings.additional_cnames_hint') %>
-      <%= theming.input :home_url, hint: t('pageflow.admin.themings.home_url_hint') %>
+  <% if resource.new_record? %>
+    <%= f.semantic_fields_for :default_site do |site| %>
+      <%= render 'admin/sites/fields', f: site, account_config: account_config %>
     <% end %>
-
-    <%= f.inputs do %>
-      <%= theming.input :imprint_link_label %>
-      <%= theming.input :imprint_link_url %>
-      <%= theming.input :copyright_link_label %>
-      <%= theming.input :copyright_link_url %>
-      <%= theming.input :privacy_link_url %>
-
-      <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
-        <%= form_input.build(theming) %>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <p>
-      <%= t('pageflow.admin.accounts.entry_template_hint') %>
-  </p>
+  <% end  %>
 
   <%= f.actions do %>
     <%= f.action(:submit) %>

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

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

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

@@ -1,6 +1,8 @@
 <%= admin_form_for([:admin, resource]) do |f| %>
   <%= f.inputs do %>
-    <%= f.input :title, hint: I18n.t('pageflow.admin.entries.title_hint') %>
+    <%= f.input(:title,
+                hint: @entry.site.permalink_directories.blank? &&
+                      I18n.t('pageflow.admin.entries.title_hint')) %>
 
     <% if authorized?(:update_account_on, resource) &&
           account_policy_scope.entry_creatable.many? %>
@@ -14,17 +16,14 @@
                   input_html: {class: 'entry_account_input'}) %>
     <%end %>
 
-    <% if authorized?(:update_theming_on, resource) && !resource.new_record? %>
-      <%= f.input(:theming,
-                  as: :searchable_select,
-                  ajax: {
-                    resource: Pageflow::Entry,
-                    collection_name: :eligible_themings,
-                    params: {
-                      entry_id: resource.id
-                    }
-                  },
-                  include_blank: false) %>
+    <%= render('admin/entries/site_input',
+               entry: resource,
+               form: f) %>
+
+    <%= f.fields_for(:permalink, @entry.permalink || Pageflow::Permalink.new) do |permalink| %>
+      <%= render('admin/entries/permalink_inputs',
+                 entry: resource,
+                 form: permalink) %>
     <% end %>
 
     <% if resource.new_record? %>

data/app/views/admin/entries/_permalink_inputs.html.erb

@@ -0,0 +1,6 @@
+<%= form.input(:permalink,
+               as: :pageflow_permalink,
+               base_url: pretty_site_url(entry.site),
+               directory_collection: collection_for_permalink_directories(entry.site,
+                                                                          form.object),
+               slug_placeholder: entry.default_permalink_slug) %>

data/app/views/admin/entries/_site_input.html.erb

@@ -0,0 +1,15 @@
+<% if authorized?(:update_site_on, entry) %>
+  <%= form.input(:site,
+                 as: :searchable_select,
+                 ajax: {
+                   resource: Pageflow::Entry,
+                   collection_name: :eligible_sites,
+                   params: {
+                     account_id: entry.account_id
+                   }
+                 },
+                 include_blank: false,
+                 wrapper_html: {
+                   style: ('display: none' if site_policy_scope.sites_allowed_for(entry.account).one?)
+                 }) %>
+<% end %>

data/app/views/admin/entries/{entry_type_name_input.html.erb → entry_site_and_type_name_input.html.erb}

@@ -1,4 +1,7 @@
 <%= fields_for(:entry, @entry, builder: ActiveAdmin::FormBuilder) do |form| %>
+  <%= render('admin/entries/site_input',
+             entry: @entry,
+             form: form) %>
   <%= render('pageflow/admin/entries/entry_type_name_input',
              form: form,
              entry_types: Pageflow.config_for(@entry.account).entry_types) %>

data/app/views/admin/entries/permalink_inputs.html.erb

@@ -0,0 +1,7 @@
+<%= fields_for(:entry, @entry, builder: ActiveAdmin::FormBuilder) do |form| %>
+  <%= form.fields_for(:permalink, @entry.permalink || Pageflow::Permalink.new) do |permalink| %>
+    <%= render('admin/entries/permalink_inputs',
+               entry: @entry,
+               form: permalink) %>
+  <% end %>
+<% end %>

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

@@ -4,7 +4,7 @@
 
   <%= f.inputs do %>
       <%= f.semantic_errors :entry_type_name %>
-      <%= render('admin/accounts/theming_defaults_inline_help') %>
+      <%= render('admin/accounts/site_defaults_inline_help') %>
       <%= f.hidden_field :entry_type_name, value: entry_type_name %>
       <%= f.input :default_locale,
                         as: :select,
@@ -12,15 +12,15 @@
                         collection: Pageflow.config.available_public_locales.map{ |locale|
                           [t('pageflow.public._language', locale: locale), locale.to_s]
                         },
-                        hint: t('pageflow.admin.themings.default_locale_hint') %>
+                        hint: t('pageflow.admin.sites.default_locale_hint') %>
       <%= f.input :default_author,
-        hint: t('pageflow.admin.themings.default_author_hint'),
+        hint: t('pageflow.admin.sites.default_author_hint'),
         placeholder: Pageflow.config.default_author_meta_tag %>
       <%= f.input :default_publisher,
-        hint: t('pageflow.admin.themings.default_publisher_hint'),
+        hint: t('pageflow.admin.sites.default_publisher_hint'),
         placeholder: Pageflow.config.default_publisher_meta_tag %>
       <%= f.input :default_keywords,
-        hint: t('pageflow.admin.themings.default_keywords_hint'),
+        hint: t('pageflow.admin.sites.default_keywords_hint'),
         placeholder: Pageflow.config.default_keywords_meta_tag %>
       <%= render('admin/accounts/share_providers_label') %>
       <%= f.semantic_fields_for :share_providers,

data/app/views/admin/sites/_attributes_table.html.arb

@@ -0,0 +1,9 @@
+extensible_attributes_table_for(site,
+                                Pageflow.config_for(site.account)
+                                  .admin_attributes_table_rows.for(:site)) do
+  row :host, class: 'host'
+  row :account, class: 'account' do
+    link_to(site.account.name,
+            admin_account_path(site.account, tab: 'sites'))
+  end
+end

data/app/views/admin/sites/_fields.html.erb

@@ -0,0 +1,17 @@
+<%= f.inputs do %>
+  <%= f.input :cname, hint: t('pageflow.admin.sites.cname_hint') %>
+  <%= f.input :additional_cnames, hint: t('pageflow.admin.sites.additional_cnames_hint') %>
+  <%= f.input :home_url, hint: t('pageflow.admin.sites.home_url_hint') %>
+<% end %>
+
+<%= f.inputs do %>
+  <%= f.input :imprint_link_label %>
+  <%= f.input :imprint_link_url %>
+  <%= f.input :copyright_link_label %>
+  <%= f.input :copyright_link_url %>
+  <%= f.input :privacy_link_url %>
+
+  <% account_config.admin_form_inputs.find_all_for(:site).each do |form_input| %>
+    <%= form_input.build(f) %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<%= admin_form_for [:admin, parent, resource] do |f| %>
+  <%= f.inputs :name %>
+  <%= render 'fields', f: f, account_config: Pageflow.config_for(resource.account) %>
+  <%= f.actions :submit, :cancel %>
+<% end %>

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

@@ -1,8 +1,7 @@
 module Pageflow
   module Admin
     class EntriesTab < ViewComponent
-      def build(theming)
-        account = theming.account
+      def build(account)
         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

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

@@ -1,9 +1,8 @@
 module Pageflow
   module Admin
     class EntryTemplatesTab < ViewComponent
-      def build(theming)
-        account = theming.account
-        table_subjects = account.existing_and_potential_entry_templates
+      def build(site)
+        table_subjects = site.existing_and_potential_entry_templates
 
         table_for(table_subjects, i18n: Pageflow::EntryTemplate) do
           column do |entry_template|
@@ -15,30 +14,30 @@ module Pageflow
           end
           column do |entry_template|
             if entry_template.id
-              edit_link(entry_template, account)
+              edit_link(entry_template, site)
             else
-              new_link(entry_template, account)
+              new_link(entry_template, site)
             end
           end
         end
       end
 
-      def new_link(entry_template, account)
+      def new_link(entry_template, site)
         link_to(
           I18n.t('active_admin.new'),
-          new_admin_account_entry_template_path(
-            account,
+          new_admin_site_entry_template_path(
+            site,
             entry_template,
             entry_type_name: entry_template.entry_type_name
           )
         )
       end
 
-      def edit_link(entry_template, account)
+      def edit_link(entry_template, site)
         link_to(
           I18n.t('active_admin.edit'),
-          edit_admin_account_entry_template_path(
-            account,
+          edit_admin_site_entry_template_path(
+            site,
             entry_template
           )
         )

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

@@ -2,7 +2,7 @@ module Pageflow
   module Admin
     class FeaturesTab < ViewComponent
       def build(resource)
-        feature_target = resource.is_a?(Theming) ? resource.account : resource
+        feature_target = resource.is_a?(Site) ? resource.account : resource
         render('admin/features/form', resource: feature_target)
       end
     end

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

@@ -0,0 +1,32 @@
+module Pageflow
+  module Admin
+    class SitesTab < ViewComponent
+      def build(account)
+        embedded_index_table(account.sites,
+                             blank_slate_text: I18n.t('pageflow.admin.accounts.no_sites')) do
+          table_for_collection class: 'sites', i18n: Pageflow::Site do
+            column :name do |site|
+              link_to(site.display_name,
+                      admin_account_site_path(site.account, site))
+            end
+            column :host do |site|
+              site.host.presence || '-'
+            end
+          end
+        end
+
+        add_button(account)
+      end
+
+      private
+
+      def add_button(account)
+        return unless authorized?(:create, Site)
+
+        text_node(link_to(t('pageflow.admin.sites.add'),
+                          new_admin_account_site_path(account),
+                          class: 'button'))
+      end
+    end
+  end
+end

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

@@ -1,8 +1,7 @@
 module Pageflow
   module Admin
     class UsersTab < ViewComponent
-      def build(theming)
-        account = theming.account
+      def build(account)
         embedded_index_table(account.memberships.on_accounts.includes(:user)
                               .accessible_by(current_ability, :index)
                                             .where('pageflow_memberships.user_id IS NOT NULL'),

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

@@ -12,7 +12,7 @@
   "files": <%= editor_files_json_seed(@entry) %>,
 
   "account": <%= render_json_seed(@entry.account) %>,
-  "theming": <%= render_json_seed(@entry.theming) %>,
+  "site": <%= render_json_seed(@entry.site) %>,
   "widget_types": <%= widget_types_json_seeds(@entry_config) %>,
   "page_types": <%= page_type_json_seeds(@entry_config) %>,
   "themes": <%= theme_json_seeds(@entry_config) %>,

data/app/views/pageflow/editor/file_import/start_import_job.json.jbuilder

@@ -0,0 +1,10 @@
+json.array! @items do |item|
+  json.source_url item[:source_url]
+
+  json.attributes do
+    json.partial!(object: item[:file],
+                  partial: 'pageflow/editor/files/file',
+                  locals: {file_type: item[:file].file_type},
+                  as: :file)
+  end
+end

data/app/views/pageflow/editor/sites/_site.json.jbuilder

@@ -0,0 +1 @@
+json.pretty_url pretty_site_url(site)

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

@@ -6,5 +6,5 @@
   <% end %>
 
   <%= file_thumbnails_css(@entry) %>
-  <%= render 'pageflow/entries/theming' %>
+  <%= render 'pageflow/entries/site' %>
 <% end %>

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

@@ -2,6 +2,7 @@ json.call(file,
           :id,
           :perma_id,
           :basename,
+          :extension,
           :rights,
           :configuration,
           :parent_file_id,

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

@@ -5,7 +5,7 @@
 <%= 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:site_name", content: entry.site.cname_domain %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

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

@@ -5,7 +5,7 @@
 <%= 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:site_name", content: entry.site.cname_domain %>
 <%= tag :meta, property: "og:type", content: "website" %>
 
 <%= tag :meta, name: "twitter:card", content: "summary_large_image" %>

data/config/initializers/admin_resource_tabs.rb

@@ -1,17 +1,34 @@
 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(:entry,
+                                      name: :members,
+                                      component: Pageflow::Admin::MembersTab)
+  config.admin_resource_tabs.register(:entry,
+                                      name: :revisions,
+                                      component: Pageflow::Admin::RevisionsTab)
+
+  config.admin_resource_tabs.register(:user,
+                                      name: :accounts,
+                                      component: Pageflow::Admin::UserAccountsTab)
+  config.admin_resource_tabs.register(:user,
+                                      name: :entries,
+                                      component: Pageflow::Admin::UserEntriesTab)
 
-  config.admin_resource_tabs.register(:user, name: :accounts, component: Pageflow::Admin::UserAccountsTab)
-  config.admin_resource_tabs.register(:user, name: :entries, component: Pageflow::Admin::UserEntriesTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :entries,
+                                      component: Pageflow::Admin::EntriesTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :users,
+                                      component: Pageflow::Admin::UsersTab)
+  config.admin_resource_tabs.register(:account,
+                                      name: :sites,
+                                      component: Pageflow::Admin::SitesTab)
 
-  config.admin_resource_tabs.register(:theming, name: :entries, component: Pageflow::Admin::EntriesTab)
-  config.admin_resource_tabs.register(:theming, name: :users, component: Pageflow::Admin::UsersTab)
-  config.admin_resource_tabs.register(
-    :theming,
-    name: :entry_templates,
-    component: Pageflow::Admin::EntryTemplatesTab
-  )
+  config.admin_resource_tabs.register(:site,
+                                      name: :entries,
+                                      component: Pageflow::Admin::EntriesTab)
+  config.admin_resource_tabs.register(:site,
+                                      name: :entry_templates,
+                                      component: Pageflow::Admin::EntryTemplatesTab)
 end
 
 Pageflow.after_configure do |config|
@@ -27,7 +44,7 @@ Pageflow.after_configure do |config|
                                       component: Pageflow::Admin::FeaturesTab,
                                       **features_tab_permissions)
 
-  config.admin_resource_tabs.register(:theming,
+  config.admin_resource_tabs.register(:account,
                                       name: :features,
                                       component: Pageflow::Admin::FeaturesTab,
                                       **features_tab_permissions)

data/config/initializers/mime_types.rb

@@ -0,0 +1 @@
+Mime::Type.register 'application/manifest+json', :webmanifest

data/config/locales/de.yml

@@ -161,7 +161,7 @@ de:
       pageflow/account:
         created_at: Erstellt am
         default_file_rights: Standard Urheber
-        default_theming: Standard-Theming
+        default_site: Standard-Site
         entries_count: "# Beiträge"
         landing_page_name: Einstiegsseite
         name: Name
@@ -265,11 +265,7 @@ de:
         published_at: Publiziert am
         published_until: Publiziert bis
         updated_at: Geändert am
-      pageflow/text_track_file:
-        kind: Art
-        label: Label
-        srclang: Sprache
-      pageflow/theming:
+      pageflow/site:
         additional_cnames: Zusätzliche CNAMES
         cname: CNAME
         copyright_link_label: Copyright-Link Text
@@ -279,6 +275,10 @@ de:
         imprint_link_url: Impressum-Link URL
         privacy_link_url: Datenschutz-Link URL
         share_providers: Standard Share Links
+      pageflow/text_track_file:
+        kind: Art
+        label: Label
+        srclang: Sprache
       pageflow/video_file:
         dimensions: Maße
         duration: Länge
@@ -406,21 +406,21 @@ de:
       pageflow/revision:
         one: Revision
         other: Revisionen
+      pageflow/site:
+        one: Site
+        other: Sites
       pageflow/text_track_file:
         one: Textspur-Datei
         other: Textspur-Dateien
-      pageflow/theming:
-        one: Theming
-        other: Themings
       pageflow/video_file:
         one: Videodatei
         other: Videodateien
       revision:
         one: Revision
         other: Revisionen
-      theming:
-        one: Theming
-        other: Themings
+      site:
+        one: Site
+        other: Sites
       user:
         one: Nutzer
         other: Nutzer
@@ -499,7 +499,7 @@ de:
     - Fr
     - Sa
     abbr_month_names:
-    - 
+    -
     - Jan
     - Feb
     - Mär
@@ -525,7 +525,7 @@ de:
       long: "%e. %B %Y"
       short: "%e. %b"
     month_names:
-    - 
+    -
     - Januar
     - Februar
     - März
@@ -798,10 +798,9 @@ de:
         cannot_add: Was Sie tun möchten, ist nicht möglich.
         none_addable_tooltip: Kein Konto verfügbar
       accounts:
-        entry_template_hint: Einige Formularfelder sind ab sofort im Beitragsvorlagen-Tab auf der Informations-Seite dieses Kontos zu finden.
         no_entries: Keine Beiträge
         no_members: Keine Benutzer
-        theming_defaults_inline_help: Die folgenden Einstellungen werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
+        site_defaults_inline_help: Die folgenden Einstellungen werden als Standard für neue Beiträge des Kontos verwendet. Änderungen wirken sich nicht auf existierende Beiträge aus.
       entries:
         add_folder: Ordner hinzufügen
         confirm_depublish: Soll der Beitrag wirklich depubliziert werden?
@@ -881,16 +880,19 @@ de:
         features: Features
         members: Mitglieder
         revisions: Revisionen
+        sites: Sites
         users: Benutzer
       revisions:
         published_until_hint: Freilassen, um Beitrag unbegrenzt zu veröffentlichen.
         restored: Revision wiederhergestellt
-      themings:
+      sites:
+        add: Site hinzufügen
         additional_cnames_hint: Kommaseparierte Liste von weiteren CNAMES. Ausschließlich zur Auswahl der Redirect URL genutzt.
         cname_hint: Wird in Share Links verwendet.
         default_author_hint: Voreinstellung 'author' Meta-Feld für Eintrage
         default_keywords_hint: Voreinstellung 'keywords' Meta-Feld für Eintrage
         default_locale_hint: Voreinstellung Sprache für Einträge
+        default_name: "(Standard)"
         default_publisher_hint: Voreinstellung 'publisher' Meta-Feld für Eintrage
         home_url_hint: Wird einer der obigen CNAMES ohne Pfad in der URL verwendet, wird zu dieser URL umgeleitet. Standard Link Ziel des Home Buttons.
         name: "%{account_name}"

data/config/locales/en.yml

@@ -161,7 +161,7 @@ en:
       pageflow/account:
         created_at: Created at
         default_file_rights: Default file credits
-        default_theming: Default theming
+        default_site: Default site
         entries_count: "# Stories"
         landing_page_name: Landing page
         name: Name
@@ -265,11 +265,7 @@ en:
         published_at: Published at
         published_until: Published until
         updated_at: Updated at
-      pageflow/text_track_file:
-        kind: Kind
-        label: Label
-        srclang: Language
-      pageflow/theming:
+      pageflow/site:
         additional_cnames: Additional CNAMES
         cname: CNAME
         copyright_link_label: Copyright link Text
@@ -279,6 +275,10 @@ en:
         imprint_link_url: Legal notice link URL
         privacy_link_url: Privacy link URL
         share_providers: Default Share Links
+      pageflow/text_track_file:
+        kind: Kind
+        label: Label
+        srclang: Language
       pageflow/video_file:
         dimensions: Dimensions
         duration: Duration
@@ -406,21 +406,21 @@ en:
       pageflow/revision:
         one: Version
         other: Versions
+      pageflow/site:
+        one: Site
+        other: Sites
       pageflow/text_track_file:
         one: Text Track File
         other: Text Track Files
-      pageflow/theming:
-        one: Theming
-        other: Themings
       pageflow/video_file:
         one: Video File
         other: Video Files
       revision:
         one: Version
         other: Versions
-      theming:
-        one: Theming
-        other: Themings
+      site:
+        one: Site
+        other: Sites
       user:
         one: User
         other: Users
@@ -499,7 +499,7 @@ en:
     - Fri
     - Sat
     abbr_month_names:
-    - 
+    -
     - Jan
     - Feb
     - Mar
@@ -525,7 +525,7 @@ en:
       long: "%B %d, %Y"
       short: "%b %d"
     month_names:
-    - 
+    -
     - January
     - February
     - March
@@ -792,10 +792,9 @@ en:
         cannot_add: What you want to do is not possible at the moment.
         none_addable_tooltip: No account available
       accounts:
-        entry_template_hint: Some of the form fields can now be found in the story template tab on the info page for this account
         no_entries: No Stories
         no_members: No members
-        theming_defaults_inline_help: The following settings will be used as defaults for new stories in this account. Changes do not affect existing stories.
+        site_defaults_inline_help: The following settings will be used as defaults for new stories in this account. Changes do not affect existing stories.
       entries:
         add_folder: Add folder
         confirm_depublish: Depublish this story?
@@ -875,16 +874,19 @@ en:
         features: Features
         members: Members
         revisions: Versions
+        sites: Sites
         users: User
       revisions:
         published_until_hint: Leave blank to publish indefinitely.
         restored: Version restored
-      themings:
+      sites:
+        add: Add site
         additional_cnames_hint: Comma separated list of additional CNAMES. Used only to select the correct redirect URL.
         cname_hint: Used in public sharing URLs.
         default_author_hint: Default 'author' meta field for stories
         default_keywords_hint: Default 'keywords' meta field for stories
         default_locale_hint: Default language for stories
+        default_name: "(Default)"
         default_publisher_hint: Default 'publisher' meta field for stories
         home_url_hint: Used for requests to the root path with one of the above CNAMES. Default target location for the home button.
         name: "%{account_name}"