pageflow 15.7.1 → 16.0.0

data/admins/pageflow/sites.rb

@@ -0,0 +1,50 @@
+module Pageflow
+  ActiveAdmin.register Site, as: 'Site' do
+    belongs_to :account
+
+    menu false
+    actions :index, :show, :new, :edit, :create, :update
+
+    show do
+      render 'attributes_table', site: site
+
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(site),
+                i18n: 'pageflow.admin.resource_tabs',
+                authorize: :see_site_admin_tab,
+                build_args: [site])
+    end
+
+    form partial: 'form'
+
+    permit_params do
+      [
+        :name,
+        :cname,
+        :additional_cnames,
+        :imprint_link_url,
+        :imprint_link_label,
+        :copyright_link_url,
+        :copyright_link_label,
+        :privacy_link_url,
+        :home_url
+      ] + permitted_admin_form_input_params
+    end
+
+    controller do
+      helper Pageflow::Admin::FormHelper
+
+      def index
+        redirect_to admin_account_path(parent, tab: 'sites')
+      end
+
+      private
+
+      def permitted_admin_form_input_params
+        Pageflow
+          .config_for(parent)
+          .admin_form_inputs
+          .permitted_attributes_for(:site)
+      end
+    end
+  end
+end

data/admins/pageflow/user.rb

@@ -101,6 +101,10 @@ module Pageflow
 
     form(partial: 'form')
 
+    after_update do |user|
+      Pageflow.config.hooks.invoke(:user_changed, user)
+    end
+
     collection_action :invitation, method: [:get, :post] do
       @page_title = I18n.t('pageflow.admin.users.invite_user')
       @invitation_form = InvitationForm.new(invitation_form_params.fetch(:invitation_form, {}),
@@ -109,6 +113,7 @@ module Pageflow
 
       if request.post?
         if @invitation_form.save
+          Pageflow.config.hooks.invoke(:user_changed, @invitation_form.target_user)
           redirect_to(admin_user_path(@invitation_form.target_user))
         else
           render status: 422
@@ -130,6 +135,8 @@ module Pageflow
 
       if request.patch?
         if @user.update_with_password(user_profile_params)
+          Pageflow.config.hooks.invoke(:user_changed, @user)
+
           bypass_sign_in @user, scope: :user
           redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
         end

data/app/assets/javascripts/pageflow/admin/entries.js

@@ -88,18 +88,67 @@ jQuery(function($) {
 
   $('.admin_entries form.pageflow_entry').each(function() {
     var accountSelect = $('#entry_account_id', this);
+    var siteSelect = $('#entry_site_id', this);
+    var titleInput = $('#entry_title', this);
 
-    function updateEntryTypeInput() {
+    function updateSiteAndEntryTypeInput() {
       var selectedAccountId = accountSelect.val();
 
-      $.get('/admin/entries/entry_type_name_input' +
+      $.get('/admin/entries/entry_site_and_type_name_input' +
             '?account_id=' + selectedAccountId +
             '&entry_type_name=' + $('[name="entry[type_name]"]').val())
        .done(function(response) {
-         $('#entry_type_name_input').replaceWith(response);
+         $('#entry_type_name_input').replaceWith($(response).filter('#entry_type_name_input'));
+         $('#entry_site_input').replaceWith($(response).filter('#entry_site_input'));
+
+         // Set up searchable select
+         $(document).trigger('page:load');
+
+         siteSelect = $('#entry_site_id');
+         siteSelect.on('change', updatePermalinkInput);
+
+         updatePermalinkInput();
        });
     }
 
-    accountSelect.on('change', updateEntryTypeInput);
+    function updatePermalinkInput() {
+      fetchPermalinkInput(function(response) {
+        $('#entry_permalink_attributes_permalink_input').replaceWith(response);
+      });
+    }
+
+    function updateSlugPlaceholder() {
+      fetchPermalinkInput(function(response) {
+        $('#entry_permalink_attributes_permalink_input input[placeholder]')
+          .attr('placeholder',
+                $(response).find('input[placeholder]').attr('placeholder'));
+      });
+    }
+
+    function fetchPermalinkInput(callback) {
+      $.get('/admin/entries/permalink_inputs' +
+            '?entry[account_id]=' + accountSelect.val() +
+                   (siteSelect.val() ? '&entry[site_id]=' + siteSelect.val() : '') +
+            '&entry[title]=' + encodeURIComponent(titleInput.val()))
+       .done(callback);
+    }
+
+    accountSelect.on('change', updateSiteAndEntryTypeInput);
+
+    accountSelect.on('change', updatePermalinkInput);
+    siteSelect.on('change', updatePermalinkInput);
+
+    titleInput.on('change keyup', debounce(updateSlugPlaceholder, 300));
   });
 });
+
+function debounce(func, timeout){
+  var timer;
+
+  return function() {
+    var args = arguments;
+
+    clearTimeout(timer);
+    timer = setTimeout(function() { func.apply(this, args); }, timeout);
+  };
+}

data/app/assets/stylesheets/pageflow/admin/permalink_input.scss

@@ -0,0 +1,65 @@
+$pageflow-permalink-input-padding: 8px 10px 7px !default;
+$pageflow-permalink-input-line-height: 1.15 !default;
+$pageflow-permalink-input-border-color: #c9d0d6 !default;
+$pageflow-permalink-input-border-radius: 3px !default;
+$pageflow-permalink-input-focus-border-color: #99a2aa !default;
+$pageflow-permalink-input-focus-box-shadow: 0 0 4px #99a2aa !default;
+$pageflow-permalink-input-background-color: #fff !default;
+$pageflow-permalink-input-min-width: 30% !default;
+
+$pageflow-permalink-input-base-url-background-color: #f4f4f4 !default;
+$pageflow-permalink-input-base-url-color: null !default;
+
+$pageflow-permalink-input-directory-padding-left: 7px !default;
+$pageflow-permalink-input-directory-padding-right: 7px !default;
+$pageflow-permalink-input-directory-margin-h: 3px !default;
+$pageflow-permalink-input-directory-background-position: null !default;
+
+.pageflow_permalink.input {
+  .permalink {
+    display: inline-flex;
+    border: 1px solid $pageflow-permalink-input-border-color;
+    border-radius: $pageflow-permalink-input-border-radius;
+    background-color: $pageflow-permalink-input-background-color;
+    box-sizing: border-box;
+    min-width: $pageflow-permalink-input-min-width;
+    overflow: hidden;
+    width: 100%;
+
+    &:focus-within {
+      border-color: $pageflow-permalink-input-focus-border-color;
+      box-shadow: $pageflow-permalink-input-focus-box-shadow;
+    }
+  }
+
+  .permalink_base_url {
+    padding: $pageflow-permalink-input-padding;
+    line-height: $pageflow-permalink-input-line-height;
+    background-color: $pageflow-permalink-input-base-url-background-color;
+    color: $pageflow-permalink-input-base-url-color;
+  }
+
+  select,
+  input {
+    width: auto;
+    border: 0;
+
+    &:focus {
+      border: 0;
+      box-shadow: none;
+    }
+  }
+
+  select {
+    background-color: $pageflow-permalink-input-background-color;
+    background-position: $pageflow-permalink-input-directory-background-position;
+    padding-left: $pageflow-permalink-input-directory-padding-left;
+    padding-right: $pageflow-permalink-input-directory-padding-right;
+    margin: 0 $pageflow-permalink-input-directory-margin-h;
+  }
+
+  input {
+    padding-left: 0;
+    flex: 1;
+  }
+}

data/app/assets/stylesheets/pageflow/admin.scss

@@ -31,6 +31,7 @@ $pageflow-hint-color: #666 !default;
 @import "pageflow/admin/hint";
 @import "pageflow/admin/icon_button";
 @import "pageflow/admin/icon_link";
+@import "pageflow/admin/permalink_input";
 @import "pageflow/admin/publication_state_indicator";
 @import "pageflow/admin/quotas";
 @import "pageflow/admin/status_tags";

data/app/assets/stylesheets/pageflow/editor/base.scss

@@ -40,7 +40,7 @@
     padding: 0;
   }
 
-  h2 {
+  .sidebar-header {
     font-size: inherit;
     font-weight: 500;
     margin: 15px 0 5px 0;
@@ -159,12 +159,8 @@ main.ui-layout-pane {
   border-bottom-right-radius: rounded(lg);
 }
 
-main > div {
+#entry_preview {
   height: 100%;
-
-  > .container {
-    height: 100%;
-  }
 }
 
 #help_entries_seed {

data/app/assets/stylesheets/pageflow/editor/dialogs.scss

@@ -56,6 +56,8 @@
   }
 
   .dialog-sub_header {
+    font-size: inherit;
+    font-weight: 500;
     border-bottom: solid 1px var(--ui-on-surface-color-lighter);
     margin: 0;
     padding: space(1) 0;

data/app/assets/stylesheets/pageflow/editor/drop_down_button.scss

@@ -9,6 +9,14 @@
   > button.has_icon_only {
     @include icon-only-button;
   }
+
+  &.full_width {
+    width: 100%;
+
+    > button {
+      width: 100%;
+    }
+  }
 }
 
 .drop_down_button_menu {
@@ -24,6 +32,7 @@
   border-radius: rounded(sm);
   box-shadow: var(--ui-box-shadow);
   background-color: var(--ui-surface-color);
+  box-sizing: border-box;
 
   &.is_visible {
     @include transition(visibility 0ms, opacity 100ms);

data/app/assets/stylesheets/pageflow/editor/info_box.scss

@@ -5,8 +5,9 @@
 
   .shortcuts {
     dt {
-      display: inline-block;
-      margin-top: 0.5em;
+      display: block;
+      margin: space(3) 0 space(2.5);
+      position: relative;
     }
 
     dd {
@@ -17,8 +18,17 @@
       border: solid 1px currentColor;
       border-radius: 4px;
       padding: 3px 5px;
-      display: inline-block;
       font-size: 11px;
     }
   }
+
+  .inline_help {
+    padding-top: 36px;
+  }
+
+  // Make sure the label is on top when an inline help text is displayed
+  dt:hover .shortcut {
+    z-index: 4;
+    position: relative;
+  }
 }

data/app/assets/stylesheets/pageflow/mixins/buttons.scss

@@ -59,6 +59,7 @@
         color: var(--ui-on-error-color);
       }
     } @else {
+      &.hover:not(:disabled):not(.disabled),
       &:hover:not(:disabled):not(.disabled) {
         border: 1px solid var(--ui-primary-color);
       }

data/app/assets/stylesheets/pageflow/page.scss

@@ -39,7 +39,6 @@
   }
 
   .scroller > div {
-    pointer-events: none;
     width: 75%;
 
     @include mobile {
@@ -70,7 +69,6 @@
   }
 
   .scroller > div {
-    pointer-events: none;
     width: 100%;
 
     @include mobile {

data/app/assets/stylesheets/pageflow/themes/default/page.scss

@@ -9,7 +9,7 @@ $page-typography: () !default;
 $page-content-text-typography: () !default;
 
 /// Typography for content text in phone layout.
-$page-content-text-phone-typography: () !default
+$page-content-text-phone-typography: () !default;
 
 /// Base font size for page content
 $page-content-font-size: 1em !default;

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -32,7 +32,8 @@ textarea,
 [type="tel"],
 [type="time"],
 [type="week"],
-[multiple] {
+[multiple],
+button[aria-haspopup] {
   font-size: 13px;
   display: block;
   width: 100%;
@@ -43,6 +44,7 @@ textarea,
   border-radius: rounded();
   color: var(--ui-on-surface-color);
 
+  &[aria-expanded=true],
   &:focus {
     border-color: var(--ui-on-surface-color-light);
     box-shadow: 0 0 0 2px var(--ui-selection-color-light);
@@ -222,6 +224,7 @@ textarea.short {
 }
 
 .input-disabled {
+  button,
   select,
   input,
   textarea,

data/app/controllers/pageflow/editor/file_import_controller.rb

@@ -4,7 +4,6 @@ module Pageflow
     # appropriate file importer
     class FileImportController < Pageflow::ApplicationController
       before_action :authenticate_user!
-      respond_to :json
 
       def search
         result = file_importer.search file_importer_credentials, search_query
@@ -12,30 +11,35 @@ module Pageflow
       end
 
       def files_meta_data
-        result = file_importer.files_meta_data file_importer_credentials, selected_files
+        result = file_importer.files_meta_data(file_importer_credentials,
+                                               params.require(:files))
         render json: {data: result}
       end
 
       def start_import_job
         entry = DraftEntry.find(entry_name)
-        result = []
-        selected_files.each do |key, file|
-          file = key if file.nil?
-          file = file.permit(:file_name,
-                             :rights,
-                             :content_type,
-                             :file_size,
-                             :url,
-                             configuration: :alt)
-          entry_file, import_model = create_import_model entry, file
-          FileImportJob.perform_later import_model.id, file_importer_credentials
-          result.push file_response(entry_file, file)
+        authorize!(:edit, entry.to_model)
+
+        @items = files_params.map do |file_params|
+          file = entry.create_file!(file_type, file_params.except(:url))
+          file_import = create_file_import(file, file_params)
+
+          FileImportJob.perform_later(file_import.id, file_importer_credentials)
+
+          {file: file, source_url: file_params[:url]}
         end
-        render json: {data: result}
       end
 
       private
 
+      def create_file_import(file, file_params)
+        FileImport.create!(entry: file.entry,
+                           file_id: file.id,
+                           file_type: file_type.model.name,
+                           file_importer: file_importer.name,
+                           download_options: file_params.to_json)
+      end
+
       def authentication_provider
         file_importer.authentication_provider
       end
@@ -48,35 +52,21 @@ module Pageflow
         params.require(:entry_id)
       end
 
-      def selected_files
-        params.require(:files)
-      end
-
-      def collection_name
-        params.require(:collection)
-      end
-
-      def create_import_model(entry, file)
-        entry_file, file_type = create_entry_file entry, file
-        download_options = file.as_json
-        import_model = FileImport.create!(entry: entry_file.entry,
-                                          file_id: entry_file.id,
-                                          file_type: file_type.model.name,
-                                          file_importer: file_importer.name,
-                                          download_options: download_options.to_json)
-        [entry_file, import_model]
-      end
-
-      def create_entry_file(entry, file)
-        file_type = Pageflow.config.file_types.find_by_collection_name!(collection_name)
-        [entry.create_file!(file_type, file.except(:url)), file_type]
+      def files_params
+        params
+          .permit(files: [:file_name,
+                          :rights,
+                          :content_type,
+                          :file_size,
+                          :url,
+                          configuration: :alt])
+          .require(:files)
       end
 
-      def file_response(entry_file, file)
-        entry_file = entry_file.as_json
-        entry_file['type'] = params[:collection]
-        entry_file['source_url'] = file[:url]
-        entry_file
+      def file_type
+        @file_type ||= Pageflow.config.file_types.find_by_collection_name!(
+          params.require(:collection)
+        )
       end
 
       def file_importer

data/app/controllers/pageflow/entries_controller.rb

@@ -6,15 +6,15 @@ module Pageflow
     include EntryPasswordProtection
 
     def index
-      theming = Theming.for_request(request).with_home_url.first!
+      site = Site.for_request(request).with_home_url.first!
 
-      redirect_to(theming.home_url)
+      redirect_to(site.home_url)
     end
 
     def show
       respond_to do |format|
         format.html do
-          entry = PublishedEntry.find(params[:id], entry_request_scope)
+          entry = find_by_permalink || find_by_slug
 
           return if redirect_according_to_entry_redirect(entry)
           return if redirect_according_to_public_https_mode
@@ -25,6 +25,18 @@ module Pageflow
       end
     end
 
+    def manifest
+      respond_to do |format|
+        format.webmanifest do
+          entry = PublishedEntry.find(params[:id], entry_request_scope)
+
+          return head :not_found unless entry.entry_type.web_app_manifest
+
+          render json: entry.entry_type.web_app_manifest.call(entry)
+        end
+      end
+    end
+
     def stylesheet
       respond_to do |format|
         format.css do
@@ -42,6 +54,18 @@ module Pageflow
 
     protected
 
+    def find_by_permalink
+      PublishedEntry.find_by_permalink(
+        directory: params[:directory],
+        slug: params[:id],
+        scope: entry_request_scope
+      )
+    end
+
+    def find_by_slug
+      PublishedEntry.find(params[:id], entry_request_scope)
+    end
+
     def entry_request_scope
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end

data/app/helpers/pageflow/admin/permalinks_helper.rb

@@ -0,0 +1,15 @@
+module Pageflow
+  module Admin
+    # @api private
+    module PermalinksHelper
+      def collection_for_permalink_directories(site, permalink)
+        options_from_collection_for_select(
+          site.permalink_directories,
+          'id',
+          'path',
+          permalink.directory_id
+        )
+      end
+    end
+  end
+end

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -10,7 +10,7 @@ module Pageflow
       config = Pageflow.config_for(entry)
 
       json.locale entry.locale
-      json.theming entry.theming.as_json(only: [:privacy_link_url])
+      json.site entry.site.as_json(only: [:privacy_link_url])
       json.enabled_feature_names entry.enabled_feature_names
       json.page_types PageTypesSeed.new(config).as_json
 

data/app/helpers/pageflow/embed_code_helper.rb

@@ -24,7 +24,7 @@ module Pageflow
 
       def entry_embed_url_options(entry)
         options = Pageflow.config.entry_embed_url_options
-        options = options.call(entry.theming) if options.respond_to?(:call)
+        options = options.call(entry.site) if options.respond_to?(:call)
         options
       end
     end

data/app/helpers/pageflow/entries_helper.rb

@@ -1,7 +1,7 @@
 module Pageflow
   module EntriesHelper
     def pretty_entry_title(entry)
-      [entry.title, entry.theming.cname_domain.presence].compact.join(' - ')
+      [entry.title, entry.site.cname_domain.presence].compact.join(' - ')
     end
 
     def pretty_entry_url(entry, options = {})
@@ -20,23 +20,31 @@ module Pageflow
       private
 
       def with_custom_canonical_url_prefix(entry)
-        return if entry.theming.canonical_entry_url_prefix.blank?
+        return if entry.site.canonical_entry_url_prefix.blank?
         entry = ensure_entry_with_revision(entry)
 
         [
-          entry.theming.canonical_entry_url_prefix.gsub(':locale', entry.locale),
+          entry.site.canonical_entry_url_prefix.gsub(':locale', entry.locale),
           entry.to_param,
-          entry.theming.trailing_slash_in_canonical_urls ? '/' : ''
+          entry.site.trailing_slash_in_canonical_urls ? '/' : ''
         ].join
       end
 
       def default(routes, entry, options)
         params =
           options
-          .reverse_merge(trailing_slash: entry.theming.trailing_slash_in_canonical_urls)
-          .reverse_merge(Pageflow.config.theming_url_options(entry.theming) || {})
-
-        routes.short_entry_url(entry.to_model, params)
+          .reverse_merge(trailing_slash: entry.site.trailing_slash_in_canonical_urls)
+          .reverse_merge(Pageflow.config.site_url_options(entry.site) || {})
+
+        if entry.permalink.present?
+          routes.permalink_url(
+            entry.permalink.directory&.path || '',
+            entry.permalink.slug,
+            params
+          )
+        else
+          routes.short_entry_url(entry.to_model, params)
+        end
       end
 
       def ensure_entry_with_revision(entry)
@@ -49,8 +57,8 @@ module Pageflow
     end
 
     def entry_privacy_link_url(entry)
-      return unless entry.theming.privacy_link_url.present?
-      "#{entry.theming.privacy_link_url}?lang=#{entry.locale}"
+      return unless entry.site.privacy_link_url.present?
+      "#{entry.site.privacy_link_url}?lang=#{entry.locale}"
     end
 
     def entry_file_rights(entry)
@@ -72,23 +80,23 @@ module Pageflow
     def entry_global_links(entry)
       links = []
 
-      if entry.theming.imprint_link_label.present? && entry.theming.imprint_link_url.present?
-        links << link_to(raw(entry.theming.imprint_link_label),
-                         entry.theming.imprint_link_url,
+      if entry.site.imprint_link_label.present? && entry.site.imprint_link_url.present?
+        links << link_to(raw(entry.site.imprint_link_label),
+                         entry.site.imprint_link_url,
                          target: '_blank',
                          tabindex: 2,
                          class: 'legal')
       end
 
-      if entry.theming.copyright_link_label.present? && entry.theming.copyright_link_url.present?
-        links << link_to(raw(entry.theming.copyright_link_label),
-                         entry.theming.copyright_link_url,
+      if entry.site.copyright_link_label.present? && entry.site.copyright_link_url.present?
+        links << link_to(raw(entry.site.copyright_link_label),
+                         entry.site.copyright_link_url,
                          target: '_blank',
                          tabindex: 2,
                          class: 'copy')
       end
 
-      if entry.theming.privacy_link_url.present?
+      if entry.site.privacy_link_url.present?
         links << link_to(I18n.t('pageflow.public.privacy_notice'),
                          entry_privacy_link_url(entry),
                          target: '_blank',

data/app/helpers/pageflow/sites_helper.rb

@@ -0,0 +1,11 @@
+module Pageflow
+  module SitesHelper
+    DEFAULT_PUBLIC_ENTRY_OPTIONS = lambda do |site|
+      site.cname.present? ? {host: site.cname} : nil
+    end
+
+    def pretty_site_url(site)
+      pageflow.public_root_url(Pageflow.config.site_url_options(site))
+    end
+  end
+end