imagine_cms 5.2.4 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 672368e7c94e96e2469039b0db26f52b18e96124
-  data.tar.gz: b8c4834bfdb9cf87c13f621d125cda575d9b606e
+SHA256:
+  metadata.gz: 6395698e5fa9fccc7b7ae4d5178857dcd5678084505cc4df08da0a9f1ab23517
+  data.tar.gz: ef698c30a3234bb349183c084ea98dd2524e518b62270c5f18507b7631ad470e
 SHA512:
-  metadata.gz: 9a30892f3a9cb461c93dfdb709e33b91fc35816ce6af17f9afc1a96ef119a60581912baf33a5f43b5c8677a0afbf1b852c49596239cdc047f18d2a8260141c72
-  data.tar.gz: d724d7bf923d7ffeb5896def1e9f7bf9d71c64ebd19f4b3e2b371a00b2076b38f9ca97f0aaafc2d54f530114461006f6068de844fce9df133edb4ed5b9c170c7
+  metadata.gz: 0afe6cdfe911f124645fa829ea9e0c90c702261fefba1d49b86826adec69a15ae0c5909230cb349a26b21c51d6dc503b58949b933e4c4b7546937960d4ab2c54
+  data.tar.gz: 789fdb963f54155a91a74728e4ca0be2e7a75adaba77d8bf7e7a9a62e897b0fe9fa472c93790c74cca5dc5c68c449a1ee797cd9b5f92dcb57471afbc855c6c1d

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)
@@ -11,7 +11,9 @@ Thus, we created a CMS that is easy for clients to use, stays out of our way, an
 
 ## Current Status
 
-Imagine 5 is ready for production use (v5.2-stable branch), but is being wound down in favor of Imagine 6 and 7.
+[Imagine 6](https://github.com/ImagineCMS/imagine_cms) (Elixir-based) is use in production.
+
+Imagine 5 (this repo) is in use in production, but is being wound down in favor of Imagine 6.
 
 Imagine 4 (v4.2-stable branch) is available for apps tied to Rails 4.2, but is no longer actively maintained.
 
@@ -19,7 +21,7 @@ Imagine 3 (v3.0-stable branch) is available for apps tied to Rails 3.x, but is n
 
 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 will be a clean break and a great time to try Imagine CMS.
+Imagine 7 (planned) will be a clean break and a great time to try Imagine CMS.
 
 ## History and Roadmap
 
@@ -35,9 +37,9 @@ 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/2.6): [CURRENT RELEASE] Compatibility with Rails 5.2**
-* Imagine 6 (Elixir/Phoenix + MySQL): Closed source internal release, stepping stone between Imagine 5 and 7
-* Imagine 7 (Elixir/Phoenix + CouchDB): [IN PROGRESS] Community-driven open source project
+* **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 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.
 
@@ -51,7 +53,7 @@ Get paid support and hosting for Imagine CMS straight from the people who made i
 
 ## Contributing
 
-Imagine 7 (Elixir rewrite) 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.
+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
 
@@ -59,7 +61,7 @@ Imagine 7 (Elixir rewrite) will be a true open source project with full communit
 
 ```bash
 docker build -t anamba/imagine5-dev:latest .
-docker tag anamba/imagine5-dev:latest anamba/imagine5-dev:5.2.3
+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/stylesheets/imagine_cms.css.scss

@@ -1,7 +1,9 @@
 // fix for a Firefox 69 issue
 .dojoFloatingPane {
-	top: 50%; left: 50%;
-	transform: translate(-50%, -50%);
+	position: fixed !important;
+	top: 40px;
+	left: 50%;
+	margin-left: -25%;
 }
 
 .search-result {

data/app/controllers/manage/cms_pages_controller.rb

@@ -583,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

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
@@ -1062,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/_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/_upload_feature_image.html.erb

@@ -5,31 +5,71 @@
 certain your image is already web-ready. Otherwise, click "Next" to crop and
 resize your image before using it.</p>
 
-<%= form_tag_with_upload_progress({ :action => 'receive_image', :id => @pg, :overwrite => 1 },
-                                  { :finish => "if (arguments[0]) { $('filename').value = arguments[0]; $('mainform').onsubmit(); }" }) do -%>
+<%= form_tag({ action: 'receive_image', id: @pg, overwrite: 1 }, { id: 'upload-image-form', multipart: true }) do %>
 <table>
   <tr>
     <td>File:</td>
     <td>
-      <%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %><br/>
+      <%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; min-width: 150px' %><br/>
       <span style="color: #888888">Valid image types: jpeg, png, gif</span>
     </td>
   </tr>
   <tr>
     <td></td>
     <td>
-      <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-      <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; $('next_clicked_upload').value = '1'; $('next_clicked').value = '1'; this.disabled = true; this.value = 'Uploading...';" %>
-      <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
-      <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
+      <%= submit_tag 'Next', id: 'upload-image-next-button', class: 'form_button', style: 'min-width: 70px' %>
+      <%= submit_tag 'Finish', id: 'upload-image-finish-button', class: 'form_button', style: 'min-width: 70px' %>
       <%= text_field_tag 'next_clicked_upload', '0', :style => 'display: none' %>
     </td>
   </tr>
 </table>
 <%- end -%>
 
-<%= form_remote_tag(:update => 'select_thumbnail_dialog_content', :html => { :id => 'mainform' },
-                    :url => { :action => 'crop_feature_image', :id => @pg }) do -%>
-  <%= text_field_tag 'next_clicked', '0', :style => 'display: none' %>
-  <%= text_field_tag 'filename', '', :style => 'display: none' %>
+<%= form_remote_tag(update: 'select_thumbnail_dialog_content', html: { id: 'mainform' },
+                    url: { action: 'crop_feature_image', id: @pg }) do %>
+  <%= text_field_tag 'next_clicked', '0', style: 'display: none' %>
+  <%= text_field_tag 'filename', '', style: 'display: none' %>
 <%- end -%>
+
+<script>
+  const uploadImageForm = document.getElementById("upload-image-form");
+  const nextButton = document.getElementById("upload-image-next-button");
+  const finishButton = document.getElementById("upload-image-finish-button");
+  const uploadFileField = document.getElementById("file_data");
+
+  nextButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+    document.getElementById("next_clicked").value = "1";
+  });
+  finishButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+  });
+
+  uploadImageForm.addEventListener("submit", async (e) => {
+    e.preventDefault();
+
+    if (uploadFileField.value == "") {
+      setTimeout(() => {
+        nextButton.value = "Next";
+        finishButton.value = "Finish";
+        nextButton.dataset.disableWith = null;
+        finishButton.dataset.disableWith = null;
+        nextButton.disabled = false;
+        finishButton.disabled = false;
+      });
+      return;
+    }
+
+    let file = uploadFileField.files[0];
+    let formData = new FormData(uploadImageForm);
+
+    let resp = await fetch(uploadImageForm.action, {
+      method: 'POST',
+      body: formData
+    });
+    let data = await resp.json();
+
+    document.getElementById("filename").value = data.filename;
+    document.getElementById("mainform").onsubmit();
+  });
+</script>

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

@@ -11,14 +11,14 @@
   <tr>
     <td>File:</td>
     <td>
-      <%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %>
+      <%= file_field 'file', 'data', class: 'form', style: 'margin-bottom: 0; min-width: 150px' %>
     </td>
   </tr>
   <tr>
     <td></td>
     <td>
       <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-      <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
+      <%= submit_tag 'Finish', class: 'form_button', style: 'width: 70px;', data: { disable_with: 'Uploading...' } %>
       <%= link_to_function "Cancel", "cancelInsertFile()" %>
     </td>
   </tr>

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

@@ -1,4 +1,8 @@
-<%= javascript_tag "try { $('insert_file_dialog_content').innerHTML = ''; } catch (e) {}" %>
+<script>
+  try {
+    document.getElementById("insert_file_dialog_content").innerHTML = "";
+  } catch (e) { }
+</script>
 
 <div id="save_errors" class="error"></div>
 <h3 style="margin-bottom: 10px;">Insert Image</h3>
@@ -10,12 +14,11 @@
   certain your image is already web-ready. Otherwise, click "Next" to crop and
   resize your image before using it.</p>
 
-  <%= form_tag_with_upload_progress({ :action => 'receive_image', :id => @pg },
-                                    { :finish => "if (arguments[0]) { $('filename').value = arguments[0]; $('mainform').onsubmit(); }" }) do -%>
+  <%= form_tag({ action: 'receive_image', id: @pg }, { id: 'upload-image-form', multipart: true }) do %>
   <table>
     <tr>
       <td width="70">Image file:</td>
-      <td><%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %></td>
+      <td><%= file_field 'file', 'data', class: 'form', style: 'margin-bottom: 0; min-width: 250px' %></td>
     </tr>
     <tr>
       <td></td>
@@ -24,50 +27,119 @@
     <tr>
       <td></td>
       <td>
-        <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-        <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; $('next_clicked_upload').value = '1'; $('next_clicked').value = '1'; this.disabled = true; this.value = 'Uploading...';" %>
-        <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
+        <%= submit_tag 'Next', id: 'upload-image-next-button', class: 'form_button', style: 'min-width: 70px' %>
+        <%= submit_tag 'Finish', id: 'upload-image-finish-button', class: 'form_button', style: 'min-width: 70px' %>
         <%= link_to_function "Cancel", "cancelInsertImage()" %>
-        <%= text_field_tag 'next_clicked_upload', '0', :style => 'display: none' %>
       </td>
     </tr>
   </table>
-  <%- end -%>
-</fieldset><br/>
+  <% end %>
+</fieldset><br>
 
 <fieldset>
   <legend>New Photo Gallery</legend>
 
   <p>Upload a zip file of images to create a photo gallery.</p>
 
-  <%= form_tag_with_upload_progress({ :action => 'receive_gallery', :id => @pg },
-                                    { :finish => "if (arguments[0]) { $('dirname').value = arguments[0]; $('mainform_gallery').onsubmit(); }" }) do -%>
+  <%= form_tag({ action: 'receive_gallery', id: @pg }, { id: 'upload-gallery-form', multipart: true }) do %>
   <table>
     <tr>
       <td width="70">Zip file:</td>
       <td>
-        <%= file_field 'gallery_file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %><br/>
+        <%= file_field 'gallery_file', 'data', class: 'form', style: 'margin-bottom: 0; min-width: 250px' %><br/>
       </td>
     </tr>
     <tr>
       <td></td>
       <td>
-        <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-        <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('gallery_file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
+        <%= submit_tag 'Next', id: 'upload-gallery-next-button', class: 'form_button', style: 'min-width: 70px' %>
         <%= link_to_function "Cancel", "cancelInsertImage()" %>
       </td>
     </tr>
   </table>
-  <%- end -%>
+  <% end %>
 </fieldset><br>
 
-<%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform' },
-                    :url => { :action => 'crop_image', :id => @pg }) do -%>
-  <%= text_field_tag 'next_clicked', '0', :style => 'display: none' %>
-  <%= text_field_tag 'filename', '', :style => 'display: none' %>
+<%= form_remote_tag(update: 'insert_image_dialog_content', html: { id: 'mainform' },
+                    url: { action: 'crop_image', id: @pg }) do %>
+  <%= text_field_tag 'next_clicked', '0', style: 'display: none' %>
+  <%= text_field_tag 'filename', '', style: 'display: none' %>
 <%- end -%>
 
-<%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform_gallery' },
-                    :url => { :action => 'gallery_setup', :id => @pg }) do -%>
-  <%= text_field_tag :dirname, '', :style => 'display: none' %>
+<%= form_remote_tag(update: 'insert_image_dialog_content', html: { id: 'mainform_gallery' },
+                    url: { action: 'gallery_setup', id: @pg }) do %>
+  <%= text_field_tag :dirname, '', style: 'display: none' %>
 <%- end -%>
+
+<script>
+  const uploadImageForm = document.getElementById("upload-image-form");
+  const uploadGalleryForm = document.getElementById("upload-gallery-form");
+  const nextButton = document.getElementById("upload-image-next-button");
+  const finishButton = document.getElementById("upload-image-finish-button");
+  const uploadFileField = document.getElementById("file_data");
+  const galleryNextButton = document.getElementById("upload-gallery-next-button");
+
+  nextButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+    document.getElementById("next_clicked").value = "1";
+  });
+  finishButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+  });
+  galleryNextButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+  });
+
+  uploadImageForm.addEventListener("submit", async (e) => {
+    e.preventDefault();
+
+    if (uploadFileField.value == "") {
+      setTimeout(() => {
+        nextButton.value = "Next";
+        finishButton.value = "Finish";
+        nextButton.dataset.disableWith = null;
+        finishButton.dataset.disableWith = null;
+        nextButton.disabled = false;
+        finishButton.disabled = false;
+      });
+      return;
+    }
+
+    let file = uploadFileField.files[0];
+    let formData = new FormData(uploadImageForm);
+
+    let resp = await fetch(uploadImageForm.action, {
+      method: 'POST',
+      body: formData
+    });
+    let data = await resp.json();
+
+    document.getElementById("filename").value = data.filename;
+    document.getElementById("mainform").onsubmit();
+  });
+
+  uploadGalleryForm.addEventListener("submit", async (e) => {
+    e.preventDefault();
+
+    if (uploadFileField.value == "") {
+      setTimeout(() => {
+        galleryNextButton.value = "Next";
+        galleryNextButton.dataset.disableWith = null;
+        galleryNextButton.disabled = false;
+      });
+      return;
+    }
+
+    let file = uploadFileField.files[0];
+    let formData = new FormData(uploadImageForm);
+
+    let resp = await fetch(uploadImageForm.action, {
+      method: 'POST',
+      body: formData
+    });
+    let data = await resp.json();
+
+    document.getElementById("dirname").value = data.filename;
+    document.getElementById("mainform_gallery").onsubmit();
+  });
+</script>

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

@@ -5,31 +5,71 @@
 certain your image is already web-ready. Otherwise, click "Next" to crop and
 resize your image before using it.</p>
 
-<%= form_tag_with_upload_progress({ :action => 'receive_image', :id => @pg, :overwrite => 1 },
-                                  { :finish => "if (arguments[0]) { $('filename').value = arguments[0]; $('mainform').onsubmit(); }" }) do -%>
+<%= form_tag({ action: 'receive_image', id: @pg, overwrite: 1 }, { id: 'upload-image-form', multipart: true }) do %>
 <table>
   <tr>
     <td>File:</td>
     <td>
-      <%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %><br/>
+      <%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; min-width: 150px' %><br>
       <span style="color: #888888">Valid image types: jpeg, png, gif</span>
     </td>
   </tr>
   <tr>
     <td></td>
     <td>
-      <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-      <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; $('next_clicked_upload').value = '1'; $('next_clicked').value = '1'; this.disabled = true; this.value = 'Uploading...';" %>
-      <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
+      <%= submit_tag 'Next', id: 'upload-image-next-button', class: 'form_button', style: 'min-width: 70px' %>
+      <%= submit_tag 'Finish', id: 'upload-image-finish-button', class: 'form_button', style: 'min-width: 70px' %>
       <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
-      <%= text_field_tag 'next_clicked_upload', '0', :style => 'display: none' %>
     </td>
   </tr>
 </table>
 <%- end -%>
 
-<%= form_remote_tag(:update => 'select_thumbnail_dialog_content', :html => { :id => 'mainform' },
-                    :url => { :action => 'crop_thumb', :id => @pg }) do -%>
-  <%= text_field_tag 'next_clicked', '0', :style => 'display: none' %>
-  <%= text_field_tag 'filename', '', :style => 'display: none' %>
+<%= form_remote_tag(update: 'select_thumbnail_dialog_content', html: { id: 'mainform' },
+                    url: { action: 'crop_thumb', id: @pg }) do %>
+  <%= text_field_tag 'next_clicked', '0', style: 'display: none' %>
+  <%= text_field_tag 'filename', '', style: 'display: none' %>
 <%- end -%>
+
+<script>
+  const uploadImageForm = document.getElementById("upload-image-form");
+  const nextButton = document.getElementById("upload-image-next-button");
+  const finishButton = document.getElementById("upload-image-finish-button");
+  const uploadFileField = document.getElementById("file_data");
+
+  nextButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+    document.getElementById("next_clicked").value = "1";
+  });
+  finishButton.addEventListener("click", (e) => {
+    e.target.dataset.disableWith = "Uploading...";
+  });
+
+  uploadImageForm.addEventListener("submit", async (e) => {
+    e.preventDefault();
+
+    if (uploadFileField.value == "") {
+      setTimeout(() => {
+        nextButton.value = "Next";
+        finishButton.value = "Finish";
+        nextButton.dataset.disableWith = null;
+        finishButton.dataset.disableWith = null;
+        nextButton.disabled = false;
+        finishButton.disabled = false;
+      });
+      return;
+    }
+
+    let file = uploadFileField.files[0];
+    let formData = new FormData(uploadImageForm);
+
+    let resp = await fetch(uploadImageForm.action, {
+      method: 'POST',
+      body: formData
+    });
+    let data = await resp.json();
+
+    document.getElementById("filename").value = data.filename;
+    document.getElementById("mainform").onsubmit();
+  });
+</script>

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

@@ -95,7 +95,7 @@
         <td></td>
         <td>
           <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-          <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('gallery_file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
+          <%= submit_tag 'Next', class: 'form_button', style: 'width: 70px;', data: { disable_with: 'Uploading...' } %>
         </td>
       </tr>
     </table>

data/app/views/management/users/index.html.erb

@@ -20,7 +20,7 @@
     <td><%= u.last_name %></td>
     <td><%= u.active? ? 'Y' : 'N' %>
     <td><%= button_to(u.active? ? 'Disable' : 'Enable', { :action => (u.active? ? 'disable' : 'enable'), :id => u}, :class => 'form_button') if u.username != session[:user_username] %></td>
-    <td><%= button_to('Delete', { :action => 'destroy', :id => u }, :method => :delete, :class => 'form_button', :onclick => "return confirm('Are you sure you want to delete #{u.username}?');") if u.username != session[:user_username] %></td>
+    <td><%= button_to('Delete', { action: 'destroy', id: u }, method: :delete, class: 'form_button', data: { confirm: "Are you sure you want to delete #{u.username}?" }) if u.username != session[:user_username] %></td>
   </tr>
   <% end %>
 </table>

data/lib/imagine_cms/engine.rb

@@ -51,6 +51,7 @@ module ImagineCms
     end
     
     initializer 'imagine_cms.load_helpers' do |app|
+      ActionController::Base.send :include, CmsCustomHelper
       ActionController::Base.send :include, CmsApplicationHelper
     end
     

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "5.2.4"
+  VERSION = "5.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.2.5
 platform: ruby
 authors:
 - Aaron Namba
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -398,6 +398,7 @@ files:
 - app/controllers/management/users_controller.rb
 - app/controllers/util_controller.rb
 - app/helpers/cms_application_helper.rb
+- app/helpers/cms_custom_helper.rb
 - app/mailers/imagine_cms_mailer.rb
 - app/models/cms_page.rb
 - app/models/cms_page_object.rb
@@ -595,7 +596,7 @@ homepage: https://github.com/anamba/imagine_cms
 licenses:
 - AGPLv3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -610,9 +611,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Imagine Content Management System for Rails
 test_files: