trusty-cms 7.0.8 → 7.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170bd1825c9f7ff25e1bcf51d8ac424e32612d8415a7d640fc441195e9bddb4c
-  data.tar.gz: 2c367de40351f12fd2d71e2f4fb9ff842a0379fe07f313c8e040a43979bc5e8e
+  metadata.gz: c63368c558d26f890749954b24ddf5d6802059d20c0785d9bc593e44816ec0cb
+  data.tar.gz: 80ffc339a2e63778cad2e73f9a8fc6cf0601afdf6208766c4614fe220c8e1746
 SHA512:
-  metadata.gz: 1247c66e283d00de5c30181d53d356271c165401a40de6c8ffbf6d4cbc9dcb31d96e980daea0ac150b64abccd4101dc027b7484f8dfa965db74c36628e0089a6
-  data.tar.gz: eb1e804f9a828378cc4cf4553c0761753c08b133011409cbc514f79dae86ef377a69c74ef20125f3d472f997d68dc772f291126cd8413b803f775b76e249d5f6
+  metadata.gz: 241df4d13c4d4d1edd897492450bfc611c703d738ee9064bab79772ee2fba4aedbbb74829672f29d8026c164357097b4f461a5d1474c263a092f17173f9e262c
+  data.tar.gz: a7224d0f909fd5edd57f96755e036c8fb82e90956d564387252ee7d078324a08813828664d556a539c91efba772922ee2f25819da941c33cffbc9e8b97e5655b

data/Gemfile

@@ -7,9 +7,6 @@ source 'https://rubygems.org'
 # requires trusty and therefore pulls in every
 # dependency mentioned in trusty.gemspec.
 
-gem 'paper_trail', '~> 16.0.0'
-gem 'paper_trail-association_tracking', '~> 2.2.1'
-gem 'psych', '5.2.2'
 gem 'trustygems', '~> 0.2.0'
 
 gemspec
@@ -22,8 +19,11 @@ group :development, :test do
   gem 'file_validators'
   gem 'launchy', '~> 3.0.1'
   gem 'mysql2'
+  gem 'paper_trail', '~> 16.0.0'
+  gem 'paper_trail-association_tracking', '~> 2.2.1'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
+  gem 'psych', '5.2.2'
   gem 'rails-observers'
   gem 'ransack'
   gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.8)
+    trusty-cms (7.0.9)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -23,12 +23,13 @@ PATH
       mysql2
       paper_trail (~> 16.0.0)
       paper_trail-association_tracking (~> 2.2.1)
+      psych (= 5.2.2)
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails (~> 7.0.0)
       rake (< 14.0)
-      ransack
+      ransack (~> 4.2.1)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
       sass-rails

data/app/assets/javascripts/admin/dropdown.js

@@ -1,26 +1,47 @@
 (function(Dropdown, $) {
   Dropdown.setup = function(link) {
-    var menuToWrap = Dropdown.findMenu(link);
-    if ($(menuToWrap).parent("div").length == 0) {
-      menuToWrap.wrap("<div class='dropdown_wrapper' style='position: absolute; display: none'></div>");
+    var menu = Dropdown.findMenu(link);
 
-      $(link).on('click', function (event) {
-        event.preventDefault();
-        $(this).toggleClass('selected');
-        Dropdown.findMenu(this).closest('.dropdown_wrapper').slideToggle();
-      })
-    }
-  }
+    // Attach click handler to toggle dropdown
+    $(link).off('click').on('click', function(event) {
+      event.preventDefault();
+      event.stopPropagation();
+      var $link = $(this);
+      var $menuWrapper = $link.siblings("div.dropdown_wrapper");
+
+      if ($menuWrapper.is(':visible')) {
+        // If already visible, hide it
+        $menuWrapper.css('z-index', '').slideUp();
+        $link.removeClass('selected');
+      } else {
+        // Close other dropdowns
+        $('.dropdown_wrapper').css('z-index', '').slideUp();
+        $('a.dropdown').removeClass('selected');
+
+        // Show the current dropdown with priority z-index
+        $menuWrapper.css('z-index', '1000').slideDown();
+        $link.addClass('selected');
+      }
+    });
+  };
 
   Dropdown.findMenu = function(link) {
     var match = $(link).attr('href').match(/#(.+)$/)[1];
     return $('#' + match);
-  }
+  };
+
+  // Close dropdown when clicking anywhere else
+  $(document).on('click', function(event) {
+    if (!$(event.target).closest('.dropdown_wrapper, a.dropdown').length) {
+      $('.dropdown_wrapper').css('z-index', '').slideUp();
+      $('a.dropdown').removeClass('selected');
+    }
+  });
 
 }(window.Dropdown = window.Dropdown || {}, jQuery));
 
 $(function () {
-  $('a.dropdown').each(function(){
+  $('a.dropdown').each(function() {
     Dropdown.setup(this);
   });
 });

data/app/assets/stylesheets/admin/modules/_buttons.scss

@@ -12,7 +12,9 @@
 
 .button {
   @include button;
+  display: inline-block;
   font-size: 1em;
+  margin: 0 0.25em 0 0.25em;
   text-decoration: none;
 }
 

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -103,3 +103,11 @@ textarea {
     display: none;
   }
 }
+
+.search-form {
+  margin-left: 0.5em;
+}
+
+#search-input {
+  max-width: 25em;
+}

data/app/controllers/admin/layouts_controller.rb

@@ -1,7 +1,7 @@
 class Admin::LayoutsController < Admin::ResourceController
   paginate_models
   before_action :authorize_role
-  only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
+  only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy, :search,
                        when: %i[designer admin],
                        denied_url: { controller: 'admin/pages', action: 'index' },
                        denied_message: 'You must have at least editor privileges to perform this action.'

data/app/controllers/admin/pages_controller.rb

@@ -3,6 +3,7 @@ class Admin::PagesController < Admin::ResourceController
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
+  include Admin::PagesHelper
 
   class PreviewStop < ActiveRecord::Rollback
     def message
@@ -23,10 +24,19 @@ class Admin::PagesController < Admin::ResourceController
   end
 
   def index
-    @homepage = Page.find_by_parent_id(nil)
+    set_site_and_homepage
+    @q = initialize_search
     response_for :plural
   end
 
+  def search
+    @site_id = params[:site_id] || Page.current_site.id
+    @q = initialize_search
+
+    @pages = fetch_search_results if search_title_present?
+    render
+  end
+
   def new
     assets = Asset.order('created_at DESC')
     @term = assets.ransack(params[:search] || '')
@@ -67,6 +77,25 @@ class Admin::PagesController < Admin::ResourceController
     @page = Page.find(params[:id])
   end
 
+  def set_site_and_homepage
+    @site ||= Page.current_site
+    @homepage = @site&.homepage || Page.homepage
+    @site_id = @site&.id
+  end
+
+  def initialize_search
+    Page.ransack(params[:search] || '')
+  end
+
+  def fetch_search_results
+    @title = params.dig(:search, :title)
+    Page.ransack(title_cont: @title, site_id_eq: @site_id).result
+  end
+
+  def search_title_present?
+    params.dig(:search, :title).present?
+  end
+
   def validation_error(e)
     flash[:error] = e.message
     render :new
@@ -85,13 +114,13 @@ class Admin::PagesController < Admin::ResourceController
     versions
       .sort_by(&:created_at).reverse
       .map do |version|
-        {
-          index: version&.index,
-          update_date: version&.created_at&.strftime('%B %d, %Y'),
-          update_time: version&.created_at&.strftime('%I:%M %p'),
-          updated_by: User.unscoped.find_by(id: version&.whodunnit)&.name || 'Unknown User',
-        }
-      end
+      {
+        index: version&.index,
+        update_date: version&.created_at&.strftime('%B %d, %Y'),
+        update_time: version&.created_at&.strftime('%I:%M %p'),
+        updated_by: User.unscoped.find_by(id: version&.whodunnit)&.name || 'Unknown User',
+      }
+    end
   end
 
   def restore_page_version(page, index)

data/app/helpers/admin/node_helper.rb

@@ -7,13 +7,15 @@ module Admin::NodeHelper
 
   def render_node(page, index, parent_index = nil, simple = false)
     @current_node = prepare_page(page)
-
-    @rendered_html += (render partial: 'admin/pages/node',
-                              locals: { level: index, index: index, parent_index: parent_index,
-                                        page: page, simple: simple, branch: (page.children.count.positive?) })
+    @rendered_html += render_partial(page, index:, parent_index:, simple:)
     index
   end
 
+  def render_search_node(page)
+    @current_node = prepare_page(page)
+    @rendered_html = render_partial(page, index: 0, parent_index: nil, simple: false)
+  end
+
   def prepare_page(page)
     page.extend MenuRenderer
     page.view = self
@@ -90,4 +92,18 @@ module Admin::NodeHelper
           alt: '', title: '',
           style: 'display: none;')
   end
+
+  private
+
+  def render_partial(page, index:, parent_index:, simple:)
+    render partial: 'admin/pages/node',
+           locals: {
+             level: index,
+             index: index,
+             parent_index: parent_index,
+             page: page,
+             simple: simple,
+             branch: page.children.count.positive?,
+           }
+  end
 end

data/app/helpers/admin/pages_helper.rb

@@ -17,4 +17,10 @@ module Admin::PagesHelper
   def clean_page_description(page)
     page.description.to_s.strip.gsub(/\t/, '').gsub(/\s+/, ' ')
   end
+
+  def parent_page_options(current_site, page)
+    parent_pages = Page.parent_pages(current_site.homepage_id)
+    selected_page_id = page.id.presence_in(parent_pages.pluck(:id)) || page.parent_id.presence_in(parent_pages.pluck(:id))
+    options_for_select(parent_pages.map { |p| [p.title, p.id] }, selected_page_id)
+  end
 end

data/app/models/menu_renderer.rb

@@ -62,7 +62,9 @@ module MenuRenderer
   end
 
   def menu_list
-    view.content_tag :ul, menu_items.join.html_safe, class: 'menu', id: "allowed_children_#{id}"
+    view.content_tag :div, class: 'dropdown_wrapper', style: 'position: absolute; display: none' do
+      view.content_tag :ul, menu_items.join.html_safe, class: 'menu', id: "allowed_children_#{id}"
+    end
   end
 
   def remove_link

data/app/models/page.rb

@@ -155,6 +155,14 @@ class Page < ActiveRecord::Base
     end
   end
 
+  def self.ransackable_attributes(auth_object = nil)
+    ['site_id', 'title']
+  end
+
+  def self.parent_pages(homepage_id)
+    where(parent_id: homepage_id).or(where(id: homepage_id))
+  end
+
   private :set_response_headers
 
   def set_content_type(response)

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,4 +1,4 @@
-- if current_user.scoped_site? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+- if current_user.scoped_site? && defined?(Site) && defined?(controller) && controller.sited_model? && Site.several?
   .site_chooser
     %ul.nav
       %li

data/app/views/admin/pages/_fields.html.haml

@@ -1,7 +1,6 @@
 = fields.hidden_field :lock_version
 = fields.hidden_field :parent_id
 = fields.hidden_field :class_name
-
 = render_region :form_top, :locals => {:f => fields}
 
 - render_region :form, :locals => {:f => fields} do |form|
@@ -43,6 +42,10 @@
       .page-type
         = fields.label :class_name, t('page_type')
         = fields.select :class_name, [[t('select.normal'), '']] + Page.descendants.map { |p| [p.display_name, p.name] }.sort_by { |p| p.first }
+    - layout.edit_parent do
+      .parent-page
+        = fields.label :parent_id, t('parent_page')
+        = fields.select :parent_id, parent_page_options(current_site, @page)
     - layout.edit_status do
       - if current_user.admin? || current_user.editor?
         .status
@@ -56,6 +59,7 @@
             class: 'datetime',
             type: 'datetime-local',
             value: (@page.published_at? ? @page.published_at.strftime('%Y-%m-%dT%H:%M') : nil)
+
     = render_region :layout_row, :locals => {:f => fields}
 
 .error.hidden

data/app/views/admin/pages/_search_form.html.haml

@@ -0,0 +1,8 @@
+= search_form_for @q, url: search_admin_pages_path, html: { method: :get, class: 'search-form' } do |f|
+  = hidden_field_tag :site_id, @site_id
+  .page-search
+    %i.fas.fa-search
+    = f.search_field :title, value: title, placeholder: 'Search by Page Title', id: 'search-input'
+    %input.button{ type: 'submit', value: 'Search' }
+    - if show_view_all_button
+      = link_to t("view_all_pages"), admin_pages_path, class: 'button'

data/app/views/admin/pages/index.html.haml

@@ -2,7 +2,8 @@
 
 .outset
   = render_region :top
-  %table.index.tablesaw#pages{:summary=>t('page_hierarchy')}
+  = render 'search_form', title: nil, show_view_all_button: false
+  %table.index.tablesaw#pages{ :summary => t('page_hierarchy') }
     %thead
       %tr
         - render_region :sitemap_head do |sitemap_head|
@@ -17,13 +18,13 @@
         = render_nodes(@homepage, 0).html_safe
       - else
         %tr.sortable
-          %td.empty{:colspan => admin.page.index.node.length}= t('no_pages')
+          %td.empty{ :colspan => admin.page.index.node.length }= t('no_pages')
   = render_region :bottom
 
 - unless @homepage
   #actions
     %ul
       %li
-        = link_to new_admin_page_path, :class => 'action_button' do
+        = link_to admin_pages_path, :class => 'action_button' do
           %i.fas.fa-plus-circle
           = t("new_homepage")

data/app/views/admin/pages/search.html.haml

@@ -0,0 +1,24 @@
+- @page_title = t('pages') + ' - ' + default_page_title
+
+.outset
+  = render_region :top
+  = render 'search_form', title: @title, show_view_all_button: true
+  %table.index.tablesaw#pages{ :summary => t('page_hierarchy') }
+    %thead
+      %tr
+        - render_region :sitemap_head do |sitemap_head|
+          - sitemap_head.title_column_header do
+            %th.name= t('page')
+          - sitemap_head.status_column_header do
+            %th.status= t('status')
+          - sitemap_head.actions_column_header do
+            %th.actions= t('modify')
+    %tbody
+      - if @pages.present?
+        - @pages.each do |page|
+          = render_search_node(page).html_safe
+      - else
+        %tr.sortable
+          %td.empty{ :colspan => admin.page.index.node.length }= t('no_pages_found')
+
+= render_region :bottom

data/config/locales/en.yml

@@ -216,6 +216,7 @@ en:
   'no': 'No'
   no_layouts: 'No Layouts'
   no_pages: 'No Pages'
+  no_pages_found: 'No Pages Found'
   normal_page: 'Normal Page'
   notes: 'Notes'
   optional: 'Optional'
@@ -230,6 +231,7 @@ en:
     removed_many: "The pages were successfully removed from the site."
     removed_one: "The page was successfully removed from the site."
     saved: "Your page has been saved below."
+  parent_page: 'Parent Page'
   password: 'Password'
   password_confirmation: 'Confirm New Password'
   personal: 'Personal'
@@ -326,6 +328,7 @@ en:
   users_controller:
     cannot_delete_self: 'You cannot delete yourself.'
   version: 'Version'
+  view_all_pages: 'View All Pages'
   view_site: 'View Site'
   warning: 'Warning'
   website: 'Website'

data/config/routes.rb

@@ -14,6 +14,7 @@ TrustyCms::Application.routes.draw do
       resources :children, controller: 'pages'
       get 'remove', on: :member
       put 'restore/:version_index', on: :member, to: 'pages#restore', as: :restore_version
+      get 'search', on: :collection, to: 'pages#search', as: :search
     end
     resources :layouts do
       get 'remove', on: :member

data/lib/trusty_cms/admin_ui.rb

@@ -170,13 +170,17 @@ module TrustyCms
         page.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form edit_popups}
           edit.form.concat %w{edit_title edit_extended_metadata edit_page_parts}
-          edit.layout.concat %w{edit_layout edit_type edit_status edit_published_at}
+          edit.layout.concat %w{edit_layout edit_type edit_parent edit_status edit_published_at}
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         page.index = RegionSet.new do |index|
           index.sitemap_head.concat %w{title_column_header status_column_header actions_column_header}
           index.node.concat %w{title_column status_column actions_column}
         end
+        page.search = RegionSet.new do |search|
+          search.sitemap_head.concat %w{title_column_header status_column_header actions_column_header}
+          search.node.concat %w{title_column status_column actions_column}
+        end
         page.remove = page.children = page.index
         page.new = page._part = page.edit
       end

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '7.0.8'.freeze
+  VERSION = '7.0.10'.freeze
 end
 

data/trusty_cms.gemspec

@@ -45,12 +45,13 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'mysql2'
   s.add_dependency 'paper_trail', '~> 16.0.0'
   s.add_dependency 'paper_trail-association_tracking', '~> 2.2.1'
+  s.add_dependency 'psych', '5.2.2'
   s.add_dependency 'rack', '>= 2.0.1', '< 3.2.0'
   s.add_dependency 'rack-cache', '~> 1.7'
   s.add_dependency 'radius', '~> 0.7'
   s.add_dependency 'rails', '~> 7.0.0'
   s.add_dependency 'rake', '< 14.0'
-  s.add_dependency 'ransack'
+  s.add_dependency 'ransack', '~> 4.2.1'
   s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
   s.add_dependency 'RedCloth', '4.3.3'
   s.add_dependency 'roadie-rails'

data/vendor/extensions/multi-site-extension/lib/multi_site/pages_controller_extensions.rb

@@ -5,7 +5,6 @@ module MultiSite::PagesControllerExtensions
       alias_method :discover_current_site, :discover_current_site_with_root
 
       alias_method :index_without_site, :index
-      alias_method :index, :index_with_site
 
       alias_method :continue_url_without_site, :continue_url
       alias_method :continue_url, :continue_url_with_site
@@ -37,13 +36,6 @@ module MultiSite::PagesControllerExtensions
     end
   end
 
-  def index_with_site
-    @site ||= Page.current_site
-    @homepage ||= @site.homepage if @site
-    @homepage ||= Page.homepage
-    response_for :plural
-  end
-
   def remove_with_back
     session[:came_from] = request.env["HTTP_REFERER"]
     remove_without_back

data/vendor/extensions/multi-site-extension/lib/multi_site/site_chooser_helper.rb

@@ -1,7 +1,7 @@
 module MultiSite::SiteChooserHelper
 
   def sites_chooser_thing
-    return "" unless current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+    return "" unless current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && Site.several?
     options = Site.all.map { |site| "<li>" + link_to(site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg' : '') + "</li>" }.join("")
     chooser = %{<div id="site_chooser">}
     # chooser << link_to("sites", admin_sites_url, {:id => 'show_site_list', :class => 'expandable'})

data/vendor/extensions/multi-site-extension/multi_site_extension.rb

@@ -24,6 +24,7 @@ class MultiSiteExtension < TrustyCms::Extension
     admin.layouts.index.add(:before_nav, "admin/layouts/site_chooser")
     admin.pages.index.add(:before_nav, "admin/layouts/site_chooser")
     admin.snippets.index.add(:before_nav, "admin/layouts/site_chooser")
+    admin.pages.search.add(:before_nav, "admin/layouts/site_chooser")
     Layout.send :is_site_scoped
     Snippet.send :is_site_scoped
     User.send :is_site_scoped, :shareable => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.8
+  version: 7.0.10
 platform: ruby
 authors:
 - TrustyCms CMS dev team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -320,6 +320,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -400,16 +414,16 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -819,11 +833,13 @@ files:
 - app/views/admin/pages/_node.html.haml
 - app/views/admin/pages/_popups.html.haml
 - app/views/admin/pages/_previous_versions.haml
+- app/views/admin/pages/_search_form.html.haml
 - app/views/admin/pages/children.html.haml
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml
 - app/views/admin/pages/new.html.haml
 - app/views/admin/pages/remove.html.haml
+- app/views/admin/pages/search.html.haml
 - app/views/admin/preferences/edit.html.haml
 - app/views/admin/references/_tag_reference.haml
 - app/views/admin/references/filters.haml
@@ -1193,7 +1209,7 @@ homepage: https://github.com/pgharts/trusty-cms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - TrustyCms -- Content Management You Can Trust
@@ -1242,7 +1258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files: