imagine_cms 5.2.2 → 5.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463afd9f9daba1b0c0a16f0df7fd8e70a0c990d9bfad455cd65fccfc2c06d71c
-  data.tar.gz: 515cb433392199c789c3557ab622c5819df8d851f4f165433bfd0e0bd6ca289c
+  metadata.gz: b10e45eaec58dd97408908218d4e774f886f3dcaa868600c8f13c4e5fac9cb29
+  data.tar.gz: 26d4eacd39df7ff2ff09b25f3dca8e3d64d8519be19399e1d568b5799dbd02f3
 SHA512:
-  metadata.gz: dbffc87ab7a4088661650784ba2114cf09d0533866f23b05be424ef3bd6fb39e0e646becae7e96026f4b3323a81b1a18d9768a5ba0e0ff2501d47cbbfc77415e
-  data.tar.gz: 6812f71fcff897f94907b4f101fdecdc3569f2f42a117cef95cd7c81bedd4e65b386c9ac478db788919953abc300504d06ddb8325fc6d14e5e76a29b2a6ffd66
+  metadata.gz: eacae9beacf1a5ea342dcf6db684fa1d8c1cb1d7e479fdacdd2576d8e9ce4e547a3cc9e42023215a11b16be97282fbf61707c80ef6970c27d077e4de6fe44c4d
+  data.tar.gz: 8536b7f65d30d73123c1a8962ab04166d3d721f14df884930b015fd6a94827fa331a9972d6bda02f46f084007588f5470f3c32a501996d30ecb186dde7d98b6c

data/.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 Gemfile.lock
 pkg/
 rdoc/

data/Dockerfile

@@ -1,7 +1,7 @@
 ### Docker image for imagine5 ###
 
 # See https://hub.docker.com/r/anamba/rails-dev/tags/ for a list of tags
-FROM anamba/rails-dev:1.0
+FROM anamba/rails-dev:1.2.0
 LABEL maintainer="bbsoftware@biggerbird.com"
 
 # Update package list and upgrade pre-installed packages
@@ -9,7 +9,7 @@ RUN apt-get update
 RUN apt-get upgrade -y -o Dpkg::Options::="--force-confnew"
 
 # Install other packages we depend on
-RUN apt-get install -y mysql-client
+# RUN apt-get install -y mysql-client
 RUN apt-get install -y memcached
 RUN apt-get install -y libmagickcore-dev libmagickwand-dev  # for rmagick2 gem
 RUN apt-get install -y imagemagick                          # for mini-magick gem

data/README.md

@@ -1,4 +1,4 @@
-# Imagine CMS
+# Imagine 5 - Rails-powered CMS
 
 [![Version](https://img.shields.io/github/tag/anamba/imagine_cms.svg?maxAge=360)](https://github.com/anamba/imagine_cms/releases/latest)
 [![License](https://img.shields.io/github/license/anamba/imagine_cms.svg)](https://github.com/anamba/imagine_cms/blob/master/license.txt)
@@ -7,15 +7,21 @@
 Imagine CMS is a web content management system developed by [Bigger Bird Creative, Inc.](https://biggerbird.com) in 2006 for its clients.
 Other CMSes came with a learning curve: not a problem for daily users, but clients who only used it once a month or so would forget everything by the next time they logged in.
 Simpler systems didn't have enough functionality to allow us to do what we wanted to do as designers and developers.
-Thus, we created a CMS that is easy for clients to use, stays out of our way, and provides useful automation (publishing and unpublishing on a schedule, navigation links, RSS feeds, etc.).
+Thus, we created a CMS that is easy for clients to use, stays out of our way, and provides useful automation (lists, publishing and unpublishing on a schedule, navigation links, RSS feeds, etc.).
 
 ## Current Status
 
-Imagine 5.2 is ready for production use (v5.2-stable branch). Imagine 4 is also available for apps tied to Rails 4.2, respectively (v4.2-stable branch).
+[Imagine 6](https://github.com/ImagineCMS/imagine_cms) (Elixir-based) is use in production.
 
-However, unless you are already familiar with Imagine, this project is not suitable for wider use. Why? Well, the purpose of the Imagine gem at this point is strictly to upgrade legacy sites to modern versions of Rails as simply as possible, and to make sure that if something happens to Bigger Bird, our clients will not be left high and dry. This version was never intended to be used by the general public.
+Imagine 5 (this repo) is in use in production, but is being wound down in favor of Imagine 6.
 
-Imagine 7 will be a clean break and a great time to try Imagine CMS. Depending on how smoothly development goes, it could be released before Imagine 6 (awkward...).
+Imagine 4 (v4.2-stable branch) is available for apps tied to Rails 4.2, but is no longer actively maintained.
+
+Imagine 3 (v3.0-stable branch) is available for apps tied to Rails 3.x, but is no longer actively maintained.
+
+Unless you are already familiar with Imagine, this project is not suitable for wider use. Why? Well, the reason this version of Imagine is published on Github is to ensure that if something happens to Bigger Bird, our clients will not be left high and dry. However, this version was never intended to be used by the general public.
+
+Imagine 7 (planned) will be a clean break and a great time to try Imagine CMS.
 
 ## History and Roadmap
 
@@ -31,15 +37,15 @@ All that is now firmly in the past. By extracting Imagine functionality into a R
 * Imagine 4.2 (Rails 4.2, Ruby 2.2): [DONE, v4.2-stable] Compatibility with Rails 4.2, many minor fixes and UI improvements
 * Imagine 5.0 (Rails 5.0, Ruby 2.2): [SKIPPED] Compatibility with Rails 5.0
 * Imagine 5.1 (Rails 5.1, Ruby 2.4): [SKIPPED] Compatibility with Rails 5.1
-* **Imagine 5.2 (Rails 5.2, Ruby 2.5): [CURRENT RELEASE] Compatibility with Rails 5.2**
-* Imagine 6 (Rails 6): [FUTURE] Compatibility with Rails 6
-* Imagine 7 (Crystal): [IN PROGRESS] Rewrite in [Crystal](https://crystal-lang.org/) with [Apache CouchDB](http://couchdb.apache.org/) backend
+* **Imagine 5.2 (Rails 5.2, Ruby 2.5/2.6): [PRODUCTION] Compatibility with Rails 5.2**
+* **Imagine 6 (Elixir/Phoenix + MySQL): [PRODUCTION] Bridge between Imagine 5 and 7**
+* Imagine 7 (Elixir/Phoenix + CouchDB): [PLANNED] Community-driven open source project
 
-Imagine 6 will continue to be Rails-based, but Imagine 7 is a complete, ground-up rewrite in Crystal. Development will begin in a new repository under an Imagine CMS organization, as a proper community-driven open source project (finally!). The core concepts will continue on, but not a single line of code will carry over.
+Imagine 6 is a complete, ground-up rewrite in Elixir, and Imagine 7 builds on that, while also replacing the original MySQL/MariaDB store with CouchDB for improved scaling, redundancy, and replication. Imagine 7 development will also be done in the open, in a new repository under the Imagine CMS organization, as a proper community-driven open source project (finally!). The core concepts will continue on, but not a single line of code will be preserved.
 
 ## Hosting
 
-Imagine 3.x-6.x can run on typical Rails hosting platforms (anything that uses Passenger, Unicorn, Puma, etc.). On hosts that don't allow writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this mode of operation has not been fully tested).
+Imagine 3.x-5.x can run on typical Rails hosting platforms (anything that uses Passenger, Unicorn, Puma, etc.). On hosts that don't allow writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this mode of operation has not been fully tested).
 
 ## Getting Help
 
@@ -47,7 +53,7 @@ Get paid support and hosting for Imagine CMS straight from the people who made i
 
 ## Contributing
 
-Imagine 7 (Crystal) will be a true open source project, but this project (Ruby-based Imagine) will remain more or less closed for the foreseeable future. If companies or individuals are willing to sponsor or co-develop new features, we can work something out.
+Imagine 6 (Elixir rewrite) is now open source and Imagine 7 (MySQL -> CouchDB) will be a true open source project with full community involvement, but this project (Ruby-based Imagine 3.x - 5.x) will remain mostly closed for the foreseeable future (source will continue to be made available on Github, but development will be driven by Bigger Bird only). If companies or individuals are willing to sponsor or co-develop new features, we can work something out.
 
 ## Building Docker Image
 
@@ -55,7 +61,7 @@ Imagine 7 (Crystal) will be a true open source project, but this project (Ruby-b
 
 ```bash
 docker build -t anamba/imagine5-dev:latest .
-docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2.1
+docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2.4
 docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2
 docker push anamba/imagine5-dev
 ```

data/app/assets/javascripts/imagine_cms/core.js

@@ -249,7 +249,7 @@ function cancelSelectThumbnail() {
     hideDojoDialog('select_thumbnail_dialog');
 }
 
-var gallerySize = [];
+if (!window.gallerySize) window.gallerySize = {};
 function changeGalleryImage(galleryName, index) {
     var target = galleryName + '_image_' + index;
     var caption = galleryName + '_caption_' + index;

data/app/assets/stylesheets/imagine_cms.css.scss

@@ -1,3 +1,11 @@
+// fix for a Firefox 69 issue
+.dojoFloatingPane {
+	position: fixed !important;
+	top: 40px;
+	left: 50%;
+	margin-left: -25%;
+}
+
 .search-result {
   margin-bottom: 20px;
   .search-result-title { font-size: 1.1em; }
@@ -37,7 +45,7 @@ a.imagine_cms-paginator-link-selected {
 
 /* an extra classname is applied for Opera < 9.0 to fix it's lack of opacity support */
 .imgCrop_wrap.opera8 .imgCrop_overlay,
-.imgCrop_wrap.opera8 .imgCrop_clickArea { 
+.imgCrop_wrap.opera8 .imgCrop_clickArea {
 	background-color: transparent;
 }
 
@@ -58,7 +66,7 @@ a.imagine_cms-paginator-link-selected {
 
 .imgCrop_selArea {
 	position: absolute;
-	/* @done_in_js 
+	/* @done_in_js
 	top: 20px;
 	left: 20px;
 	width: 200px;
@@ -94,16 +102,16 @@ a.imagine_cms-paginator-link-selected {
 	z-index: 3;
 }
 
-/* 
+/*
  *  FIX MARCHING ANTS IN IE
- *	As IE <6 tries to load background images we can uncomment the follwoing hack 
+ *	As IE <6 tries to load background images we can uncomment the follwoing hack
  *  to remove that issue, not as pretty - but is anything in IE?
  *  And yes I do know that 'filter' is evil, but it will make it look semi decent in IE
  *
 * html .imgCrop_marqueeHoriz,
 * html .imgCrop_marqueeVert {
 	background: transparent;
-	filter: Invert; 
+	filter: Invert;
 }
 * html .imgCrop_marqueeNorth { border-top: 1px dashed #000; }
 * html .imgCrop_marqueeEast  { border-right: 1px dashed #000; }
@@ -143,7 +151,7 @@ a.imagine_cms-paginator-link-selected {
 	cursor: n-resize;
 }
 
-.imgCrop_handleNE { 
+.imgCrop_handleNE {
 	top: -3px;
 	right: -3px;
 	cursor: ne-resize;
@@ -189,7 +197,7 @@ a.imagine_cms-paginator-link-selected {
 }
 
 /**
- * Create an area to click & drag around on as the default browser behaviour is to let you drag the image 
+ * Create an area to click & drag around on as the default browser behaviour is to let you drag the image
  */
 .imgCrop_dragArea {
 	width: 100%;

data/app/controllers/manage/cms_pages_controller.rb

@@ -483,7 +483,6 @@ class Manage::CmsPagesController < Manage::ApplicationController
       script_tag = <<-EOT
         <script type="text/javascript">
           window.addEventListener('load', (event) => {
-            scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});
             setInterval(function() {
               scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});
             }, 1000);
@@ -491,7 +490,6 @@ class Manage::CmsPagesController < Manage::ApplicationController
         </script>
         EOT
       content << script_tag.html_safe
-        # content << observe_field("page_objects_#{key}", function: "scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});", frequency: 2)
       content
     when :page_list
       # set defaults unless values are present in template
@@ -585,7 +583,7 @@ class Manage::CmsPagesController < Manage::ApplicationController
       FileUtils.cp(data.path(), localfile)
     end
     
-    finish_upload_status "'#{File.basename(localfile)}'"
+    render json: { filename: File.basename(localfile) }.to_json
   end
   
   def crop_image
@@ -922,8 +920,8 @@ class Manage::CmsPagesController < Manage::ApplicationController
         end
       end
     end
-    
-    finish_upload_status "'#{File.basename(localdir)}'"
+
+    render json: { filename: File.basename(localdir) }.to_json
   end
   
   def gallery_setup

data/app/helpers/cms_application_helper.rb

@@ -548,19 +548,7 @@ module CmsApplicationHelper
     
     temp.html_safe
   end
-  
-  # override this method to do your own custom subtitutions
-  def substitute_placeholders_custom(temp, page)
-    # an example:
-    # begin
-    #   temp.gsub!(/<#\s*upcoming_event_date\s*#>/, page.article_date.strftime("<span class=\"month\">%b</span><span class=\"day\">%d</span>"))
-    # rescue
-    # end
-    
-    # remember to return your modified copy of temp
-    temp
-  end
-  
+ 
   
   def template_option(name, type = :string)
     return nil unless @pg
@@ -814,17 +802,15 @@ module CmsApplicationHelper
     default_value ||= start_date
     
     draw_calendar = <<-EOT
-      window.addEventListener('DOMContentLoaded', (event) => {
-        new Ajax.Updater('date_picker_#{object}_#{method_prefix}_days',
-                           '#{date_picker_url}?month=' + $('#{object}_#{method_prefix}_month_sel').value +
-                           '&year=' + $('#{object}_#{method_prefix}_year_sel').value +
-                           '&min_time=' + #{start_date.to_i} +
-                           '&max_time=' + #{end_date.to_i} +
-                           '&exclude_days=#{exclude_days.join(',')}' +
-                           '&onchange=#{escape_javascript(options[:onchange])}' +
-                           '&object=#{object}' +
-                           '&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true})
-        });
+      new Ajax.Updater('date_picker_#{object}_#{method_prefix}_days',
+                       '#{date_picker_url}?month=' + $('#{object}_#{method_prefix}_month_sel').value +
+                       '&year=' + $('#{object}_#{method_prefix}_year_sel').value +
+                       '&min_time=' + #{start_date.to_i} +
+                       '&max_time=' + #{end_date.to_i} +
+                       '&exclude_days=#{exclude_days.join(',')}' +
+                       '&onchange=#{escape_javascript(options[:onchange])}' +
+                       '&object=#{object}' +
+                       '&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true});
       EOT
 
     ret = <<-EOT
@@ -852,7 +838,17 @@ module CmsApplicationHelper
     </div>
   </div>
 EOT
-    ret += javascript_tag(draw_calendar)
+    ret += <<-EOT
+      <script type="text/javascript">
+        if (typeof(Ajax) == 'undefined') {
+          window.addEventListener('DOMContentLoaded', (event) => {
+            #{draw_calendar}
+          });
+        } else {
+          #{draw_calendar}
+        }
+      </script>
+      EOT
     ret.html_safe
   end
   
@@ -1054,7 +1050,7 @@ EOF
   
   
   def cropper_image_tag(options)
-    ret = "<img id=\"testImage\" src=\"/assets/#{options[:url]}\" />".html_safe
+    ret = "<img id=\"testImage\" src=\"/assets/#{options[:url]}\" style=\"display: block; position: relative;\" />".html_safe
     ret += javascript_tag("cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });")
   end
   

data/app/helpers/cms_custom_helper.rb

@@ -0,0 +1,13 @@
+module CmsCustomHelper
+  # override this method to do your own custom subtitutions
+  def substitute_placeholders_custom(temp, _page)
+    # an example:
+    # begin
+    #   temp.gsub!(/<#\s*upcoming_event_date\s*#>/, page.article_date.strftime("<span class=\"month\">%b</span><span class=\"day\">%d</span>"))
+    # rescue
+    # end
+
+    # remember to return your modified copy of temp
+    temp
+  end
+end

data/app/views/imagine_cms/_dialogs.html.erb

@@ -5,11 +5,11 @@
   </div>
   
   <div dojoType="ModalFloatingPane" id="page_browser_dialog" title="Select Page"
-       hasShadow="true" resizable="true" followScroll="false" displayCloseAction="true" style="width: 520px; height: 326px;">
+       hasShadow="true" resizable="true" followScroll="false" displayCloseAction="true" style="width: 620px; height: 426px;">
     <div>
-      <div id="page_browser" style="height: 220px; padding-top: 10px; margin-bottom: 8px;">Loading...</div>
+      <div id="page_browser" style="height: 345px; padding-top: 0px; margin-bottom: 8px;">Loading...</div>
       
-      <input id="page_browser_selection" type="text" class="form" style="width: 416px; padding: 2px;" />
+      <input id="page_browser_selection" type="text" class="form" style="width: 516px; padding: 2px;" />
       <button onclick="closePageBrowser(); return false;" class="form" style="width: 70px">Select</button>
     </div>
   </div>

data/app/views/imagine_cms/_header.html.erb

@@ -15,7 +15,7 @@
         return readCookie('user_auth_status') == 'authenticated';
     }
 </script>
-<script type="text/javascript" async>
+<script type="text/javascript">
     var load_dojo = false;
     if (<%= @load_dojo || 'false' %>) {
       load_dojo = true;
@@ -26,7 +26,7 @@
         document.writeln('<link href="/assets/imagine_controls.css" media="screen" rel="stylesheet" type="text/css" />')
     }
 </script>
-<script type="text/javascript" async>
+<script type="text/javascript">
     if (loggedIn()) {
         dojo.require("dojo.widget.Editor2");
         dojo.require("dojo.widget.Editor2Plugin.TableOperation");

data/app/views/manage/cms_pages/_create_file_link.html.erb

@@ -4,17 +4,30 @@
 -%>
 <%= javascript_tag <<-EOF
 var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
-linkNode = dojo.withGlobal(curInst.window, "getAncestorElement", dojo.html.selection, ['a']);
+var linkNode = dojo.withGlobal(curInst.window, "getAncestorElement", dojo.html.selection, ['a']);
+var html = '';
 
 curInst.restoreSelection();
 
+var removeInvalidTags = function(html) {
+  var el = document.createElement('div');
+  el.innerHTML = html;
+  ['script', 'title'].forEach(function(tag) {
+    el.querySelectorAll(tag).forEach(function(del) { del.remove(); });
+  });
+  return el.innerHTML;
+};
+
 if (!linkNode) {
-    var html = dojo.withGlobal(curInst.window, 'getSelectedHtml', dojo.html.selection);
+    html = dojo.withGlobal(curInst.window, 'getSelectedHtml', dojo.html.selection);
 } else {
-    var html = linkNode.innerHTML;
+    html = linkNode.innerHTML;
     dojo.withGlobal(curInst.window, 'selectElement', dojo.html.selection, [linkNode]);
 }
 
+html = removeInvalidTags(html).trim();
+if (html === '') html = "Link Text";
+
 curInst.execCommand('inserthtml', '<a href=\"#{page_file_path(@pg, @filename)}\" class=\"file-#{ext}\" target=\"_blank\">'+html+'</a>');
 cancelInsertFile();
 EOF

data/app/views/manage/cms_pages/_crop_feature_image.html.erb

@@ -197,7 +197,7 @@ Pressing "Save Feature Image" will crop the image and set it as the new feature
       </tr>
     </table>
     
-    <%= submit_tag 'Save Feature Image', :class => 'form_button', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= submit_tag 'Save Feature Image', :class => 'form_button', data: { disable_with: 'Saving...' } %>
     <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
   <%- end -%>
 </center>

data/app/views/manage/cms_pages/_crop_image.html.erb

@@ -1,25 +1,27 @@
 <script type="text/javascript">
+    window.scrollTo(0,0);
+
     var resize_ratio = 1.0;
     var aspect_ratio = <%= @width %>.0 / <%= @height %>;
     var imageSizeLocked = false;
-    
+
     try {
         if (cropper) cropper.remove();
     } catch (e) {}
-    
+
     deselectAllPresets = function() {
         jQuery('input[type=radio].image-size-preset').attr('checked', false);
     }
-    
+
     onEndCrop = function (coords, dimensions) {
         if (dimensions.width > 0 && dimensions.height > 0) {
             var size_changed = false;
-            
+
             $('image_x1').value = coords.x1;
             $('image_y1').value = coords.y1;
             $('image_x2').value = coords.x2;
             $('image_y2').value = coords.y2;
-            
+
             if (dimensions.width != $('image_width').value) {
                 $('image_width').value = dimensions.width;
                 size_changed = true;
@@ -28,14 +30,14 @@
                 $('image_height').value = dimensions.height;
                 size_changed = true;
             }
-            
+
             if (size_changed) {
                 setResizeRatio();
                 aspect_ratio = 1.0 * dimensions.width / dimensions.height;
-                
+
                 $('selection_x2').value = dimensions.width;
                 $('selection_y2').value = dimensions.height;
-                
+
                 if (!imageSizeLocked) {
                     if (resize_ratio) {
                         $('image_max_width').value = Math.round(dimensions.width * resize_ratio);
@@ -45,12 +47,12 @@
                         $('image_max_height').value = dimensions.height;
                     }
                 }
-                
+
                 $('aspect_ratio').innerHTML = setPrecision(dimensions.width/dimensions.height, 3);
             }
         }
     }
-    
+
     resizeCropper = function () {
         width = $('selection_x2').value;
         height = $('selection_y2').value;
@@ -63,10 +65,10 @@
         cropper.selArea.show();
         cropper.drawArea();
         cropper.endCrop();
-        
+
         setResizeRatio();
     }
-    
+
     resizeCropperScaled = function () {
         if (imageSizeLocked) {
             width = parseInt($('image_max_width').value);
@@ -81,37 +83,37 @@
             resizeCropper();
         }
     }
-    
+
     setResizeRatio = function () {
         crop_width = parseInt($('image_max_width').value);
         selection_width = parseInt($('selection_x2').value); // this is correct... x2 is the sel width
-        
+
         if (crop_width > 10 && selection_width > 10) {
             resize_ratio = 1.0 * $('image_max_width').value / $('selection_x2').value;
         } else {
             resize_ratio = 1.0;
         }
     }
-    
+
     lockImageSize = function () {
         imageSizeLocked = true;
         cropper.options.ratioDim = { x: parseInt($('image_max_width').value),
                                      y: parseInt($('image_max_height').value) };
         reloadCropper();
-        
+
         $('icon_unlocked').hide();
         $('icon_locked').show();
     }
-    
+
     unlockImageSize = function () {
         imageSizeLocked = false;
         cropper.options.ratioDim = { x: 0, y: 0 };
         reloadCropper();
-        
+
         $('icon_locked').hide();
         $('icon_unlocked').show();
     }
-    
+
     reloadCropper = function () {
         oldOptions = cropper.options;
         oldOptions.displayOnInit = 1;
@@ -126,13 +128,13 @@
         cropper.remove();
         cropper = new Cropper.Img('testImage', oldOptions);
     }
-    
+
     recalculateWidth = function () {
         if (imageSizeLocked) {
             $('image_max_width').value = Math.round(parseInt($('image_max_height').value) / aspect_ratio);
         }
     }
-    
+
     recalculateHeight = function () {
         if (imageSizeLocked) {
             $('image_max_height').value = Math.round(parseInt($('image_max_width').value) / aspect_ratio);
@@ -161,10 +163,10 @@ Pressing "Save Image" will crop the image and insert it into the page.
             <legend>Adjust Crop:</legend>
             <%= text_field :selection, :x2, :size => 3, :onkeyup => "resizeCropper();" %> x <%= text_field :selection, :y2, :size => 3, :onkeyup => "resizeCropper();" %>
           </fieldset>
-          
+
           <fieldset style="padding: 10px 15px; text-align: center;">
             <legend>Output Image Dimensions</legend>
-            
+
             <%- if defined?(CmsImageCropPresets) -%>
             <div style="text-align: left; margin-bottom: 20px;">
               <strong>Presets:</strong><br>
@@ -174,17 +176,17 @@ Pressing "Save Image" will crop the image and insert it into the page.
               <%- end -%>
             </div>
             <%- end -%>
-            
+
             <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "deselectAllPresets(); recalculateHeight();" %>
              x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "deselectAllPresets(); recalculateWidth();" %>
             <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
-            
+
             <%= image_tag('management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "deselectAllPresets(); lockImageSize();") %>
             <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "deselectAllPresets(); unlockImageSize();", :style => 'display: none;') %>
-            
+
             <%= link_to_function "Apply", "resizeCropperScaled();" %> |
             <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
-            
+
             <span id="aspect_ratio" style="display: none;"><%= sprintf("%.3f", @aspect_ratio) %></span><br/>
             <%= text_field :image, :x1, :style => "display: none" %>
             <%= text_field :image, :y1, :style => "display: none"  %>
@@ -196,8 +198,8 @@ Pressing "Save Image" will crop the image and insert it into the page.
         </td>
       </tr>
     </table>
-    
-    <%= submit_tag 'Save Image', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+
+    <%= submit_tag 'Save Image', class: 'form_button', style: 'width: 90px;', data: { disable_with: 'Saving...' } %>
     <%= link_to_function "Cancel", "cancelInsertImage();" %>
   <%- end -%>
 </center>

data/app/views/manage/cms_pages/_crop_thumb.html.erb

@@ -197,7 +197,7 @@ Pressing "Save Thumbnail" will crop the thumbnail and set it as the new thumbnai
       </tr>
     </table>
     
-    <%= submit_tag 'Save Thumbnail', :class => 'form_button', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= submit_tag 'Save Thumbnail', class: 'form_button', data: { disable_with: 'Saving...' } %>
     <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
   <%- end -%>
 </center>

data/app/views/manage/cms_pages/_edit_page.html.erb

@@ -21,7 +21,7 @@
 <table id="dlg-page-properties">
   <col width="120"><col width="*"><col width="5">
 <%- if @pg.id != 1 -%>
-  <tr>
+  <tr id="cms_page-form-name-row">
     <td>Name (for URL):</td>
     <td>
       <%= text_field :pg, :name, class: 'form', style: 'margin-bottom: 0; width: 150px', onchange: (@pg.new_record? ? '' : "if (!confirm('Are you sure you want to change the name of this page? Any bookmarks or links to this page will no longer work if you proceed with this change.')) { this.value = $('original_name').value; };") %><br/>
@@ -30,6 +30,15 @@
     </td>
   </tr>
 <%- end -%>
+  <tr id="cms_page-form-parent_id-row" style="display: none;">
+    <td>Parent Page ID:</td>
+    <td><%= text_field :pg, :parent_id, class: 'form', style: 'width: 100%;' %></td>
+  </tr>
+  <script>
+    let nameRow = document.getElementById("cms_page-form-name-row");
+    let parentIdRow = document.getElementById("cms_page-form-parent_id-row");
+    if (nameRow && parentIdRow) nameRow.addEventListener("click", (e) => { if (e.altKey) { parentIdRow.style.display = "table-row"; } });
+  </script>
   <tr>
     <td>Page Title:</td>
     <td><%= text_field :pg, :title, class: 'form', style: 'width: 100%;' %></td>

data/app/views/manage/cms_pages/_gallery_setup.html.erb

@@ -18,5 +18,5 @@
   Resize to be at most <%= text_field_tag :max_width, GalleryMaxWidth, :style => 'width: 40px' %> pixels wide and <%= text_field_tag :max_height, GalleryMaxHeight, :style => 'width: 40px' %> pixels high<br/>
   <%= text_field_tag 'dirname', params[:dirname], :style => 'display: none' %>
   
-  <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "this.disabled = true; this.value = 'Please wait...';" %>
+  <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', 'data-disable-with' => 'Please wait...' %>
 <%- end -%>