imagine_cms 5.2.2 → 5.2.6

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

@@ -1,8 +1,18 @@
-<div id="<%= "cb_item_#{list_page_select.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('page_browser_selection').value = '/<%= list_page_select.path %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages_select', :level => @page_level + 1, :parent_id => list_page_select.id %>\');', 200);" ondblclick="return false;">
-  <table cellpadding="0" cellspacing="0" border="0">
-    <tr>
-      <td valign="top"><%= image_tag 'management/icon_page.gif', style: 'margin: 2px 5px 0 0;' %></td>
-      <td<%= list_page_select.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page_select.name %></td>
-    </tr>
-  </table>
+<%- list_page = list_page_select -%>
+
+<div id="cb_item_<%= list_page.id %>" class="cb_item<%= ' cb_item_offline' unless list_page.published_version >= 0 %>">
+  <%= image_tag 'management/icon_page.gif' %></td>
+  <span><%= list_page.name %></span>
 </div>
+
+<script type="text/javascript">
+  jQuery('#cb_item_<%= list_page.id %>').on('click', () => {
+    jQuery('#page_browser_selection').val('/<%= list_page.path %>');
+    setTimeout(() => {
+      cbSelectItem('#cb_item_<%= list_page.id %>', <%= @page_level %>, '<%=raw url_for action: 'list_pages_select', level: @page_level + 1, parent_id: list_page.id %>');
+    }, 200);
+  });
+  jQuery('#cb_item_<%= list_page.id %>').on('dblclick', (event) => {
+    return false;
+  });
+</script>

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

@@ -1 +1 @@
-<%= render :partial => 'list_page_select', :collection => @pages %>
+<%= render partial: 'list_page_select', collection: @pages %>

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,120 @@
     <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 galleryFileField = document.getElementById("gallery_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 (galleryFileField.value == "") {
+      setTimeout(() => {
+        galleryNextButton.value = "Next";
+        galleryNextButton.dataset.disableWith = null;
+        galleryNextButton.disabled = false;
+      });
+      return;
+    }
+
+    let file = galleryFileField.files[0];
+    let formData = new FormData(uploadGalleryForm);
+
+    let resp = await fetch(uploadGalleryForm.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/manage/cms_pages/index.html.erb

@@ -70,7 +70,7 @@
   jQuery('#edit_content_link').prop('href', '<%=raw url_for action: 'edit_page_content', id: list_page, authenticity_token: form_authenticity_token.to_s %>');
   jQuery('#delete_link').prop('href', '<%=raw url_for action: 'delete_page', id: list_page.id %>');
 </script>
-<script type="text/javascript" async>
+<script type="text/javascript" defer>
   dojo.require("dojo.widget.*");
   dojo.require("dojo.widget.Dialog");
 </script>

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

@@ -1,52 +1,57 @@
-<%
+<%-
   cbNumColumns = 0;
   cbColWidth = 200;
-  cbColHeight = 200;
+  cbColHeight = 343;
 -%>
 <script type="text/javascript">
-  dojo.require("dojo.widget.*");
-  dojo.require("dojo.widget.Dialog");
-  
   window.cbColWidth = <%= cbColWidth %>;
   window.cbColHeight = <%= cbColHeight %>;
 </script>
+<style type="text/css">
+  .cb_column {
+    width: <%= cbColWidth %>px;
+    height: <%= cbColHeight %>px;
+  }
+</style>
 
-<div id="columnBrowserContainer" style="width: 100%; height: <%= cbColHeight + 20 %>px; overflow: auto;">
+<div id="columnBrowserContainer" style="height: <%= cbColHeight + 2 %>px;">
   <div id="columnBrowser" style="width: <%= (cbColWidth+1) * @page_levels.size %>px;">
-    <% @page_levels.each_with_index do |name, i| %>
-      <%
-        if !name.blank?
-          @path << '/' if !@path.blank?
+    <%- @page_levels.each_with_index do |name, i| -%>
+      <%-
+        if name.present?
+          @path << '/' if @path.present?
           @path << name
         end
         @parent = @page
         @page = CmsPage.find_by_path @path
         @page_level = i
         @pages = @parent.children if @parent
-        
+
         break_flag = false
-        
+
         if !@page
-          if @parent && @parent.children.first
-            @page = @parent.children.first
-          elsif @parent
-            @page = @parent
-          else
-            @page = CmsPage.find(:first)
-          end
+          @page = @parent.children.first || @parent || CmsPage.first
           break_flag = true
         end
       -%>
       <div id="columnBrowserLevel<%= i %>" class="cb_column">
-        <% if i == 0 -%>
-          <%= render :partial => 'list_page_select', :locals => { :list_page_select => CmsPage.find(1) } %>
-        <% else -%>
-          <%= render :partial => 'list_pages_select' %>
-        <% end -%>
-        <%= javascript_tag "$('cb_item_#{@parent.id}').className = 'cb_item cb_item_selected';" if @parent %>
+        <%- if i == 0 -%>
+          <%= render partial: 'list_page_select', locals: { list_page_select: CmsPage.first } %>
+        <%- else -%>
+          <%= render partial: 'list_pages_select' %>
+        <%- end -%>
+        <%= javascript_tag "jQuery('#cb_item_#{@parent.id}').addClass('cb_item_selected')[0].scrollIntoView();" if @parent %>
       </div>
       <%- break if break_flag -%>
-    <% end -%>
+    <%- end -%>
   </div>
 </div>
-<%= javascript_tag "cbNumColumns = #{@page_levels.size - 1}; try { $('columnBrowserContainer').scrollLeft = $('columnBrowserContainer').scrollWidth; } catch (e) {}; $('page_browser_selection').value = '/#{@page.path}';" %>
+
+<%- list_page = @page -%>
+
+<script type="text/javascript">
+  cbNumColumns = <%= @page_levels.size - 1 %>;
+  jQuery('#columnBrowserLevel' + cbNumColumns)[0].scrollIntoView();
+
+  jQuery('#page_browser_selection').val('/<%= @page.path %>');
+</script>

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

@@ -1,4 +1,4 @@
-<div class="ccs-toolbar EditorToolbarDomNode EditorToolbarSmallBg" style="height: 25px;">
+<div class="ccs-toolbar EditorToolbarDomNode EditorToolbarSmallBg" style="height: 25px; min-width: 900px;">
   <table cellpadding="1" cellspacing="0" border="0">
     <tbody>
       <tr valign="top" align="left">

data/app/views/manage/cms_snippets/edit.html.erb

@@ -2,7 +2,7 @@
 
 <h2><%= params[:action].titlecase %> Snippet</h2>
 
-<%= form_with(model: ['manage', @cms_snippet], local: true) do |f| %>
+<%= form_with(model: [:manage, @cms_snippet], local: true) do |f| %>
   <%= f.text_field :name, placeholder: 'Snippet Name', :size => '50' %>
   <div class="codemirror-html-container">
     <%= f.text_area :content, class: 'codemirror-html autocomplete-off' %>

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/docker-compose.override.yml.example

@@ -11,34 +11,20 @@ services:
     volumes:
       - ../mysite:/home/app/myapp:delegated                      # set to (relative) path to site you want to run
       # - .:/home/app/imagine_cms:delegated                      # when working on imagine itself
-      # - ./prototype-rails:/home/app/prototype-rails:delegated  # when working on imagine dependency prototype-rails
-      - log:/home/app/myapp/log
-      - node_modules:/home/app/myapp/node_modules
+      - /home/app/myapp/log
+      - /home/app/myapp/tmp
       - gems:/usr/local/rvm/gems
       - ~/.gitconfig:/home/app/.gitconfig                        # if you want to commit from within the container
     # environment:
     #   PASSENGER_APP_ENV: production
-    # networks:  # to use traefik, uncomment this along with the networks section at the bottom
-    #   - traefik
-    #   - default
-    # labels:
-    #   traefik.docker.network: traefik
 
   db:
     ports:               # access using mysql -P (not -p), ex: mysql -h 127.0.0.1 -P 33060 -u root
       # - '33060:3306'   # <---- change the first number to set your local port
       - '3306'           # <---- or omit the first number entirely to use a random local port (use `docker ps`)
     volumes:
-      - db-data:/var/lib/mysql
+      - /var/lib/mysql
 
 volumes:
-  db-data:
-  log:
-  node_modules:
-  tmp:
   gems:
     external: true
-
-# networks:
-#   traefik:
-#     external: true

data/docker-compose.yml

@@ -16,4 +16,4 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
       
   # redis:
-  #   image: redis:4.0-32bit  # not really 32-bit, just compiled that way to reduce memory usage
+  #   image: redis:5.0-32bit  # not really 32-bit, just compiled that way to reduce memory usage

data/lib/extensions/action_controller_extensions.rb

@@ -233,29 +233,30 @@ module ActionControllerExtensions
         content << '</div>'
         content << <<-EOT
 <script type="text/javascript">
-  jQuery('##{key}').css({ opacity: '1', cursor: 'default' });
-  jQuery('.imagine_cms-paginator-link').not('.imagine_cms-paginator-link-selected').mouseover(function () {
-    jQuery(this).addClass('imagine_cms-paginator-link-selected');
-  }).mouseout(function () {
-    jQuery(this).removeClass('imagine_cms-paginator-link-selected');
-  });
-  
+  setTimeout(() => {
+    jQuery('##{key}').css({ opacity: '1', cursor: 'default' });
+    jQuery('.imagine_cms-paginator-link').not('.imagine_cms-paginator-link-selected').mouseover(function () {
+      jQuery(this).addClass('imagine_cms-paginator-link-selected');
+    }).mouseout(function () {
+      jQuery(this).removeClass('imagine_cms-paginator-link-selected');
+    });
 EOT
         num_segments.times do |seg|
           start = seg * limit
           content << <<-EOT
-  jQuery('##{key}-segment-#{seg}').click(function () {
-    jQuery('##{key}').css({ cursor: 'wait', opacity: '0.5' });
-    jQuery('html,body').animate({ scrollTop: jQuery('##{key}').position().top }, 200);
-    jQuery.get('#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]), :only_path => true)}', function (data) {
-      jQuery('##{key}').html(data);
-      jQuery('##{key}').css({ cursor: 'default', opacity: '1' });
-    });
-    return false;
-  })
+    jQuery('##{key}-segment-#{seg}').click(function () {
+      jQuery('##{key}').css({ cursor: 'wait', opacity: '0.5' });
+      jQuery('html,body').animate({ scrollTop: jQuery('##{key}').position().top }, 200);
+      jQuery.get('#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]), :only_path => true)}', function (data) {
+        jQuery('##{key}').html(data);
+        jQuery('##{key}').css({ cursor: 'default', opacity: '1' });
+      });
+      return false;
+    })
 EOT
         end
         content << <<-EOT
+  });
 </script>
 EOT
       end

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.2"
+  VERSION = "5.2.6"
 end