imagine_cms 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bcd149b6bf5e054f02e3e7e05914945359aa56a5e3886064a7a880c48277c4d
-  data.tar.gz: 1d2e69ce6b6f4654788a81c5c2ec91f219932ce2a57fbfca0ae0addb780c174d
+  metadata.gz: 463afd9f9daba1b0c0a16f0df7fd8e70a0c990d9bfad455cd65fccfc2c06d71c
+  data.tar.gz: 515cb433392199c789c3557ab622c5819df8d851f4f165433bfd0e0bd6ca289c
 SHA512:
-  metadata.gz: 52d088e7e5f6f5879c98aa933d3f0c8ccc59b077e38b83fdb909383a0cc1d8f8717bc98e8e9590b8e4f0d1a6119a313d7c5ebbfc3ba4332e313a04256e827dd8
-  data.tar.gz: 36f21b1b084531fb055e0ff19efbc1b2d850d01e3ccbb0e312b74b6aeea611b64c49db5a0fe0268415260e54fd483ddb0a3fcc876272f56cab7d5c39d3ab1d26
+  metadata.gz: dbffc87ab7a4088661650784ba2114cf09d0533866f23b05be424ef3bd6fb39e0e646becae7e96026f4b3323a81b1a18d9768a5ba0e0ff2501d47cbbfc77415e
+  data.tar.gz: 6812f71fcff897f94907b4f101fdecdc3569f2f42a117cef95cd7c81bedd4e65b386c9ac478db788919953abc300504d06ddb8325fc6d14e5e76a29b2a6ffd66

data/Dockerfile

@@ -10,10 +10,10 @@ 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 memcached
 RUN apt-get install -y libmagickcore-dev libmagickwand-dev  # for rmagick2 gem
 RUN apt-get install -y imagemagick                          # for mini-magick gem
-RUN apt-get install -y openjdk-8-jre-headless               # java for fop
-RUN apt-get install -y cmake pkg-config                     # for rugged (git)
+# RUN apt-get install -y openjdk-8-jre-headless             # java for fop (rarely used; add to your own Dockerfile if you need it)
 RUN apt-get autoremove -y
 
 # apt clean up
@@ -27,7 +27,8 @@ COPY /docker/conf/nginx-vhost.conf.template /etc/nginx/
 RUN rm -f /etc/nginx/sites-enabled/default
 
 # Add custom services
-RUN mkdir /etc/service/memcached
+RUN mkdir -p /etc/service/memcached
+RUN rm -f /etc/service/memcached/down
 COPY docker/services/memcached /etc/service/memcached/run
 
 # For convenience

data/README.md

@@ -48,3 +48,14 @@ 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.
+
+## Building Docker Image
+
+(notes for myself)
+
+```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
+docker push anamba/imagine5-dev
+```

data/app/assets/javascripts/dojo/dojo.js

@@ -9599,7 +9599,7 @@ var _8d9=dojo.html.getUnitValue(this.domNode,"line-height");
 if(_8d9.value&&_8d9.units==""){
 _8d8=_8d9.value;
 }
