imagine_cms 5.2.0 → 5.2.5

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

@@ -1,36 +1,33 @@
-<%
+<%-
   cbNumColumns = 0;
-  cbColWidth = 170;
-  cbColHeight = 300;
-  cbBorderWidth = 1;
-  cbColWidthFull = 172;
+  cbColWidth = 200;
+  cbColHeight = 400;
 -%>
-<%= javascript_tag <<-EOF
-  dojo.require("dojo.widget.*");
-  dojo.require("dojo.widget.Dialog");
-  
-  cbColWidth = '#{cbColWidth}px';
-  cbColHeight = '#{cbColHeight}px';
-  cbBorderWidth = '#{cbBorderWidth}px';
-  cbColWidthFull = '#{cbColWidthFull}';
-EOF
-%>
+<script type="text/javascript">
+  window.cbColWidth = <%= cbColWidth %>;
+  window.cbColHeight = <%= cbColHeight %>;
+</script>
+<style type="text/css">
+  .cb_column {
+    width: <%= cbColWidth %>px;
+    height: <%= cbColHeight %>px;
+  }
+</style>
 
 <h2>CMS &raquo; Pages</h2>
 
 <%= flash_message %>
 
-<div id="columnBrowserToolbar" style="background-color: #ddd; padding: 5px 4px 0; margin: 0 0 5px;">
-  <%= link_to image_tag('management/btn-top-new.png', style: 'margin-right: 2px;'), '#', id: 'new_link' %>
-  <%= link_to image_tag('management/btn-top-edit.png', style: 'margin-right: 2px;'), '#', id: 'edit_content_link', target: '_blank' %>
-  <%= link_to image_tag('management/btn-top-properties.png', style: 'margin-right: 2px;'), '#', id: 'edit_link' %>
-  <%= link_to image_tag('management/btn-top-preview.png', style: 'margin-right: 2px;'), '#', id: 'view_link', target: '_blank' %>
-  <%= link_to image_tag('management/btn-top-delete.png', style: 'margin: 0;'), '#', id: 'delete_link', target: '_blank', method: :post, data: { confirm: 'Are you sure you want to delete the selected page?' } %>
-  <div class="clearer"></div>
+<div id="columnBrowserToolbar">
+  <%= link_to image_tag('management/btn-top-new.png'), '#', id: 'new_link' %>
+  <%= link_to image_tag('management/btn-top-edit.png'), '#', id: 'edit_content_link' %>
+  <%= link_to image_tag('management/btn-top-properties.png'), '#', id: 'edit_link' %>
+  <%= link_to image_tag('management/btn-top-preview.png'), '#', id: 'view_link', target: '_blank' %>
+  <%= link_to image_tag('management/btn-top-delete.png'), '#', id: 'delete_link', method: :post, data: { confirm: 'Are you sure you want to delete the selected page?' } %>
 </div>
 
-<div id="columnBrowserContainer" style="width: 100%; height: <%= cbColHeight + 20 %>px; overflow: auto;">
-  <div id="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
+<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.present?
@@ -41,21 +38,21 @@ EOF
         @page = CmsPage.find_by_path @path
         @page_level = i
         @pages = @parent.children if @parent
-        
+
         break_flag = false
-        
+
         if !@page
           @page = @parent.children.first || @parent || CmsPage.first
           break_flag = true
         end
       -%>
-      <div id="columnBrowserLevel<%= i %>" style="width: <%= cbColWidth %>px; height: <%= cbColHeight %>px; overflow: auto; float: left; border-width: <%= cbBorderWidth %>px <%= cbBorderWidth %>px <%= cbBorderWidth %>px <%= i == 0 ? "#{cbBorderWidth}px" : '0' %>; border-style: solid; border-color: gray;">
+      <div id="columnBrowserLevel<%= i %>" class="cb_column">
         <%- if i == 0 -%>
           <%= render partial: 'list_page', locals: { list_page: CmsPage.first } %>
         <%- else -%>
           <%= render partial: 'list_pages' %>
         <%- end -%>
-        <%= javascript_tag "jQuery('#cb_item_#{@parent.id}').addClass('cb_item_selected');" if @parent %>
+        <%= javascript_tag "jQuery('#cb_item_#{@parent.id}').addClass('cb_item_selected')[0].scrollIntoView();" if @parent %>
       </div>
       <%- break if break_flag -%>
     <%- end -%>
@@ -65,13 +62,17 @@ EOF
 <%- list_page = @page -%>
 
 <script type="text/javascript">
-    cbNumColumns = <%= @page_levels.size - 1 %>;
-    $('columnBrowserLevel' + cbNumColumns).scrollIntoView();
-    $('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>';
-    $('new_link').onclick = function () { editProperties('<%=raw url_for(action: 'new', mode: 'ajax_new', parent_id: list_page, authenticity_token: form_authenticity_token.to_s) %>', 'Create New Page under /<%= list_page.path %>'); return false; };
-    $('edit_link').onclick = function () { editProperties('<%=raw url_for action: 'edit_page', id: list_page, mode: 'ajax_edit', authenticity_token: form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; };
-    $('edit_content_link').href = '<%=raw url_for action: 'edit_page_content', id: list_page, authenticity_token: form_authenticity_token.to_s %>';
-    $('delete_link').href = '<%=raw url_for action: 'delete_page', id: list_page.id %>';
+  cbNumColumns = <%= @page_levels.size - 1 %>;
+  jQuery('#columnBrowserLevel' + cbNumColumns)[0].scrollIntoView();
+  jQuery('#view_link').prop('href', '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>');
+  jQuery('#new_link').on('click', () => { editProperties('<%=raw url_for(action: 'new', mode: 'ajax_new', parent_id: list_page, authenticity_token: form_authenticity_token.to_s) %>', 'Create New Page under /<%= list_page.path %>'); return false; });
+  jQuery('#edit_link').on('click', () => { editProperties('<%=raw url_for action: 'edit_page', id: list_page, mode: 'ajax_edit', authenticity_token: form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; });
+  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" defer>
+  dojo.require("dojo.widget.*");
+  dojo.require("dojo.widget.Dialog");
 </script>
 
 <%= render '/imagine_cms/dialogs' %>

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

@@ -1,57 +1,57 @@
-<%
+<%-
   cbNumColumns = 0;
-  cbColWidth = 170;
-  cbColHeight = 200;
-  cbBorderWidth = 1;
-  cbColWidthFull = 172;
+  cbColWidth = 200;
+  cbColHeight = 343;
 -%>
-<%= javascript_tag <<-EOF
-  dojo.require("dojo.widget.*");
-  dojo.require("dojo.widget.Dialog");
-  
-  cbColWidth = '#{cbColWidth}px';
-  cbColHeight = '#{cbColHeight}px';
-  cbBorderWidth = '#{cbBorderWidth}px';
-  cbColWidthFull = '#{cbColWidthFull}';
-EOF
-%>
+<script type="text/javascript">
+  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="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
-    <% @page_levels.each_with_index do |name, i| %>
-      <%
-        if !name.blank?
-          @path << '/' if !@path.blank?
+<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.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 %>" style="width: <%= cbColWidth %>px; height: <%= cbColHeight %>px; overflow: auto; float: left; border: <%= cbBorderWidth %>px solid gray;">
-        <% 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 %>
+      <div id="columnBrowserLevel<%= i %>" class="cb_column">
+        <%- 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/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,33 +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
-      - rvm:/usr/local/rvm
+      - /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:
-  rvm:
-
-# networks:
-#   traefik:
-#     external: true
+  gems:
+    external: true

data/docker-compose.yml

@@ -3,19 +3,17 @@ version: '3'
 services:
   web:  # (passenger + sidekiq)
     build: .
-    volumes:
-      - ./docker/conf/nginx-vhost.conf:/etc/nginx/sites-enabled/webapp.conf:delegated
     environment:
       PASSENGER_APP_ENV: development
-      MYSQL_HOST: db                    # if this is changed, update nginx-vhost.conf as well
-      REDIS_URL: redis://redis:6379/1   # if this is changed, update nginx-vhost.conf as well
-      
+      MYSQL_HOST: db
+      REDIS_URL: redis://redis:6379/1
+
   db:
-    image: mariadb:10.3
+    image: mariadb:10.4
     volumes:
       - ./docker/conf/my.local.cnf:/etc/mysql/conf.d/my.local.cnf
     environment:
       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/docker/conf/{nginx-vhost.conf → nginx-vhost.conf.template}

@@ -6,9 +6,9 @@ server {
     passenger_enabled on;
     passenger_user app;
 
-    passenger_ruby /usr/bin/ruby2.5;
-    passenger_env_var MYSQL_HOST db;  # keep this in sync with value in docker-compose.yml
-    passenger_env_var REDIS_URL redis://redis:6379/1;
+    passenger_ruby /usr/bin/ruby2.6;
+    passenger_env_var MYSQL_HOST '$MYSQL_HOST';
+    passenger_env_var REDIS_URL '$REDIS_URL';
 
     client_max_body_size 100M;
 }

data/lib/extensions/action_controller_extensions.rb

@@ -144,7 +144,7 @@ module ActionControllerExtensions
           
           pages = page_list_items(@pg, key, options).compact.uniq
           
-          options[:wrapper_div] = true
+          options[:wrapper_div] = true unless options.has_key?(:wrapper_div)
           
           render_page_list_segment(name, pages, options, html_options)
         end
@@ -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.0"
+  VERSION = "5.2.5"
 end

data/lib/upload_progress/lib/multipart_progress.rb

@@ -20,7 +20,7 @@
 #
 #   class UploadController < ApplicationController
 #     def upload_status
-#       render :text => "Percent complete: " + @session[:uploads]['SOMEIDYOUSET'].completed_percent"
+#       render :plain => "Percent complete: " + @session[:uploads]['SOMEIDYOUSET'].completed_percent"
 #     end
 #   end
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.5
 platform: ruby
 authors:
 - Aaron Namba
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-22 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
@@ -492,10 +493,10 @@ files:
 - docker/conf/.my.cnf
 - docker/conf/my.local.cnf
 - docker/conf/my.prod.cnf
-- docker/conf/nginx-vhost.conf
-- docker/services/memcached.sh
-- docker/services/sidekiq.sh
-- docker/services/webpack.sh
+- docker/conf/nginx-vhost.conf.template
+- docker/services/memcached
+- docker/services/sidekiq
+- docker/services/webpack
 - docker/startup/101_mkdir.sh
 - docker/startup/201_bundler.sh
 - docker/startup/211_yarn.sh
@@ -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.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Imagine Content Management System for Rails
 test_files: