trusty-cms 7.0.22 → 7.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d89a9b9e2dcf23e551b41e9e59acebc8f1d7326bb856bc5273be76749eae4c1
-  data.tar.gz: af9ab2fcfab265ffa26c21508744d1216116b0d66b40c96128d702d6cff8ecc2
+  metadata.gz: 513881146859a4dab77456b9db5c763511c56ef9aed99a9bbc3ad45674076b28
+  data.tar.gz: cb2331a2f2adc22be478f0fd6786faf3d126f56c36f93291ae0a052e4ddaa203
 SHA512:
-  metadata.gz: 7875257d4fee723579c5a3505ef55cdf321ef58bc2223ce6d55c207704d93d88a10af8598abf94520a83167dfdb5443d0fd5e999c4222698e8aefbc996c6ea39
-  data.tar.gz: 3a9184e0283f7dec02b4a5dc54cb63423ca5d41d38384cc0e89b630c77a75e86bec33a3358d568905c77baad4120d4252f27c2dc9c0644a24e7bbc450a9c01a8
+  metadata.gz: 2782c6e5eb865a8c878a4e16ce5b05c5f3e0f072095b8ebbd7ca33647041ccac24b90eedd12f652fd24d515190b93903d877e7475a3b2782d4086e0182625be5
+  data.tar.gz: 70798e27b9404a6d96559d7bfcbb3731670c9d8b2a80f92aa8b03c10b0c4a28c2fd8ca83b12ba44b67512abef82a51471bd61adf135570865980d62e3cd7c3d6

data/Gemfile.lock

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

data/app/assets/javascripts/admin.js

@@ -28,7 +28,6 @@
 //= require 'admin/page-edit'
 //= require 'admin/pagefield'
 //= require 'admin/popup'
-//= require 'admin/preview'
 //= require 'admin/tabcontrol'
 //= require 'admin/utilities'
 //= require 'admin/tags'

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

@@ -3,7 +3,6 @@
   margin-bottom: 1em;
 
   .drawer_contents {
-    //display: none;
     table.fieldset {
       margin: 0;
       padding: 0;
@@ -32,7 +31,7 @@
       td {
         &.field {
           padding-left: 0px;
-          padding-right: 10px;
+          padding-right: 0px;
           text-align: right;
           width: auto;
 
@@ -55,6 +54,15 @@
         }
       }
     }
+
+    .url-textbox {
+      border: 0.5px solid #919191;
+      font-size: 110%;
+      margin: 0.5em;
+      padding: 0.25em;
+      text-align: left;
+      width: 99.5%;
+    }
   }
 }
 

data/app/controllers/admin/pages_controller.rb

@@ -2,6 +2,7 @@ class Admin::PagesController < Admin::ResourceController
   before_action :initialize_meta_rows_and_buttons, only: %i[new edit create update]
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
+  before_action :generate_view_page_url, only: [:edit]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
   include Admin::NodeHelper
   include Admin::PagesHelper
@@ -62,12 +63,6 @@ class Admin::PagesController < Admin::ResourceController
     redirect_to edit_admin_page_path(@page)
   end
 
-  def preview
-    render_preview
-  rescue PreviewStop => e
-    render text: e.message unless @performed_render
-  end
-
   def save_table_position
     new_position = params[:new_position]
     Page.save_order(new_position)
@@ -80,6 +75,10 @@ class Admin::PagesController < Admin::ResourceController
     @page = Page.find(params[:id])
   end
 
+  def generate_view_page_url
+    @view_page_url = generate_page_url(request.url, @page)
+  end
+
   def set_site_and_homepage
     @site ||= Page.current_site
     @homepage = @site&.homepage || Page.homepage
@@ -158,25 +157,6 @@ class Admin::PagesController < Admin::ResourceController
     end
   end
 
-  def render_preview
-    params.permit!
-    Page.transaction do
-      page_class = Page.descendants.include?(model_class) ? model_class : Page
-      if request.referer =~ %r{/admin/pages/(\d+)/edit}
-        page = Page.find($1).becomes(page_class)
-        layout_id = page.layout_id
-        page.update(params[:page])
-        page.published_at ||= Time.now
-      else
-        page = page_class.new(params[:page])
-        page.published_at = page.updated_at = page.created_at = Time.now
-        page.parent = Page.find($1) if request.referer =~ %r{/admin/pages/(\d+)/children/new}
-      end
-      page.pagination_parameters = pagination_parameters
-      process_with_exception(page)
-    end
-  end
-
   def process_with_exception(page)
     page.process(request, response)
     @performed_render = true

data/app/controllers/admin/resource_controller.rb

@@ -36,13 +36,13 @@ class Admin::ResourceController < ApplicationController
     r.stale.default { announce_update_conflict; render action: template_name }
 
     r.create.publish(:xml, :json) { render format_symbol => model, :status => :created, :location => url_for(format: format_symbol, id: model) }
-    r.create.default { redirect_to continue_url(params) }
+    r.create.default { redirect_to redirect_url }
 
     r.update.publish(:xml, :json) { head :ok }
-    r.update.default { redirect_to continue_url(params) }
+    r.update.default { redirect_to redirect_url }
 
     r.destroy.publish(:xml, :json) { head :deleted }
-    r.destroy.default { redirect_to continue_url(params) }
+    r.destroy.default { redirect_to redirect_url }
   end
 
   def index
@@ -201,8 +201,11 @@ class Admin::ResourceController < ApplicationController
     t(model_name.underscore.downcase)
   end
 
-  def continue_url(options)
-    options[:redirect_to] || (params[:continue] ? { action: 'edit', id: model.id } : index_page_for_model)
+  def redirect_url
+    return edit_admin_page_url(model) if params[:continue]
+    return "#{edit_admin_page_url(model)}?view_page=true" if params[:save_and_view]
+
+    admin_pages_url(site_id: model.site.id)
   end
 
   def index_page_for_model

data/app/controllers/site_controller.rb

@@ -41,7 +41,7 @@ class SiteController < ApplicationController
   end
 
   def cacheable_request?
-    (request.head? || request.get?) && live?
+    (request.head? || request.get?) && !Rails.env.development?
   end
 
   # hide_action :cacheable_request?
@@ -78,8 +78,7 @@ class SiteController < ApplicationController
   end
 
   def find_page(url)
-    found = Page.find_by_path(url, live?)
-    found if found && (found.published? || dev?)
+    Page.find_by_path(url, can_view_drafts?)
   end
 
   def process_page(page)
@@ -87,11 +86,7 @@ class SiteController < ApplicationController
     page.process(request, response)
   end
 
-  def dev?
-    request.host == @trusty_config['dev.host'] || request.host =~ /^dev\./
-  end
-
-  def live?
-    not dev?
+  def can_view_drafts?
+    user_signed_in? # CMS users can view drafts
   end
 end

data/app/helpers/application_helper.rb

@@ -1,5 +1,6 @@
 module ApplicationHelper
   include Admin::RegionsHelper
+  include Admin::UrlHelper
 
   def trusty_config
     TrustyCms::Config
@@ -41,6 +42,16 @@ module ApplicationHelper
     submit_tag t('buttons.save_and_continue'), name: 'continue', class: 'button', accesskey: 's', id: 'save-and-continue-button'
   end
 
+  def save_model_and_view_page_button(model, options = {})
+    return nil unless generate_page_url(request.url, model)
+
+    options[:label] ||= model.published? ? t('buttons.save_and_view_page') : t('buttons.save_and_view_draft')
+    options[:class] ||= 'button'
+    options[:name] ||= 'save_and_view'
+    options[:id] ||= 'save-and-view-button'
+    submit_tag options.delete(:label), options
+  end
+
   def current_item?(item)
     if item.tab&.many? { |i| current_url?(i.relative_url) }
       # Accept only stricter URL matches if more than one matches

data/app/models/page.rb

@@ -201,21 +201,21 @@ class Page < ActiveRecord::Base
     parse_object(snippet)
   end
 
-  def find_by_path(path, live = true, clean = true)
+  def find_by_path(path, can_view_drafts = false, clean = true)
     return nil if virtual?
 
     path = clean_path(path) if clean
     my_path = self.path
-    if (my_path == path) && ((not live) || published?)
+    if (my_path == path) && (published? || can_view_drafts)
       return self
     elsif path =~ /^#{Regexp.quote(my_path)}([^\/]*)/
       slug_child = children.find_by_slug($1)
       if slug_child
-        found = slug_child.find_by_path(path, live, clean)
+        found = slug_child.find_by_path(path, can_view_drafts, clean)
         return found if found
       end
       children.each do |child|
-        found = child.find_by_path(path, live, clean)
+        found = child.find_by_path(path, can_view_drafts, clean)
         return found if found
       end
     end
@@ -224,7 +224,7 @@ class Page < ActiveRecord::Base
       file_not_found_types = ([FileNotFoundPage] + FileNotFoundPage.descendants)
       file_not_found_names = file_not_found_types.collect { |x| x.name }
       condition = (['class_name = ?'] * file_not_found_names.length).join(' or ')
-      condition = "status_id = #{Status[:published].id} and (#{condition})" if live
+      condition = "status_id = #{Status[:published].id} and (#{condition})" unless can_view_drafts
       return children.where([condition] + file_not_found_names).first
     end
     slug_child
@@ -251,10 +251,10 @@ class Page < ActiveRecord::Base
       find_by_parent_id(nil)
     end
 
-    def find_by_path(path, live = true)
+    def find_by_path(path, can_view_drafts = false)
       raise MissingRootPageError unless root
 
-      root.find_by_path(path, live)
+      root.find_by_path(path, can_view_drafts)
     end
 
     def date_column_names

data/app/models/rails_page.rb

@@ -2,7 +2,7 @@ class RailsPage < Page
   display_name 'Application'
   attr_accessor :breadcrumbs
 
-  def find_by_path(url, live = true, clean = true)
+  def find_by_path(url, can_view_draft = false, clean = true)
     found_page = super
     if found_page.nil? || found_page.is_a?(FileNotFoundPage)
       url = clean_url(url) if clean

data/app/models/site.rb

@@ -63,13 +63,6 @@ class Site < ActiveRecord::Base
     uri.to_s
   end
 
-  # Returns the fully specified web address for the development version of this site and the supplied path, or the root of this site if no path is given.
-
-  def dev_url(path = '/')
-    uri = URI.join("http://#{TrustyCms::Config['dev.host'] || 'dev'}.#{base_domain}", path)
-    uri.to_s
-  end
-
   def create_homepage
     if homepage_id.blank?
       self.homepage = build_homepage(title: "#{name} Homepage",

data/app/models/standard_tags.rb

@@ -711,7 +711,6 @@ module StandardTags
   tag 'find' do |tag|
     required_attr(tag, 'path', 'url')
     path = tag.attr['path'] || tag.attr['url']
-
     found = Page.find_by_path(absolute_path_for(tag.locals.page.path, path))
     if page_found?(found)
       tag.locals.page = found
@@ -903,12 +902,6 @@ module StandardTags
   tag 'site:host' do |_tag|
     TrustyCms::Config['site.host']
   end
-  desc %{
-    Returns TrustyCms::Config['dev.host'] as configured under the Settings tab.
-  }
-  tag 'site:dev_host' do |_tag|
-    TrustyCms::Config['dev.host']
-  end
 
   tag 'meta' do |tag|
     if tag.double?
@@ -1012,7 +1005,7 @@ module StandardTags
     end
     options[:order] = order_string
 
-    status = (attr[:status] || (dev?(tag.globals.page.request) ? 'all' : 'published')).downcase
+    status = attr[:status]
     if status == 'all'
       options[:conditions] = ['virtual = ?', false]
     else
@@ -1108,14 +1101,4 @@ module StandardTags
     attr_collection = attribute_names.map { |a| "`#{a}'" }.join(' or ')
     raise TagError.new("`#{tag.name}' tag must contain a #{attr_collection} attribute.") if (tag.attr.keys & attribute_names).blank?
   end
-
-  def dev?(request)
-    return false if request.nil?
-
-    if dev_host = TrustyCms::Config['dev.host']
-      dev_host == request.host
-    else
-      request.host =~ /^dev\./
-    end
-  end
 end

data/app/models/trusty_cms/config.rb

@@ -50,7 +50,6 @@ module TrustyCms
     # defaults.page.filter      :: the default filter to use on new page parts
     # defaults.page.fields      :: a comma separated list of the default page fields
     # defaults.snippet.filter   :: the default filter to use on new snippets
-    # dev.host                  :: the hostname where draft pages are viewable
     # local.timezone            :: the timezone name (`rake -D time` for full list)
     #                              used to correct displayed times
     # page.edit.published_date? :: when true, shows the datetime selector
@@ -139,7 +138,7 @@ module TrustyCms
       end
 
       def site_settings
-        @site_settings ||= %w{site.title site.host dev.host local.timezone}
+        @site_settings ||= %w{site.title site.host local.timezone}
       end
 
       def default_settings

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

@@ -73,12 +73,23 @@
     .page-actions
       = save_model_button(@page)
       = save_model_and_continue_editing_button(@page)
-      = submit_tag(t('preview', :default => 'Preview'), :class => 'button', :id => 'show-preview')
+      = save_model_and_view_page_button(@page)
       = t('or')
       = link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
-    #preview_panel.fullcover.grey_out{:style => 'display: none;'}
-      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => 'auto'}
-      .preview_tools
-        =link_to(t('edit_page'), {}, :class => 'button cancel')
+    #view-page-url-data{ data: { url: @view_page_url } }
   - form_bottom.edit_timestamp do
     = updated_stamp @page
+
+-# Opens a new tab with the page URL when "Save and View Page" is selected
+:javascript
+  document.addEventListener("DOMContentLoaded", function() {
+    let params = new URLSearchParams(window.location.search);
+    let dataDiv = document.getElementById("view-page-url-data");
+
+    if (params.get("view_page") === "true" && dataDiv) {
+      let newTabUrl = dataDiv.dataset.url;
+      if (newTabUrl) {
+        window.open(newTabUrl, '_blank');
+      }
+    }
+  });

data/app/views/admin/pages/_url_row.haml

@@ -2,4 +2,5 @@
   %th.label
     %label{ :for => "page_url" }= t('url')
   %td.field
-    = text_field_tag "page[url]", page_url, :id => "page_url_content", :class => 'textbox', :maxlength => 200, disabled: true
+    .url-textbox
+      = link_to page_url, page_url, target: "_blank"

data/config/initializers/trusty_cms_config.rb

@@ -1,7 +1,6 @@
 Rails.application.reloader.to_prepare do
   TrustyCms.config do |config|
     config.define 'admin.title', default: 'TrustyCms CMS'
-    config.define 'dev.host'
     config.define 'local.timezone', allow_change: true, select_from: lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
     config.define 'defaults.locale', select_from: lambda { TrustyCms::AvailableLocales.locales }, allow_blank: true
     config.define 'defaults.page.parts', default: 'Body,Extended'

data/config/locales/en.yml

@@ -52,6 +52,8 @@ en:
   buttons:
     create: 'Create %{name}'
     save_and_continue: 'Save and Continue Editing'
+    save_and_view_draft: 'Save and View Draft'
+    save_and_view_page: 'Save and View Page'
     save_changes: 'Save Changes'
   cancel: 'Cancel'
   change: 'Change'

data/config/routes.rb

@@ -41,7 +41,6 @@ TrustyCms::Application.routes.draw do
     end
   end
 
-  match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => %i[post put]
   get 'admin' => 'admin/pages#index'
 
   namespace :admin do

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.22'.freeze
+  VERSION = '7.0.23'.freeze
 end

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

@@ -13,11 +13,11 @@ module MultiSite::PageExtensions
     base.extend ClassMethods
     class << base
 
-      def find_by_path(path, live=true)
+      def find_by_path(path, can_view_drafts = false)
         root = homepage
         raise Page::MissingRootPageError unless root
         path = root.path if clean_path(path) == "/"
-        result = root.find_by_path(path, live)
+        result = root.find_by_path(path, can_view_drafts)
 
         # If the result is a FileNotFoundPage and it
         # doesn't match the current site, try to find one that does.

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

@@ -6,19 +6,11 @@ module MultiSite::PagesControllerExtensions
 
       alias_method :index_without_site, :index
 
-      alias_method :continue_url_without_site, :continue_url
-      alias_method :continue_url, :continue_url_with_site
-
       alias_method :remove_without_back, :remove
       alias_method :remove, :remove_with_back
       responses.destroy.default do
-        return_url = session[:came_from]
         session[:came_from] = nil
-        if model.class == Page or model.class < Page
-          redirect_to return_url || admin_pages_url(:site_id => model.site.id)
-        else
-          redirect_to continue_url(params)
-        end
+        redirect_to admin_pages_url(site_id: model.site.id)
       end
     }
   end
@@ -40,8 +32,4 @@ module MultiSite::PagesControllerExtensions
     session[:came_from] = request.env["HTTP_REFERER"]
     remove_without_back
   end
-
-  def continue_url_with_site(options={})
-    options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:site_id => model.site.id))
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.22
+  version: 7.0.23
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -702,7 +702,6 @@ files:
 - app/assets/javascripts/admin/pagefield.js
 - app/assets/javascripts/admin/persist.min.js
 - app/assets/javascripts/admin/popup.js
-- app/assets/javascripts/admin/preview.js
 - app/assets/javascripts/admin/sortable.js
 - app/assets/javascripts/admin/tabcontrol.js.erb
 - app/assets/javascripts/admin/tags.js
@@ -1123,7 +1122,6 @@ files:
 - public/dispatch.fcgi
 - public/dispatch.rb
 - public/favicon.ico
-- public/loading-iframe.html
 - public/robots.txt
 - script/extension
 - script/rails

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

@@ -1,40 +0,0 @@
-(function(Preview, $) {
-  Preview.showPreview = function(form){
-    var oldTarget = form.target;
-    var oldAction = form.action;
-
-    var $previewer = $('#preview_panel');
-    var $preview_tools = $previewer.find('.preview_tools');
-    var $frame = $('#page-preview');
-
-    $(window).scrollTop(0);
-    $previewer.show();
-    $preview_tools.css('opacity', 1);
-    $('body').addClass('clipped');
-    form.target = $frame.attr('id');
-    form.action = relative_url_root + '/admin/preview';
-    form.submit();
-
-    form.target = oldTarget;
-    form.action = oldAction;
-  }
-
-}(window.Preview = window.Preview || {}, jQuery));
-
-$(function () {
-  $('#show-preview').on('click', function(event){
-    event.preventDefault();
-    Preview.showPreview(this.form);
-  });
-
-  $('.preview_tools a.cancel').on('click', function(event){
-    event.preventDefault();
-    $('#preview_panel').hide();
-    $('body').removeClass('clipped');
-    $('#page-preview').attr('src', '');
-  });
-
-  $('iframe').on('load', function(event){
-    $('#preview_panel .preview_tools').css('opacity', null);
-  });
-});

data/public/loading-iframe.html

@@ -1,11 +0,0 @@
-<html>
- <head>
-  <meta http-Equiv="Cache-Control" Content="no-cache">
-  <meta http-Equiv="Pragma" Content="no-cache">
-  <meta http-Equiv="Expires" Content="0">
-  <title>Loading...</title>
- </head>
- <body>
-  <p>Loading Preview...</p>
- </body>
-</html>