imagine_cms 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463afd9f9daba1b0c0a16f0df7fd8e70a0c990d9bfad455cd65fccfc2c06d71c
-  data.tar.gz: 515cb433392199c789c3557ab622c5819df8d851f4f165433bfd0e0bd6ca289c
+  metadata.gz: ccebbb2a50cfd351fdb4f1732d9a1962064dc6a1036308612db3b8c7c53b23cd
+  data.tar.gz: b03bd71743e5fd6b7a659d820f98a0ffbd4a9249160356a9504213d9abf697c7
 SHA512:
-  metadata.gz: dbffc87ab7a4088661650784ba2114cf09d0533866f23b05be424ef3bd6fb39e0e646becae7e96026f4b3323a81b1a18d9768a5ba0e0ff2501d47cbbfc77415e
-  data.tar.gz: 6812f71fcff897f94907b4f101fdecdc3569f2f42a117cef95cd7c81bedd4e65b386c9ac478db788919953abc300504d06ddb8325fc6d14e5e76a29b2a6ffd66
+  metadata.gz: dfb6e1131fe106b647f50025c6513b61422da2502acbc5f2d6623200f392f8f01a178b5bb6a918f8230b4daec3000334776c9738bda36173cb3805e1c38e0640
+  data.tar.gz: 4e2982264ebc4bccb7c169542fc5e8ae33001b6ffccf88f66d65ce413821e1e9410a754799f2a40265afa5a5e155b636ffa5f2c71c6a528f22898b7098316032

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

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

data/app/controllers/manage/cms_pages_controller.rb

@@ -483,7 +483,6 @@ class Manage::CmsPagesController < Manage::ApplicationController
       script_tag = <<-EOT
         <script type="text/javascript">
           window.addEventListener('load', (event) => {
-            scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});
             setInterval(function() {
               scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});
             }, 1000);
@@ -491,7 +490,6 @@ class Manage::CmsPagesController < Manage::ApplicationController
         </script>
         EOT
       content << script_tag.html_safe
-        # content << observe_field("page_objects_#{key}", function: "scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});", frequency: 2)
       content
     when :page_list
       # set defaults unless values are present in template

data/app/helpers/cms_application_helper.rb

@@ -814,17 +814,15 @@ module CmsApplicationHelper
     default_value ||= start_date
     
     draw_calendar = <<-EOT
-      window.addEventListener('DOMContentLoaded', (event) => {
-        new Ajax.Updater('date_picker_#{object}_#{method_prefix}_days',
-                           '#{date_picker_url}?month=' + $('#{object}_#{method_prefix}_month_sel').value +
-                           '&year=' + $('#{object}_#{method_prefix}_year_sel').value +
-                           '&min_time=' + #{start_date.to_i} +
-                           '&max_time=' + #{end_date.to_i} +
-                           '&exclude_days=#{exclude_days.join(',')}' +
-                           '&onchange=#{escape_javascript(options[:onchange])}' +
-                           '&object=#{object}' +
-                           '&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true})
-        });
+      new Ajax.Updater('date_picker_#{object}_#{method_prefix}_days',
+                       '#{date_picker_url}?month=' + $('#{object}_#{method_prefix}_month_sel').value +
+                       '&year=' + $('#{object}_#{method_prefix}_year_sel').value +
+                       '&min_time=' + #{start_date.to_i} +
+                       '&max_time=' + #{end_date.to_i} +
+                       '&exclude_days=#{exclude_days.join(',')}' +
+                       '&onchange=#{escape_javascript(options[:onchange])}' +
+                       '&object=#{object}' +
+                       '&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true});
       EOT
 
     ret = <<-EOT
@@ -852,7 +850,17 @@ module CmsApplicationHelper
     </div>
   </div>
 EOT
-    ret += javascript_tag(draw_calendar)
+    ret += <<-EOT
+      <script type="text/javascript">
+        if (typeof(Ajax) == 'undefined') {
+          window.addEventListener('DOMContentLoaded', (event) => {
+            #{draw_calendar}
+          });
+        } else {
+          #{draw_calendar}
+        }
+      </script>
+      EOT
     ret.html_safe
   end
   

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

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

data/app/views/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/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/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/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "5.2.2"
+  VERSION = "5.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails