imagine_cms 5.2.0 → 5.2.5

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,21 @@ 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) => {
+            setInterval(function() {
+              scanForPageObjects(#{@pg.id}, '#{key}', #{@pg.version});
+            }, 1000);
+          });
+        </script>
+        EOT
+      content << script_tag.html_safe
       content
     when :page_list
       # set defaults unless values are present in template
@@ -574,7 +583,7 @@ class Manage::CmsPagesController < Manage::ApplicationController
       FileUtils.cp(data.path(), localfile)
     end
     
-    finish_upload_status "'#{File.basename(localfile)}'"
+    render json: { filename: File.basename(localfile) }.to_json
   end
   
   def crop_image
@@ -1275,35 +1284,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

@@ -548,19 +548,7 @@ module CmsApplicationHelper
     
     temp.html_safe
   end
-  
-  # override this method to do your own custom subtitutions
-  def substitute_placeholders_custom(temp, page)
-    # an example:
-    # begin
-    #   temp.gsub!(/<#\s*upcoming_event_date\s*#>/, page.article_date.strftime("<span class=\"month\">%b</span><span class=\"day\">%d</span>"))
-    # rescue
-    # end
-    
-    # remember to return your modified copy of temp
-    temp
-  end
-  
+ 
   
   def template_option(name, type = :string)
     return nil unless @pg
@@ -813,17 +801,19 @@ 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
+      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,8 +837,18 @@ module CmsApplicationHelper
         <a href="#" onclick="hideDatePicker('#{object}', '#{method_prefix}'); return false;">Close</a>
     </div>
   </div>
-EOF
-    ret += javascript_tag(draw_calendar)
+EOT
+    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
   
@@ -1050,7 +1050,7 @@ EOF
   
   
   def cropper_image_tag(options)
-    ret = "<img id=\"testImage\" src=\"/assets/#{options[:url]}\" />".html_safe
+    ret = "<img id=\"testImage\" src=\"/assets/#{options[:url]}\" style=\"display: block; position: relative;\" />".html_safe
     ret += javascript_tag("cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });")
   end
   

data/app/helpers/cms_custom_helper.rb

@@ -0,0 +1,13 @@
+module CmsCustomHelper
+  # override this method to do your own custom subtitutions
+  def substitute_placeholders_custom(temp, _page)
+    # an example:
+    # begin
+    #   temp.gsub!(/<#\s*upcoming_event_date\s*#>/, page.article_date.strftime("<span class=\"month\">%b</span><span class=\"day\">%d</span>"))
+    # rescue
+    # end
+
+    # remember to return your modified copy of temp
+    temp
+  end
+end

data/app/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/_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/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,13 +14,18 @@
     function loggedIn() {
         return readCookie('user_auth_status') == 'authenticated';
     }
-    
+</script>
+<script type="text/javascript">
+    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">
     if (loggedIn()) {
         dojo.require("dojo.widget.Editor2");

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/_create_file_link.html.erb

@@ -4,17 +4,30 @@
 -%>
 <%= javascript_tag <<-EOF
 var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
-linkNode = dojo.withGlobal(curInst.window, "getAncestorElement", dojo.html.selection, ['a']);
+var linkNode = dojo.withGlobal(curInst.window, "getAncestorElement", dojo.html.selection, ['a']);
+var html = '';
 
 curInst.restoreSelection();
 
+var removeInvalidTags = function(html) {
+  var el = document.createElement('div');
+  el.innerHTML = html;
+  ['script', 'title'].forEach(function(tag) {
+    el.querySelectorAll(tag).forEach(function(del) { del.remove(); });
+  });
+  return el.innerHTML;
+};
+
 if (!linkNode) {
-    var html = dojo.withGlobal(curInst.window, 'getSelectedHtml', dojo.html.selection);
+    html = dojo.withGlobal(curInst.window, 'getSelectedHtml', dojo.html.selection);
 } else {
-    var html = linkNode.innerHTML;
+    html = linkNode.innerHTML;
     dojo.withGlobal(curInst.window, 'selectElement', dojo.html.selection, [linkNode]);
 }
 
+html = removeInvalidTags(html).trim();
+if (html === '') html = "Link Text";
+
 curInst.execCommand('inserthtml', '<a href=\"#{page_file_path(@pg, @filename)}\" class=\"file-#{ext}\" target=\"_blank\">'+html+'</a>');
 cancelInsertFile();
 EOF

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

@@ -197,7 +197,7 @@ Pressing "Save Feature Image" will crop the image and set it as the new feature
       </tr>
     </table>
     
-    <%= submit_tag 'Save Feature Image', :class => 'form_button', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= submit_tag 'Save Feature Image', :class => 'form_button', data: { disable_with: 'Saving...' } %>
     <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
   <%- end -%>
 </center>

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

@@ -1,25 +1,27 @@
 <script type="text/javascript">
+    window.scrollTo(0,0);
+
     var resize_ratio = 1.0;
     var aspect_ratio = <%= @width %>.0 / <%= @height %>;
     var imageSizeLocked = false;
-    
+
     try {
         if (cropper) cropper.remove();
     } catch (e) {}
-    
+
     deselectAllPresets = function() {
         jQuery('input[type=radio].image-size-preset').attr('checked', false);
     }
-    
+
     onEndCrop = function (coords, dimensions) {
         if (dimensions.width > 0 && dimensions.height > 0) {
             var size_changed = false;
-            
+
             $('image_x1').value = coords.x1;
             $('image_y1').value = coords.y1;
             $('image_x2').value = coords.x2;
             $('image_y2').value = coords.y2;
-            
+
             if (dimensions.width != $('image_width').value) {
                 $('image_width').value = dimensions.width;
                 size_changed = true;
@@ -28,14 +30,14 @@
                 $('image_height').value = dimensions.height;
                 size_changed = true;
             }
-            
+
             if (size_changed) {
                 setResizeRatio();
                 aspect_ratio = 1.0 * dimensions.width / dimensions.height;
-                
+
                 $('selection_x2').value = dimensions.width;
                 $('selection_y2').value = dimensions.height;
-                
+
                 if (!imageSizeLocked) {
                     if (resize_ratio) {
                         $('image_max_width').value = Math.round(dimensions.width * resize_ratio);
@@ -45,12 +47,12 @@
                         $('image_max_height').value = dimensions.height;
                     }
                 }
-                
+
                 $('aspect_ratio').innerHTML = setPrecision(dimensions.width/dimensions.height, 3);
             }
         }
     }
-    
+
     resizeCropper = function () {
         width = $('selection_x2').value;
         height = $('selection_y2').value;
@@ -63,10 +65,10 @@
         cropper.selArea.show();
         cropper.drawArea();
         cropper.endCrop();
-        
+
         setResizeRatio();
     }
-    
+
     resizeCropperScaled = function () {
         if (imageSizeLocked) {
             width = parseInt($('image_max_width').value);
@@ -81,37 +83,37 @@
             resizeCropper();
         }
     }
-    
+
     setResizeRatio = function () {
         crop_width = parseInt($('image_max_width').value);
         selection_width = parseInt($('selection_x2').value); // this is correct... x2 is the sel width
-        
+
         if (crop_width > 10 && selection_width > 10) {
             resize_ratio = 1.0 * $('image_max_width').value / $('selection_x2').value;
         } else {
             resize_ratio = 1.0;
         }
     }
-    
+
     lockImageSize = function () {
         imageSizeLocked = true;
         cropper.options.ratioDim = { x: parseInt($('image_max_width').value),
                                      y: parseInt($('image_max_height').value) };
         reloadCropper();
-        
+
         $('icon_unlocked').hide();
         $('icon_locked').show();
     }
-    
+
     unlockImageSize = function () {
         imageSizeLocked = false;
         cropper.options.ratioDim = { x: 0, y: 0 };
         reloadCropper();
-        
+
         $('icon_locked').hide();
         $('icon_unlocked').show();
     }
-    
+
     reloadCropper = function () {
         oldOptions = cropper.options;
         oldOptions.displayOnInit = 1;
@@ -126,13 +128,13 @@
         cropper.remove();
         cropper = new Cropper.Img('testImage', oldOptions);
     }
-    
+
     recalculateWidth = function () {
         if (imageSizeLocked) {
             $('image_max_width').value = Math.round(parseInt($('image_max_height').value) / aspect_ratio);
         }
     }
-    
+
     recalculateHeight = function () {
         if (imageSizeLocked) {
             $('image_max_height').value = Math.round(parseInt($('image_max_width').value) / aspect_ratio);
@@ -161,10 +163,10 @@ Pressing "Save Image" will crop the image and insert it into the page.
             <legend>Adjust Crop:</legend>
             <%= text_field :selection, :x2, :size => 3, :onkeyup => "resizeCropper();" %> x <%= text_field :selection, :y2, :size => 3, :onkeyup => "resizeCropper();" %>
           </fieldset>
-          
+
           <fieldset style="padding: 10px 15px; text-align: center;">
             <legend>Output Image Dimensions</legend>
-            
+
             <%- if defined?(CmsImageCropPresets) -%>
             <div style="text-align: left; margin-bottom: 20px;">
               <strong>Presets:</strong><br>
@@ -174,17 +176,17 @@ Pressing "Save Image" will crop the image and insert it into the page.
               <%- end -%>
             </div>
             <%- end -%>
-            
+
             <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "deselectAllPresets(); recalculateHeight();" %>
              x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "deselectAllPresets(); recalculateWidth();" %>
             <%= javascript_tag "$('image_max_width').onkeydown = disableEnterKey; $('image_max_height').onkeydown = disableEnterKey;" %>
-            
+
             <%= image_tag('management/icon_unlocked.png', :id => 'icon_unlocked', :onclick => "deselectAllPresets(); lockImageSize();") %>
             <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "deselectAllPresets(); unlockImageSize();", :style => 'display: none;') %>
-            
+
             <%= link_to_function "Apply", "resizeCropperScaled();" %> |
             <%= link_to_function "Reset", "cropper.reset(); resize_ratio = 1.0;" %>
-            
+
             <span id="aspect_ratio" style="display: none;"><%= sprintf("%.3f", @aspect_ratio) %></span><br/>
             <%= text_field :image, :x1, :style => "display: none" %>
             <%= text_field :image, :y1, :style => "display: none"  %>
@@ -196,8 +198,8 @@ Pressing "Save Image" will crop the image and insert it into the page.
         </td>
       </tr>
     </table>
-    
-    <%= submit_tag 'Save Image', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+
+    <%= submit_tag 'Save Image', class: 'form_button', style: 'width: 90px;', data: { disable_with: 'Saving...' } %>
     <%= link_to_function "Cancel", "cancelInsertImage();" %>
   <%- end -%>
 </center>