-dojo.html.insertCssText("body,html{background:transparent;padding:0;margin:0;}"+"body{top:0;left:0;right:0;"+(((this.height)||(dojo.render.html.opera))?"":"position:fixed;")+"font:"+font+";"+"min-height:"+this.minHeight+";"+"line-height:"+_8d8+"}"+"p{margin: 1em 0 !important;}"+"body > *:first-child{padding-top:0 !important;margin-top:"+this._firstChildContributingMargin+"px !important;}"+"body > *:last-child{padding-bottom:0 !important;margin-bottom:"+this._lastChildContributingMargin+"px !important;}"+"li > ul:-moz-first-node, li > ol:-moz-first-node{padding-top:1.2em;}\n"+"li{min-height:1.2em;}"+"",this.document);
+dojo.html.insertCssText("body,html{background:transparent;padding:0;margin:5px;}"+"body{top:0;left:0;right:0;"+(((this.height)||(dojo.render.html.opera))?"":"position:fixed;")+"font:"+font+";"+"min-height:"+this.minHeight+";"+"line-height:"+_8d8+"}"+"p{margin: 1em 0 !important;}"+"body > *:first-child{padding-top:0 !important;margin-top:"+this._firstChildContributingMargin+"px !important;}"+"body > *:last-child{padding-bottom:0 !important;margin-bottom:"+this._lastChildContributingMargin+"px !important;}"+"li > ul:-moz-first-node, li > ol:-moz-first-node{padding-top:1.2em;}\n"+"li{min-height:1.2em;}"+"",this.document);
 dojo.html.removeNode(_8cd);
 this.document.body.innerHTML=html;
 if(_8ca||dojo.render.html.safari){

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

@@ -83,19 +83,14 @@ function dpNextMonth(object, method_prefix, max_year) {
  ********************************/
 
 var cbNumColumns = 0;
-var cbColWidth = '200px';
-var cbColHeight = '240px';
-var cbBorderWidth = '1px';
-var cbColWidthFull = 202;
+var cbColWidth = 200;
+var cbColHeight = 240;
 
 function cbAddColumn() {
-    var currentWidth = parseInt($('columnBrowser').style.width, 10);
-    // if (currentWidth < ((cbNumColumns+1) * cbColWidthFull)) {
-      $('columnBrowser').style.width = '' + ((cbNumColumns+1) * cbColWidthFull) + 'px';
-      $('columnBrowserContainer').scrollLeft = $('columnBrowserContainer').scrollWidth;
-    // }
-    $('columnBrowser').innerHTML += "<div id=\"columnBrowserLevel" + cbNumColumns + "\" style=\"width: " + cbColWidth + "; height: " + cbColHeight + "; overflow: auto; float: left; border-width: " + cbBorderWidth + " " + cbBorderWidth + " " + cbBorderWidth + " " + (cbNumColumns == 0 ? cbBorderWidth : '0') + "; border-style: solid; border-color: gray;\">Loading...</div>";
+    jQuery('#columnBrowser').append('<div id="columnBrowserLevel' + cbNumColumns + '" class="cb_column">Loading...</div>');
+    jQuery('#columnBrowserContainer').scrollLeft(jQuery('#columnBrowserContainer')[0].scrollWidth);
     cbNumColumns++;
+    jQuery('#columnBrowser').css({ width: '' + ((cbColWidth+1) * cbNumColumns) + 'px' });
 }
 
 function getScrollbarPosition(el) {
@@ -110,31 +105,25 @@ function setScrollbarPosition(el, coords) {
 }
 
 function cbSelectItem(el, currentLevel, urlForNextLevel) {
-    var el = $(el);
-    coords = getScrollbarPosition(el.parentNode);
+    var el = jQuery(el);
+    // coords = getScrollbarPosition(el.parentNode);
     
-    // remove all higher levels and unselect all other same-level divs
+    // remove all higher levels
     for (var i = currentLevel + 1; i <= cbNumColumns; i++) {
-        d = $('columnBrowserLevel' + i);
-        if (d) d.parentNode.removeChild(d);
+        jQuery('#columnBrowserLevel' + i).remove();
     }
     cbNumColumns = currentLevel + 1;
-    
-    prefix = 'cb_item_';
-    $A(el.parentNode.childNodes).each(function (d) {
-        if (d.id && d.id.substring(0, prefix.length) == prefix) {
-            d.className = 'cb_item';
-        }
-    })
-    
-    // select and expand current dept div
-    el.className = 'cb_item cb_item_selected';
-    
+
+    // unselect all other same-level divs and select target
+    // prefix = 'cb_item_';
+    el.siblings().removeClass('cb_item_selected');
+    el.addClass('cb_item_selected');
+
+    // display children
     cbAddColumn();
-    el = $(el.id);
-    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {method: 'GET', asynchronous:true, evalScripts:true});
-    
-    setScrollbarPosition(el.parentNode, coords);
+    new Ajax.Updater('columnBrowserLevel' + (currentLevel+1), urlForNextLevel, {method: 'GET', asynchronous: true, evalScripts: true});
+
+    // setScrollbarPosition(el.parentNode, coords);
 }
 
 
@@ -346,13 +335,15 @@ function closePageBrowser() {
     $(pageBrowserFieldID).value = $('page_browser_selection').value;
 }
 
-
+// first level of this hash is parent_key below
 var cmsPageObjects = {};
+
 function scanForPageObjects(page_id, parent_key, version) {
   if (jQuery('#page_objects_' + parent_key).val().length == 0) return;
-  
+
   var found = {};
-  
+  if (!cmsPageObjects[parent_key]) cmsPageObjects[parent_key] = {};
+
   var regex = /<%=\s*insert_object\(?\s*['"]([-\w\s\d]+)['"],\s*:(\w+)\s*(.*?)\)?\s*%>/gm;
   var matches = jQuery('#page_objects_' + parent_key).val().match(regex);
   if (matches) {
@@ -367,7 +358,7 @@ function scanForPageObjects(page_id, parent_key, version) {
       }
     });
   }
-  
+
   var regex = /<%=\s*(?:page_list|pagelist)\(?\s*['"]([-\w\s\d]+)['"](.*?)\)?\s*%>/gm;
   var matches = jQuery('#page_objects_' + parent_key).val().match(regex);
   if (matches) {
@@ -382,22 +373,22 @@ function scanForPageObjects(page_id, parent_key, version) {
       }
     });
   }
-  
+
   // remove the cruft
   jQuery.each(cmsPageObjects, function(key, val) {
-    if (cmsPageObjects[key] != found[key]) {
+    if (cmsPageObjects[parent_key][key] != found[key]) {
       obj_key = val + '_container_obj-' + val + '-' + key.replace(/[^\w]/g, '_');
       while (jQuery('#' + obj_key).length > 0) {
         jQuery('#' + obj_key).remove();
       }
-      cmsPageObjects[key] = null;
+      cmsPageObjects[parent_key][key] = null;
     }
   });
   
   // bring in the new
   jQuery.each(found, function (key, val) {
-    if (!cmsPageObjects[key]) {
-      cmsPageObjects[key] = val;
+    if (!cmsPageObjects[parent_key][key]) {
+      cmsPageObjects[parent_key][key] = val;
       jQuery.get('/manage/cms_pages/' + page_id + '/insert_page_object_config?version= ' + version +
                  '&name=' + key + '&type=' + val + '&parent_key=' + parent_key);
     }

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

@@ -34,13 +34,56 @@ div.auto_complete ul strong.highlight {
 
 
 /** column browser **/
+#columnBrowserContainer {
+    width: 100%; max-height: 90vh;
+    overflow: auto;
+    border: 1px solid gray;
+    border-width: 0 0 0 1px;
+}
+#columnBrowserToolbar {
+    background-color: #ddd;
+    padding: 5px 4px 0;
+    margin: 0 0 5px;
 
+    a {
+        margin-left: 2px;
+    }
+    a:first-child { margin-left: 0; }
+}
+.cb_column {
+    overflow: auto;
+    float: left;
+    border: 1px solid gray;
+    border-width: 1px 1px 1px 0;
+}
 .cb_item {
+    position: relative;
     color: black;
-    padding-left: 2px;
-}
+    padding: 2px;
+    width: calc(100% - 22px);
+    overflow: hidden;
+    float: left;
+    cursor: pointer;
+
+    img { position: absolute; left: 5px; top: 5px; }
+    span {
+        display: block;
+        padding: 2px 0px 2px 20px;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;      
+    }
+  }
 
 .cb_item.cb_item_selected {
     color: white;
     background-color: #506D91;
 }
+
+.cb_item.cb_item_offline {
+    color: gray;
+}
+.cb_item.cb_item_offline.cb_item_selected {
+    color: lightgray;
+}

data/app/controllers/cms/content_controller.rb

@@ -268,7 +268,7 @@ module Cms # :nodoc:
     def rss_feed
       min_time = Time.rfc2822(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
       if min_time && (Time.now - min_time) < 5.minutes
-        render text: '', status: '304 Not Modified' and return
+        render plain: '', status: '304 Not Modified' and return
       end
       
       @@cms_page_table_exists ||= CmsPage.table_exists?
@@ -292,7 +292,7 @@ module Cms # :nodoc:
         
         if min_time && @most_recent_pub_date.published_date && @most_recent_pub_date.published_date <= min_time
           # use cached version
-          render text: '', status: '304 Not Modified' and return
+          render plain: '', status: '304 Not Modified' and return
         end
         
         @pages.each_with_index do |page, index|

data/app/controllers/manage/cms_pages_controller.rb

@@ -448,10 +448,10 @@ class Manage::CmsPagesController < Manage::ApplicationController
         logger.error(e)
       end
     end
-    
-    render nothing: true
+
+    render plain: 'success'
   end
-  
+
   #
   # helpers
   #
@@ -475,12 +475,23 @@ class Manage::CmsPagesController < Manage::ApplicationController
       focusOnLoad = !defined?(@cms_text_editor_placed)
       @cms_text_editor_placed = true
       content = ''.html_safe
-      content << text_area(:page_objects, key, { :dojoType => 'Editor2', :toolbarGroup => 'main', :isToolbarGroupLeader => 'false',
-                            :focusOnLoad => focusOnLoad.to_s, :style => 'border: 2px dashed gray; padding: 5px',
-                            :minHeight => '100px' }.update(html_options))
-      content << content_tag(:div, ''.html_safe, :id => "page_object_config_#{key}")
-      content << javascript_tag("jQuery(document).ready(function () { scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version}); });")
-      content << observe_field("page_objects_#{key}", :function => "scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});", :frequency => 2)
+      content << text_area(:page_objects, key,
+                           { dojoType: 'Editor2', toolbarGroup: 'main', isToolbarGroupLeader: 'false',
+                             focusOnLoad: focusOnLoad.to_s, style: 'border: 2px dashed gray; padding: 5px',
+                             minHeight: '100px' }.update(html_options))
+      content << content_tag(:div, '', id: "page_object_config_#{key}")
+      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);
+          });
+        </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
@@ -1275,35 +1286,35 @@ class Manage::CmsPagesController < Manage::ApplicationController
   protected
     
     def check_permissions
-      if !user_has_permission?(:manage_cms)
-        render '/imagine_cms/errors/permission_denied', :layout => false
+      unless user_has_permission?(:manage_cms)
+        render '/imagine_cms/errors/permission_denied', layout: false
         return false
       end
     end
 
     def validate_user_access
-      unless @user.cms_allowed_sections.to_s.strip.blank?
-        allowed_sections = @user.cms_allowed_sections.split(',').map { |s| s.strip }.reject { |s| s.blank? }
+      unless (allowed_sections_str = @user.cms_allowed_sections.to_s.strip).blank?
+        allowed = false
+        allowed_sections = allowed_sections_str.split(',').map(&:strip).reject(&:blank?)
         if @pg
           path = '/' + @pg.path
+          allowed_sections.each { |s| allowed ||= (path =~ /^#{s}/) }
         else
-          parent = CmsPage.find_by_id(params[:parent_id] || params[:pg][:parent_id]) rescue nil
-          return false if !parent
-          path = '/' + parent.path
+          if (parent = CmsPage.find_by_id(params[:parent_id] || params[:pg][:parent_id]) rescue nil)
+            path = '/' + parent.path
+            allowed_sections.each { |s| allowed ||= (path =~ /^#{s}/) }
+          end
         end
-        
-        allowed = false
-        allowed_sections.each { |s| allowed ||= (path =~ /^#{s}/) }
-        
-        if !allowed
+
+        unless allowed
           respond_to do |wants|
-            wants.js    { render :text => "Sorry, you don't have permission to edit this page."         }
-            wants.html  { redirect_to "/#{@pg.path}#{@pg.path == '' ? '' : '/'}version/#{@pg.version}"  }
+            wants.js    { render plain: 'Sorry, you don\'t have permission to edit this page.' }
+            wants.html  { redirect_to "/#{@pg.path}#{@pg.path == '' ? '' : '/'}version/#{@pg.version}" }
           end
           return false
         end
       end
-      
+
       true
     end
 

data/app/helpers/cms_application_helper.rb

@@ -813,17 +813,21 @@ module CmsApplicationHelper
     default_value = Time.parse(default_value) if default_value.is_a?(String)
     default_value ||= start_date
     
-    draw_calendar = "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})"
-    
-    ret = <<EOF
+    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})
+        });
+      EOT
+
+    ret = <<-EOT
   <span><a href="#" onclick="showDatePicker('#{object}', '#{method_prefix}'); return false;"><span id="date_picker_#{object}_#{method_prefix}_value" style="font-weight: normal;">#{default_value.strftime('%a %m/%d/%y')}</span></a></span>
   <span id="date_picker_#{object}_#{method_prefix}icon"><a href="#" onclick="showDatePicker('#{object}', '#{method_prefix}'); return false;"><img src="/assets/management/icon_time.gif" style="float: none" alt="date picker" /></a></span>
   <div id="date_picker_#{object}_#{method_prefix}main" style="display: none; background-color: white; border: 1px solid gray; padding: 3px; z-index: 101;" class="date-picker-main">
@@ -847,7 +851,7 @@ module CmsApplicationHelper
         <a href="#" onclick="hideDatePicker('#{object}', '#{method_prefix}'); return false;">Close</a>
     </div>
   </div>
-EOF
+EOT
     ret += javascript_tag(draw_calendar)
     ret.html_safe
   end

data/app/mailers/imagine_cms_mailer.rb

@@ -6,7 +6,7 @@ class ImagineCmsMailer < ActionMailer::Base
     @page_version = page_version
     @recipient = recipient
     @sender = sender
-    @change_description = change_description
+    @change_description = change_description # not currently used
     
     mail(to: recipient.email_address, reply_to: (sender.email_address.blank? ? nil : sender.email_address),
          from: "#{sender.first_name} #{sender.last_name} <#{CmsRequestReviewEmailSender}>",

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

@@ -1,11 +1,6 @@
 <%#= javascript_tag 'var djConfig = { isDebug: true };' %>
 
-<script type="text/javascript">
-    var load_dojo = false;
-    if (<%= @load_dojo || 'false' %>) {
-      load_dojo = true;
-    }
-    
+<script>
     function readCookie(name) {
         var ca = document.cookie.split(';');
         for (var i=0; i < ca.length; i++) {
@@ -19,14 +14,19 @@
     function loggedIn() {
         return readCookie('user_auth_status') == 'authenticated';
     }
-    
+</script>
+<script type="text/javascript" async>
+    var load_dojo = false;
+    if (<%= @load_dojo || 'false' %>) {
+      load_dojo = true;
+    }
+
     if (loggedIn() || load_dojo) {
         document.writeln('<scr' + 'ipt src="/assets/dojo/dojo.js" type="text/javascript"></scr' + 'ipt>');
         document.writeln('<link href="/assets/imagine_controls.css" media="screen" rel="stylesheet" type="text/css" />')
     }
 </script>
-
-<script type="text/javascript">
+<script type="text/javascript" async>
     if (loggedIn()) {
         dojo.require("dojo.widget.Editor2");
         dojo.require("dojo.widget.Editor2Plugin.TableOperation");

data/app/views/imagine_cms_mailer/request_review.text.erb

@@ -3,8 +3,6 @@
 Title:   <%= @page_title %>
 URL:     <%= @page_url %>
 Version: <%= @page_version %>
-Description of change:
-<%= @change_description %>
 
 View/approve this change:
 <%= @page_url %>/version/<%= @page_version %>

data/app/views/layouts/management.html.erb

@@ -47,13 +47,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     
     <title><%= controller.controller_path.split('/').concat([ params[:action] ]).map { |s| s.titlecase }.join(' > ') %></title>
-    <%- if is_logged_in_user? -%>
-      <script src="/assets/dojo/dojo.js" type="text/javascript"></script>
-    <%- end -%>
     <%= stylesheet_link_tag "application", media: "all" %>
     <%= stylesheet_link_tag "management", media: "all" %>
     <%= javascript_include_tag "application" %>
-    
+
+    <%- if is_logged_in_user? -%>
+      <script src="/assets/dojo/dojo.js" type="text/javascript"></script>
+    <%- end -%>
+
     <%= csrf_meta_tag %>
   </head>
   

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

@@ -172,8 +172,13 @@
             <div style="position: relative;">
               <%= text_field_tag :custom_attribute_name, '', class: 'form', style: 'margin-bottom: 4px;', placeholder: '[ attribute name ]' %>
               <div id="custom_attribute_name_auto_complete" class="auto_complete" style="display: none;"></div>
-              <%= javascript_tag "$('custom_attribute_name').onkeydown = disableEnterKey; new Autocompleter.Local('custom_attribute_name', 'custom_attribute_name_auto_complete', attrlist, { frequency: 0.1, minChars: 1 });" %>
-              
+              <script type="text/javascript">
+                window.addEventListener('DOMContentLoaded', (event) => {
+                  $('custom_attribute_name').onkeydown = disableEnterKey;
+                  new Autocompleter.Local('custom_attribute_name', 'custom_attribute_name_auto_complete', attrlist, { frequency: 0.1, minChars: 1 });
+                });
+              </script>
+
               <%= button_to_function 'Add', "new Ajax.Updater('custom_attributes', '#{url_for(controller: '/manage/cms_pages', action: 'page_attribute')}?name=' + $('custom_attribute_name').value, {asynchronous:true, method:'get', evalScripts:true, insertion:Insertion.Bottom}); $('custom_attribute_name').value = ''; return false;", class: 'form_button', style: 'margin-bottom: 5px;' %>
             </div>
           </td>
@@ -196,7 +201,7 @@
   </tr>
 </table>
 <% end -%>
-<<script type="text/javascript">
+<script type="text/javascript">
   jQuery('#pg_cms_template_id').change(function () {
     jQuery.get('<%= url_for(action: 'show_template_options', id: @pg) %>?template_id=' + jQuery(this).val(), null, function (data) {
       jQuery('#edit_page_template_options').html(data);

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

@@ -1,8 +1,29 @@
-<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('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 %>', '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' %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for action: 'edit_page_content', id: list_page %>'; $('delete_link').href = '<%=raw url_for action: 'delete_page', id: list_page.id %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for action: 'list_pages', level: @page_level + 1, parent_id: list_page.id %>\');', 200);" ondblclick="$('edit_content_link').click();">
-  <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.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page.name %></td>
-    </tr>
-  </table>
+<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('#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').off('click');
+    jQuery('#new_link').on('click', () => {
+      editProperties('<%=raw url_for action: 'new', mode: 'ajax_new', parent_id: list_page %>', 'Create New Page under /<%= list_page.path %>');
+      return false;
+    });
+    jQuery('#edit_link').off('click');
+    jQuery('#edit_link').on('click', () => {
+      editProperties('<%=raw url_for action: 'edit_page', id: list_page, mode: 'ajax_edit' %>', 'Page Properties: <%= list_page.name %>');
+      return false;
+    });
+    jQuery('#edit_content_link').prop('href', '<%=raw url_for action: 'edit_page_content', id: list_page %>');
+    jQuery('#delete_link').prop('href', '<%=raw url_for action: 'delete_page', id: list_page.id %>');
+    setTimeout(() => {
+      cbSelectItem('#cb_item_<%= list_page.id %>', <%= @page_level %>, '<%=raw url_for action: 'list_pages', level: @page_level + 1, parent_id: list_page.id %>');
+    }, 200);
+  });
+  jQuery('#cb_item_<%= list_page.id %>').on('dblclick', (event) => {
+    location.href = jQuery('#edit_content_link')[0].href;
+    return false;
+  });
+</script>

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

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

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

@@ -177,12 +177,12 @@
 </div>
 
 <script type="text/javascript">
-  var displayAsList = jQuery('#page_objects_<%= key %>-style-display-as_list').checked;
-  jQuery('.page_list_<%= key %>_list_option').toggle(displayAsList);
-  jQuery('.page_list_<%= key %>_calendar_option').toggle(!displayAsList);
-  
   // reattach to a safe place in the DOM (away from styled regions)
-  jQuery(document).ready(function () {
+  window.addEventListener('DOMContentLoaded', (event) => {
+    var displayAsList = jQuery('#page_objects_<%= key %>-style-display-as_list').checked;
+    jQuery('.page_list_<%= key %>_list_option').toggle(displayAsList);
+    jQuery('.page_list_<%= key %>_calendar_option').toggle(!displayAsList);
+
     jQuery('#page_list_<%= key %>').appendTo(jQuery('#page_content_form')[0]);
     jQuery('#page_objects_<%= key %>-style-display-as_list').click(function () {
       jQuery('.page_list_<%= key %>_list_option').show();

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

@@ -8,11 +8,15 @@
         <%= text_field(:page_objects, "#{key}-sources-tag#{i}", :class => 'form', :style => 'margin: 0; padding: 2px; border: 1px solid gray; width: 98%;') %>
         
         <div id="page_objects_<%= key %>-sources-tag<%= i %>_auto_complete" class="auto_complete" style="display: none;"></div>
-        <%= javascript_tag "new Autocompleter.Local('page_objects_#{key}-sources-tag#{i}', 'page_objects_#{key}-sources-tag#{i}_auto_complete', taglist, { frequency: 0.1, minChars: 1 })" %>
+        <script type="text/javascript">
+          window.addEventListener('DOMContentLoaded', (event) => {
+            new Autocompleter.Local('page_objects_<%= key %>-sources-tag<%= i %>', 'page_objects_<%= key %>-sources-tag<%= i %>_auto_complete', taglist, { frequency: 0.1, minChars: 1 });
+          });
+        </script>
       </td>
       <td>
         <%= select(:page_objects, "#{key}-sources-tag#{i}-behavior", [ 'include', 'exclude', 'require' ], {}, :class => 'form', :style => 'margin: 0; padding: 1px; border: 1px solid gray; width: 100%;') %>
       </td>
     </tr>
   </table>
-</div>
+</div>

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" async>
+  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,23 +1,18 @@
 <%
   cbNumColumns = 0;
-  cbColWidth = 170;
+  cbColWidth = 200;
   cbColHeight = 200;
-  cbBorderWidth = 1;
-  cbColWidthFull = 172;
 -%>
-<%= javascript_tag <<-EOF
+<script type="text/javascript">
   dojo.require("dojo.widget.*");
   dojo.require("dojo.widget.Dialog");
   
-  cbColWidth = '#{cbColWidth}px';
-  cbColHeight = '#{cbColHeight}px';
-  cbBorderWidth = '#{cbBorderWidth}px';
-  cbColWidthFull = '#{cbColWidthFull}';
-EOF
-%>
+  window.cbColWidth = <%= cbColWidth %>;
+  window.cbColHeight = <%= cbColHeight %>;
+</script>
 
 <div id="columnBrowserContainer" style="width: 100%; height: <%= cbColHeight + 20 %>px; overflow: auto;">
-  <div id="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
+  <div id="columnBrowser" style="width: <%= (cbColWidth+1) * @page_levels.size %>px;">
     <% @page_levels.each_with_index do |name, i| %>
       <%
         if !name.blank?
@@ -42,7 +37,7 @@ EOF
           break_flag = true
         end
       -%>
-      <div id="columnBrowserLevel<%= i %>" style="width: <%= cbColWidth %>px; height: <%= cbColHeight %>px; overflow: auto; float: left; border: <%= cbBorderWidth %>px solid gray;">
+      <div id="columnBrowserLevel<%= i %>" class="cb_column">
         <% if i == 0 -%>
           <%= render :partial => 'list_page_select', :locals => { :list_page_select => CmsPage.find(1) } %>
         <% else -%>

data/docker-compose.yml

@@ -5,11 +5,11 @@ services:
     build: .
     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:

data/docker/conf/nginx-vhost.conf.template

@@ -6,7 +6,7 @@ server {
     passenger_enabled on;
     passenger_user app;
 
-    passenger_ruby /usr/bin/ruby2.5;
+    passenger_ruby /usr/bin/ruby2.6;
     passenger_env_var MYSQL_HOST '$MYSQL_HOST';
     passenger_env_var REDIS_URL '$REDIS_URL';
 

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

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "5.2.1"
+  VERSION = "5.2.2"
 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.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails