trusty-cms 7.0.12 → 7.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6268c67cd5f36d603ddb9ce023b0fea8f265520abe38a8493314df631c928a8
-  data.tar.gz: 31a91b7d8043ea76ffeb81dfc16bf78bd637227ac6236a355eade3a7f120b4d7
+  metadata.gz: 618e9b238cacf51c8c18350b0c9be7cb0d4888bed01644f224d829dbadb2070f
+  data.tar.gz: 4f31af9203e1131fb13c53758bd6fa8e10b9b747eba61539a5df17b7908ecca7
 SHA512:
-  metadata.gz: 866984c6c322c001d7602acf0773850d44846a5155efc27fb2ff525d380a2c2deee855dd295b7ee73be72a1e05dbfd4056b10d1ecd618fe86d6361a96cdb7ed0
-  data.tar.gz: 228b95c7d50664d8bd202aad0f0a97d74b39bf1594fa8ad745cf58d245f47ba44a86ca1faf4f37ac74511d266cfa4aeeb4adfcd814ffe0cc5e1f1384de7a700c
+  metadata.gz: 983189f270c8143c29187a46cc16f4d33d66ec2403fbd9c96f4c397e3b34f675460acbc08b2e5262b6434115678004b05e5e00fcca5785433675b175a44665c4
+  data.tar.gz: 1346ccda7ce5fac525ac34837e5a28d7c3cc6bee479ff20c5d71b20edbd3bc1ff5f7ced3ab9ea3f86fc630bb37a8900a87f48a6b2fde057d8ffa7dfd55dfb14a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.12)
+    trusty-cms (7.0.14)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

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

@@ -23,6 +23,10 @@ table {
       width: 100%;
     }
 
+    &.path {
+      min-width: 8em;
+    }
+
     &.status {
       min-width: 8em;
     }

data/app/helpers/admin/node_helper.rb

@@ -11,9 +11,9 @@ module Admin::NodeHelper
     index
   end
 
-  def render_search_node(page)
+  def render_search_node(page, index = 0, parent_index = nil, simple = false)
     @current_node = prepare_page(page)
-    @rendered_html = render_partial(page, index: 0, parent_index: nil, simple: false)
+    @rendered_html = render_search_partial(page, index:, parent_index:, simple:, path: format_path(page.path))
   end
 
   def prepare_page(page)
@@ -25,6 +25,17 @@ module Admin::NodeHelper
     page
   end
 
+  def format_path(path)
+    return '' if path.nil? || path.empty?
+
+    parts = path.split('/').reject(&:empty?)
+    return 'Root' if parts.size == 1
+    return '/' if parts.size == 2
+
+    formatted_path = parts[1..-2].join('/')
+    formatted_path.empty? ? '/' : "/#{formatted_path}"
+  end
+
   def homepage
     @homepage ||= Page.find_by_parent_id(nil)
   end
@@ -106,4 +117,17 @@ module Admin::NodeHelper
              branch: page.children.count.positive?,
            }
   end
+
+  def render_search_partial(page, index:, parent_index:, simple:, path:)
+    render partial: 'admin/pages/search_result_node',
+           locals: {
+             level: index,
+             index: index,
+             parent_index: parent_index,
+             page: page,
+             simple: simple,
+             branch: false,
+             path: path,
+           }
+  end
 end

data/app/models/standard_tags.rb

@@ -103,7 +103,7 @@ module StandardTags
     <pre><code><r:children:each [offset="number"] [limit="number"]
      [by="published_at|updated_at|created_at|slug|title|keywords|description"]
      [order="asc|desc"]
-     [status="draft|reviewed|published|hidden|all"]
+     [status="draft|reviewed|scheduled|published|all"]
      [paginated="true"]
      [per_page="number"]
      >

data/app/models/status.rb

@@ -32,6 +32,5 @@ class Status
     Status.new(id: 50,  name: 'Reviewed'),
     Status.new(id: 90,  name: 'Scheduled'),
     Status.new(id: 100, name: 'Published'),
-    Status.new(id: 101, name: 'Hidden'),
   ]
 end

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

@@ -0,0 +1,25 @@
+%tr.page
+  - render_region :node, :locals => { :page => page, :level => level, :simple => simple, :path => path } do |node|
+    - node.title_column do
+      %td.name
+        %span.w1
+          - if simple
+            = node_title
+          - else
+            %i.far.fa-file
+            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
+            = page_type
+            = spinner
+    - node.path_column do
+      %td.path
+        = path
+    - node.status_column do
+      - unless simple
+        %td.status
+          %span.status{ :class => "#{page.status.name.downcase}_status", :title => "#{timestamp(page.published_at) if page.published_at}" }= t(page.status.name.downcase)
+    - node.actions_column do
+      - unless simple
+        %td.actions
+          = page.add_child_option
+          - if current_user.editor? || current_user.admin?
+            = page.remove_option

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

@@ -9,6 +9,8 @@
         - render_region :sitemap_head do |sitemap_head|
           - sitemap_head.title_column_header do
             %th.name= t('page')
+          - sitemap_head.path_column_header do
+            %th.path= t('path')
           - sitemap_head.status_column_header do
             %th.status= t('status')
           - sitemap_head.actions_column_header do

data/config/locales/en.yml

@@ -234,6 +234,7 @@ en:
   parent_page: 'Parent Page'
   password: 'Password'
   password_confirmation: 'Confirm New Password'
+  path: 'Path'
   personal: 'Personal'
   personal_preferences: 'Personal Preferences'
   please_login: 'Please Login'

data/config/locales/en_available_tags.yml

@@ -141,7 +141,7 @@ en:
       <pre><code><r:children:each [offset=\"number\"] [limit=\"number\"]
        [by=\"published_at|updated_at|created_at|slug|title|keywords|description\"]
        [order=\"asc|desc\"]
-       [status=\"draft|reviewed|published|hidden|all\"]
+       [status=\"draft|reviewed|scheduled|published|all\"]
        [paginated=\"true\"]
        [per_page=\"number\"]
        >

data/lib/generators/language_extension/templates/available_tags.yml

@@ -107,7 +107,7 @@
 
       <pre><code><r&#58;children&#58;each [offset="number"] [limit="number"]
        [by="published_at|updated_at|created_at|slug|title|keywords|description"]
-       [order="asc|desc"] [status="draft|reviewed|published|hidden|all"]>
+       [order="asc|desc"] [status="draft|reviewed|scheduled|published|all"]>
        ...
       </r&#58;children&#58;each>
       </code></pre>

data/lib/trusty_cms/admin_ui.rb

@@ -178,8 +178,8 @@ module TrustyCms
           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}
+          search.sitemap_head.concat %w{title_column_header path_column_header status_column_header actions_column_header}
+          search.node.concat %w{title_column path_column status_column actions_column}
         end
         page.remove = page.children = page.index
         page.new = page._part = page.edit

data/lib/trusty_cms/version.rb

@@ -1,4 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.12'.freeze
+  VERSION = '7.0.14'.freeze
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.12
+  version: 7.0.14
 platform: ruby
 authors:
 - TrustyCms CMS dev team
@@ -834,6 +834,7 @@ files:
 - 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/_search_result_node.html.haml
 - app/views/admin/pages/children.html.haml
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml