pageflow 12.0.4 → 12.1.0

data/app/policies/pageflow/entry_policy.rb

@@ -86,8 +86,12 @@ module Pageflow
       query.has_at_least_role?(:publisher)
     end
 
+    def create_any?
+      AccountPolicy::Scope.new(@user, Account).entry_creatable.any?
+    end
+
     def create?
-      publish? && AccountPolicy::Scope.new(user, Account).entry_creatable.any?
+      query.has_at_least_account_role?(:publisher)
     end
 
     def duplicate?
@@ -120,7 +124,9 @@ module Pageflow
     end
 
     def update_theming_on?
-      publish_on_account_of?
+      user.admin? ||
+        (!permissions_config.only_admins_may_update_theming &&
+         publish_on_account_of?)
     end
 
     def manage_account_of?
@@ -128,7 +134,9 @@ module Pageflow
     end
 
     def update_feature_configuration_on?
-      manage_account_of?
+      user.admin? ||
+        (!permissions_config.only_admins_may_update_features &&
+         manage_account_of?)
     end
 
     def destroy?

data/app/policies/pageflow/membership_policy.rb

@@ -98,8 +98,7 @@ module Pageflow
     end
 
     def destroy_for_account?
-      @user.admin? ||
-        AccountPolicy.new(@user, @membership.entity).destroy_membership_on?
+      AccountPolicy.new(@user, @membership.entity).destroy_membership_on?
     end
   end
 end

data/app/policies/pageflow/user_policy.rb

@@ -29,17 +29,28 @@ module Pageflow
       end
     end
 
+    attr_reader :user
+
     def initialize(user, managed_user)
       @user = user
       @managed_user = managed_user
     end
 
+    def create_any?
+      index?
+    end
+
     def create?
       index?
     end
 
     def index?
-      @user.memberships.on_accounts.where(role: 'manager').any?
+      @user.admin? ||
+        @user.memberships.on_accounts.where(role: 'manager').any?
+    end
+
+    def add_account_to?
+      Pageflow.config.allow_multiaccount_users
     end
 
     def read?
@@ -62,6 +73,14 @@ module Pageflow
       admin?
     end
 
+    def see_admin_status?
+      if permissions_config.only_admins_may_see_admin_boolean
+        admin?
+      else
+        read?
+      end
+    end
+
     def delete_own_user?
       Pageflow.config.authorize_user_deletion.call(@managed_user) == true
     end

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

@@ -12,7 +12,6 @@
 
   <%= f.semantic_fields_for :default_theming do |theming| %>
     <%= f.inputs do %>
-      <%= theming.input :theme_name, include_blank: false, collection: Pageflow.config.themes.names %>
       <%= 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') %>
@@ -31,7 +30,6 @@
     <% end %>
 
     <%= f.inputs do %>
-      <%= theming.input :home_button_enabled_by_default %>
       <%= theming.input :imprint_link_label %>
       <%= theming.input :imprint_link_url %>
       <%= theming.input :copyright_link_label %>
@@ -43,7 +41,9 @@
     <% end %>
 
     <%= f.inputs do %>
-      <%= render('admin/accounts/widgets_inline_help') %>
+      <%= render('admin/accounts/theming_defaults_inline_help') %>
+      <%= theming.input :theme_name, include_blank: false, collection: account_config.themes.names %>
+      <%= theming.input :home_button_enabled_by_default %>
       <%= admin_widgets_fields(theming, account_config) %>
     <% end %>
   <% end %>
@@ -53,6 +53,6 @@
   <% end %>
 
   <script id="theme_options" type="application/json">
-    <%= themes_options_json_seed %>
+    <%= themes_options_json_seed(account_config) %>
   </script>
 <% end %>

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

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

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

@@ -1,22 +1,17 @@
 <%= admin_form_for [:admin, parent, resource] do |f| %>
+  <% entity_type = resource.entity_type || params[:entity_type] %>
   <%= f.inputs do %>
-    <%= f.input :user,
-                collection: membership_users_collection(parent, resource),
-                include_blank: false,
-                input_html: { disabled: !f.object.new_record? || parent_type == :user }%>
-    <% if params[:entity_type].to_sym == :entry %>
-      <%= render partial: 'admin/memberships/entity_entry_input', locals: {f: f} %>
-    <% else %>
-      <%= render partial: 'admin/memberships/entity_account_input', locals: {f: f} %>
-    <% end %>
-    <%= f.hidden_field :entity_type, value: "Pageflow::#{params[:entity_type].capitalize}" %>
+    <%= membership_user_select(f, parent) %>
+    <%= membership_entity_select(f, parent, entity_type) %>
+    <%= f.hidden_field :entity_type, value: entity_type %>
   <% end %>
   <%= f.inputs do %>
-    <%= render partial: 'admin/memberships/role_hint' %>
+    <%= render partial: 'admin/memberships/role_hint',
+               locals: {entity_type: entity_type
+                                      .gsub('Pageflow::', '').downcase} %>
     <%= f.input :role,
-                collection: membership_roles_collection("Pageflow::#{params[:entity_type]
-                                                          .capitalize}"),
-                                                          include_blank: false %>
+                collection: membership_roles_collection(entity_type),
+                include_blank: false %>
   <% end %>
   <%= f.actions do %>
     <%= f.action(:submit) %>

data/app/views/admin/memberships/_role_hint.html.arb

@@ -1,2 +1,2 @@
-li(para(t("pageflow.admin.memberships.on_#{params[:entity_type]}.role.hint_html")),
+li(para(t("pageflow.admin.memberships.on_#{entity_type}.role.hint_html")),
    class: 'side_hint')

data/app/views/admin/users/invitation.html.erb

@@ -11,11 +11,24 @@
         </ul>
       <% end %>
 
-      <%= f.inputs "Details" do %>
-        <% @invitation_form.available_accounts.each do |account| %>
-          <%= quota_state_description(:users, account) %>
-        <% end %>
+      <%= f.inputs do %>
+        <%= m.input :entity_id,
+                    as: :searchable_select,
+                    ajax: {
+                      resource: Pageflow::Account,
+                      collection_name: :member_addable
+                    },
+                    include_blank: false,
+                    label: Pageflow::Membership.human_attribute_name(:account) %>
+
+        <div id="quota_state_container">
+          <% if @invitation_form.initial_account %>
+            <%= users_quota_state(@invitation_form.initial_account) %>
+          <% end %>
+        </div>
+      <% end %>
 
+      <%= f.inputs "Details", id: 'invitation_form_details' do %>
         <%= u.input :email, hint: I18n.t('pageflow.admin.users.email_invitation_hint') %>
         <%= u.input :first_name %>
         <%= u.input :last_name %>
@@ -23,11 +36,7 @@
                     as: :select,
                     include_blank: false,
                     collection: available_locales_collection %>
-        <%= m.input :entity_id,
-                    as: :select,
-                    collection: @invitation_form.available_accounts,
-                    include_blank: false,
-                    label: Pageflow::Membership.human_attribute_name(:account) %>
+
         <%= m.input :role,
                     collection: membership_roles_collection('Pageflow::Account'),
                     include_blank: false,

data/app/views/admin/users/me.html.erb

@@ -1,4 +1,4 @@
-<%= admin_form_for current_user, :url => me_admin_users_path, :html => {:class => 'profile'} do |form| %>
+<%= admin_form_for @user, url: me_admin_users_path, html: {class: 'profile'} do |form| %>
   <%= form.inputs :first_name, :last_name %>
 
   <%= form.inputs do %>
@@ -9,7 +9,7 @@
   <% end %>
 
   <%= form.inputs do %>
-    <%= form.input :current_password, :hint => t('pageflow.admin.users.me.change_password_hint') %>
+    <%= form.input :current_password, hint: t('pageflow.admin.users.me.change_password_hint') %>
     <%= form.input :password %>
     <%= form.input :password_confirmation %>
   <% end %>

data/app/views/admin/users/quota_state.html.erb

@@ -0,0 +1 @@
+<%= users_quota_state(@account) %>

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

@@ -0,0 +1,81 @@
+module Pageflow
+  module Admin
+    class AddMembershipButton < ViewComponent
+      builder_method :add_membership_button
+
+      def build(user, parent, entity_type)
+        if parent.is_a?(User)
+          button_label = I18n.t("pageflow.admin.#{entity_type}.add")
+          path = new_admin_user_membership_path(
+            parent, entity_type: to_class_name(entity_type)
+          )
+          data_tooltip = I18n.t("pageflow.admin.#{entity_type}."\
+                                'none_addable_tooltip')
+          rel = "add_#{entity_type}_membership"
+        elsif parent.is_a?(Entry)
+          path = new_admin_entry_membership_path(
+            parent, entity_type: to_class_name(entity_type)
+          )
+        else
+          path = new_admin_account_membership_path(
+            parent, entity_type: to_class_name(entity_type)
+          )
+        end
+
+        unless parent.is_a?(User)
+          button_label = I18n.t('pageflow.admin.users.add')
+          data_tooltip = I18n.t('pageflow.admin.user.none_addable_tooltip')
+          rel = 'add_member'
+        end
+
+        if membership_possible_for(user, parent, entity_type)
+          para do
+            link_to(button_label, path, class: 'button', data: {rel: rel})
+          end
+        else
+          para(content_tag('a',
+                           button_label,
+                           class: 'button disabled',
+                           data: {rel: rel}),
+               'data-tooltip' => data_tooltip)
+        end
+      end
+
+      private
+
+      def membership_possible_for(user, parent, entity_type)
+        if entity_type == 'entry'
+          entry_membership_possible_for_creator_and(user, parent)
+        else
+          account_membership_possible_for_creator_and(user, parent)
+        end
+      end
+
+      def entry_membership_possible_for_creator_and(user, parent)
+        case parent
+        when User
+          PotentialMemberships.creatable_by(user).entries_for_user(parent).any?
+        when Entry
+          PotentialMemberships.creatable_by(user).users_for_entry(parent).any?
+        end
+      end
+
+      def account_membership_possible_for_creator_and(user, parent)
+        case parent
+        when User
+          PotentialMemberships.creatable_by(user).accounts_for_user(parent).any?
+        when Account
+          PotentialMemberships.creatable_by(user).users_for_account(parent).any?
+        end
+      end
+
+      def to_class_name(entity_type)
+        if [:entry, 'entry'].include?(entity_type)
+          'Pageflow::Entry'
+        else
+          'Pageflow::Account'
+        end
+      end
+    end
+  end
+end

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

@@ -22,9 +22,11 @@ module Pageflow
             column do |membership|
               if authorized?(:update, membership)
                 link_to(I18n.t('pageflow.admin.users.edit_role'),
-                        edit_admin_entry_membership_path(entry,
-                                                         membership,
-                                                         entity_type: :entry),
+                        edit_admin_entry_membership_path(
+                          entry,
+                          membership,
+                          entity_type: 'Pageflow::Entry'
+                        ),
                         data: {
                           rel: "edit_entry_membership_#{membership.role}"
                         })
@@ -45,7 +47,7 @@ module Pageflow
         end
         para text_node I18n.t('pageflow.admin.resource_tabs.account_editor_hint')
         if authorized?(:add_member_to, entry)
-          add_membership_button_if_needed(current_user, entry, 'entry')
+          add_membership_button(current_user, entry, 'entry')
         end
       end
     end

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

@@ -39,16 +39,28 @@ module Pageflow
             end
             column do |revision|
               text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))
-              text_node(link_to(t('pageflow.admin.entries.restore'), restore_admin_revision_path(revision), :method => :post, :class => 'restore', :data => {:confirm => I18n.t('pageflow.admin.entries.confirm_restore')}))
+              if authorized?(:restore, entry)
+                text_node(link_to(t('pageflow.admin.entries.restore'),
+                                  restore_admin_revision_path(revision),
+                                  method: :post,
+                                  class: 'restore',
+                                  data: {
+                                    confirm: I18n.t(
+                                      'pageflow.admin.entries.confirm_restore'
+                                    )
+                                  }))
+              end
             end
           end
         end
 
         para(I18n.t('pageflow.admin.entries.published_revision_legend'), :class => 'legend published')
 
-        text_node(button_to(t('pageflow.admin.entries.snapshot'),
-                            snapshot_admin_entry_path(entry),
-                            :method => :post))
+        if authorized?(:snapshot, entry)
+          text_node(button_to(t('pageflow.admin.entries.snapshot'),
+                              snapshot_admin_entry_path(entry),
+                              method: :post))
+        end
       end
     end
   end

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

@@ -21,7 +21,11 @@ module Pageflow
             column do |membership|
               if authorized?(:update, membership)
                 link_to(t('pageflow.admin.users.edit_role'),
-                        edit_admin_user_membership_path(user, membership, entity_type: :account),
+                        edit_admin_user_membership_path(
+                          user,
+                          membership,
+                          entity_type: 'Pageflow::Account'
+                        ),
                         data: {
                           rel: "edit_account_role_#{membership.role}"
                         })
@@ -39,7 +43,9 @@ module Pageflow
               end
             end
           end
-          add_membership_button_if_needed(user, user, 'account')
+          if authorized?(:add_account_to, :users)
+            add_membership_button(current_user, user, 'account')
+          end
         end
       end
     end

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

@@ -25,7 +25,11 @@ module Pageflow
             column do |membership|
               if authorized?(:update, membership)
                 link_to(t('pageflow.admin.users.edit_role'),
-                        edit_admin_user_membership_path(user, membership, entity_type: :entry),
+                        edit_admin_user_membership_path(
+                          user,
+                          membership,
+                          entity_type: 'Pageflow::Entry'
+                        ),
                         data: {
                           rel: "edit_entry_role_#{membership.role}"
                         })
@@ -43,7 +47,7 @@ module Pageflow
               end
             end
           end
-          add_membership_button_if_needed(user, user, 'entry')
+          add_membership_button(current_user, user, 'entry')
         end
       end
     end

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

@@ -18,9 +18,11 @@ module Pageflow
             column do |membership|
               if authorized?(:update, membership)
                 link_to(I18n.t('pageflow.admin.users.edit_role'),
-                        edit_admin_account_membership_path(membership.entity,
-                                                           membership,
-                                                           entity_type: :account),
+                        edit_admin_account_membership_path(
+                          account,
+                          membership,
+                          entity_type: 'Pageflow::Account'
+                        ),
                         data: {
                           rel: "edit_account_role_#{membership.role}"
                         })
@@ -29,7 +31,7 @@ module Pageflow
             column do |membership|
               if authorized?(:destroy, membership)
                 link_to(I18n.t('pageflow.admin.users.delete'),
-                        admin_account_membership_path(membership.entity, membership),
+                        admin_account_membership_path(account, membership),
                         method: :delete,
                         data: {
                           confirm: I18n.t('active_admin.delete_confirmation'),
@@ -38,7 +40,9 @@ module Pageflow
               end
             end
           end
-          add_membership_button_if_needed(current_user, account, 'account')
+          if authorized?(:add_member_to, account)
+            add_membership_button(current_user, account, 'account')
+          end
         end
       end
     end

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

@@ -7,7 +7,8 @@
     window.PAGEFLOW_EDITOR = <%= @editor_scope ? 'true' : 'false' %>;
   </script>
 
-  <%= javascript_include_tag "pageflow/application", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag 'pageflow/vendor', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'pageflow/application', 'data-turbolinks-track' => true %>
 
   <%= csrf_meta_tags %>
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, minimum-scale=1, maximum-scale=1" />

data/app/views/pageflow/admin/users/_quota_exhausted.html.erb

@@ -0,0 +1 @@
+<p>Replace by creating <code>app/views/pageflow/admin/users/_quota_exhausted.html.erb</code></p>

data/app/views/pageflow/admin/users/_quota_state.html.erb

@@ -0,0 +1,7 @@
+<%= content_tag(:div, class: 'quota_state', data: data_attributes) do %>
+  <% if quota.exhausted? %>
+    <%= render 'pageflow/admin/users/quota_exhausted', account: account %>
+  <% else %>
+    <%= quota_state_description(:users, account) %>
+  <% end %>
+<% end %>

data/app/views/pageflow/config/_editor_seeds.json.jbuilder

@@ -17,3 +17,5 @@ end
 json.default_author_meta_tag Pageflow.config.default_author_meta_tag
 json.default_publisher_meta_tag Pageflow.config.default_publisher_meta_tag
 json.default_keywords_meta_tag Pageflow.config.default_keywords_meta_tag
+json.themes(Pageflow.config.themes, :name, :preview_image_path)
+json.edit_lock_polling_interval_in_seconds Pageflow.config.edit_lock_polling_interval

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

@@ -12,6 +12,7 @@ json.configuration do
         :title, :locale, :summary, :credits, :author, :publisher, :keywords,
         :manual_start, :emphasize_chapter_beginning, :emphasize_new_pages,
         :share_url, :share_image_id, :share_image_x, :share_image_y)
+  json.theme_name entry.theme.name
   json.home_url entry.home_button.url_value
   json.home_button_enabled entry.home_button.enabled_value
   json.overview_button_enabled entry.overview_button.enabled_value

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

@@ -6,6 +6,7 @@
   "storylines": <%= @entry.storylines.to_json.html_safe %>,
   "chapters": <%= @entry.chapters.to_json.html_safe %>,
   "pages": <%= @entry.pages.to_json.html_safe %>,
+  "widgets": <%= widgets_json_seeds(@entry) %>,
 
   "files": <%= files_json_seeds(@entry) %>,
 
@@ -13,6 +14,7 @@
   "theming": <%= render_json_seed(@entry.theming) %>,
   "widget_types": <%= widget_types_json_seeds(@entry_config) %>,
   "page_types": <%= page_type_json_seeds(@entry_config) %>,
+  "themes": <%= theme_json_seeds(@entry_config) %>,
 
   "common": <%= common_entry_seed(@entry).to_json.html_safe %>
-}
+}

data/app/views/pageflow/editor/image_files/_image_file.json.jbuilder

@@ -1,3 +1,3 @@
-json.(image_file, :width, :height, :panorama_url)
+json.(image_file, :width, :height, :panorama_url, :panorama_mask_url)
 
 json.dimensions(file_dimensions(image_file))

data/app/views/pageflow/editor/themings/_theming.json.jbuilder

@@ -1,8 +1 @@
 json.pretty_url pretty_theming_url(theming)
-json.home_button theming.theme.has_home_button?
-json.overview_button theming.theme.has_overview_button?
-json.page_change_by_scrolling theming.theme.page_change_by_scrolling?
-json.hide_text_on_swipe theming.theme.hide_text_on_swipe?
-json.emphasized_pages theming.theme.supports_emphasized_pages?
-json.scroll_indicator_modes theming.theme.supports_scroll_indicator_modes?
-json.change_to_parent_page_at_storyline_boundary theming.theme.change_to_parent_page_at_storyline_boundary?

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

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

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

@@ -1,18 +1,18 @@
 <%= content_tag(:div,
-                :id => 'outer_wrapper',
-                :data => {:theme => entry.theming.theme.name},
-                :class => entry_css_class(entry)) do %>
+                id: 'outer_wrapper',
+                data: {theme: entry.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="<%= t('pageflow.public.logo') %>">
+  <img src="<%= image_path("pageflow/themes/#{entry.theme.directory_name}/logo_print.png") %>" class="print_image" alt="<%= t('pageflow.public.logo') %>">
   <span class="print_only page_url"><%= request.original_url %></span>
 
   <%= content_tag :div, :id => 'content', :class => 'entry', :data => {:role => 'slideshow'} do %>
     <%= render entry.pages, entry: entry %>
-    <%= render 'pageflow/entries/indicators', :theme => entry.theming.theme %>
+    <%= render 'pageflow/entries/indicators', :theme => entry.theme %>
   <% end %>
 
   <%= render 'pageflow/entries/header', :entry => entry %>

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

@@ -42,7 +42,7 @@
 
 <% I18n.with_locale(@entry.locale) do %>
   <%= page_type_templates(@entry) %>
-  <%= render('pageflow/editor/entries/indicators_seed', theme: @entry.theming.theme) %>
+  <%= render('pageflow/editor/entries/indicators_seed', theme: @entry.theme) %>
 <% end %>
 
 <%= render('pageflow/editor/entries/help_entries_seed', config: @entry_config) %>

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

@@ -9,7 +9,7 @@
     <%= 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' %>
+    <%= tag :link, :rel => 'icon', :href => image_path("pageflow/themes/#{@entry.theme.directory_name}/favicon.ico"), :type => 'image/ico' %>
     <%= meta_tags_for_entry(@entry) %>
   <% end %>
 <% end %>

data/app/views/pageflow/entry_json_seed/_entry.json.jbuilder

@@ -5,6 +5,7 @@ json.theming entry_theming_seed(entry)
 json.storylines entry_storylines_seed(entry)
 json.chapters entry_chapters_seed(entry)
 json.pages entry_pages_seed(entry)
+json.widgets entry_widgets_seed(entry)
 
 json.file_ids entry_file_ids_seed(entry)
 

data/app/views/pageflow/themes/_theme.json.jbuilder

@@ -0,0 +1,13 @@
+json.(theme, :name)
+
+json.preview_image_url(image_url(theme.preview_image_path))
+json.preview_thumbnail_url(image_url(theme.preview_thumbnail_path))
+json.stylesheet_path(stylesheet_path(theme.stylesheet_path))
+
+json.home_button theme.has_home_button?
+json.overview_button theme.has_overview_button?
+json.page_change_by_scrolling theme.page_change_by_scrolling?
+json.hide_text_on_swipe theme.hide_text_on_swipe?
+json.emphasized_pages theme.supports_emphasized_pages?
+json.scroll_indicator_modes theme.supports_scroll_indicator_modes?
+json.change_to_parent_page_at_storyline_boundary theme.change_to_parent_page_at_storyline_boundary?

data/config/initializers/admin_resource_tabs.rb

@@ -2,15 +2,28 @@ 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: :features,
-                                      component: Pageflow::Admin::FeaturesTab,
-                                      required_account_role: :manager)
-
   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(: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: :features, component: Pageflow::Admin::FeaturesTab)
+end
+
+Pageflow.after_configure do |config|
+  features_tab_permissions =
+    if config.permissions.only_admins_may_update_features
+      {admin_only: true}
+    else
+      {required_account_role: :manager}
+    end
+
+  config.admin_resource_tabs.register(:entry,
+                                      name: :features,
+                                      component: Pageflow::Admin::FeaturesTab,
+                                      **features_tab_permissions)
+
+  config.admin_resource_tabs.register(:theming,
+                                      name: :features,
+                                      component: Pageflow::Admin::FeaturesTab,
+                                      **features_tab_permissions)
 end

data/config/initializers/features.rb

@@ -5,4 +5,5 @@ Pageflow.configure do |config|
   config.features.register('storylines') do |feature_config|
     feature_config.help_entries.register('pageflow.help_entries.storylines', priority: 7)
   end
+  config.features.register('selectable_themes')
 end