imagine_cms 4.2.4 → 5.2.0

data/app/mailers/imagine_cms_mailer.rb

@@ -0,0 +1,16 @@
+class ImagineCmsMailer < ActionMailer::Base
+  
+  def request_review(page_url, page_title, page_version, recipient, sender, change_description)
+    @page_url = page_url
+    @page_title = page_title
+    @page_version = page_version
+    @recipient = recipient
+    @sender = sender
+    @change_description = change_description
+    
+    mail(to: recipient.email_address, reply_to: (sender.email_address.blank? ? nil : sender.email_address),
+         from: "#{sender.first_name} #{sender.last_name} <#{CmsRequestReviewEmailSender}>",
+         subject: "Request for web site update review")
+  end
+  
+end

data/app/models/cms_page.rb

@@ -106,7 +106,7 @@ class CmsPage < ActiveRecord::Base
       end
     end
     
-    self.search_index = sanitize_index(content)
+    self.search_index = ActionController::Base.helpers.strip_tags(content.gsub('><', '> <'))
   end
   
   def update_index!
@@ -124,33 +124,18 @@ class CmsPage < ActiveRecord::Base
     self.valid?
   end
   
+  # pass a hash to set page attributes in bulk
+  def set_page_attributes(attrs)
+    attrs.each do |key, value|
+      objects.find_or_initialize_by(name: key, obj_type: 'attribute').update_attributes(content: value)
+    end
+  end
+  
   
   def article_date_month ; article_date.strftime("%B")      ; end
   def article_date_mon   ; article_date.strftime("%b")      ; end
   def article_date_day   ; article_date.strftime("%d").to_i ; end
   def article_date_year  ; article_date.strftime("%Y").to_i ; end
   def article_date_yr    ; article_date.strftime("%y").to_i ; end
-  
-  
-  protected
-    
-    def sanitize_index(html)
-      return html if html.blank?
-      if html.index("<")
-        text = ""
-        tokenizer = HTML::Tokenizer.new(html)
-        
-        while token = tokenizer.next
-          node = HTML::Node.parse(nil, 0, 0, token, false)
-          # result is only the content of any Text nodes
-          text << ' ' + node.to_s if node.class == HTML::Text  
-        end
-        # strip any comments, and if they have a newline at the end (ie. line with
-        # only a comment) strip that too, as well as any erb stuff
-        text.gsub(/<!--(.*?)-->[\n]?/m, "").gsub(/\<%.*?%\>/m, '').gsub(/&\w+;/, '').strip
-      else
-        html # already plain text
-      end 
-    end
     
 end

data/app/models/user.rb

@@ -20,7 +20,7 @@ class User < ActiveRecord::Base # :nodoc:
   
   def password=(val) # :nodoc:
     @password = val
-    self.password_hash = User.hash_password(val) if (val ||= "") != ""
+    self.password_hash = self.class.hash_password(val) unless val.blank?
   end
   
   def self.hash_password(val, salt = '') # :nodoc:

data/app/sweepers/cms_content_sweeper.rb

@@ -10,7 +10,7 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
   end
   
   def delete_all_cached_pages
-    cache_dir = File.expand_path(Management::CmsController.page_cache_directory)
+    cache_dir = File.expand_path(Manage::CmsPagesController.page_cache_directory)
     public_dir = File.expand_path("#{Rails.root}/public")
     
     # this could throw Errno::ENOENT
@@ -46,7 +46,7 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
             expire_page controller: 'cms/content', action: 'show', content_path: page.path.split('/')
             
             # then attempt to remove entire directory tree, after sanity check
-            path = File.expand_path(File.join(Management::CmsController.page_cache_directory, page.path))
+            path = File.expand_path(File.join(Manage::CmsPagesController.page_cache_directory, page.path))
             Dir.chdir Rails.root
             Dir.glob(Pathname.new(path).relative_path_from(Pathname.new(Rails.root)).to_s, File::FNM_CASEFOLD).each do |path|
               path = File.realpath(File.expand_path(path, Rails.root))
@@ -62,7 +62,7 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
       else
         FileUtils.rm_r(Dir.glob("#{cache_dir}/*")) rescue Errno::ENOENT
       end
-    rescue Exception => e
+    rescue StandardError => e
       Rails.logger.error "Error while clearing cache: #{e.message}" unless e.is_a?(NoMethodError)
     end
   end

data/app/views/cms/content/_photo_gallery.html.erb

@@ -1,7 +1,7 @@
 <%-
   timeout ||= 0
   captions = []
-  settings = HashObject.new({})
+  settings = OpenStruct.new({})
   path = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, name)
   
   begin
@@ -13,7 +13,7 @@
   timeout = 6
   
   begin
-    settings = HashObject.new(YAML.load(File.open(File.join(path, 'settings.yml')).read))
+    settings = OpenStruct.new(YAML.load(File.open(File.join(path, 'settings.yml')).read))
     timeout = settings.slide_duration.to_i
     autoplay = (settings.autoplay == 'true')
   rescue
@@ -30,7 +30,7 @@
       <table width="100%" id="<%= name %>_image_<%= index %>" class="<%= name %>_image imagine_cms-gallery-image" border="0" cellpadding="0" cellspacing="2" style="<%= index > 0 ? 'display: none;' : '' %>">
         <tr>
           <td align="center" style="vertical-align:middle;">
-            <%= image_tag '/' + image, :style => "border: 7px solid white" %>
+            <%= image_tag "/#{image}?#{File.mtime(File.join(Rails.root, 'public', image)).to_i}", style: "border: 7px solid white" %>
           </td>
         </tr>
       </table>
@@ -70,7 +70,7 @@
   <div class="imagine_cms-gallery-thumbs">
     <%- thumbs.each_with_index do |thumb, index| -%>
       <div id="<%= name %>_thumb_<%= index %>" class="<%= name %>_thumb imagine_cms-gallery-thumb<%= index == 0 ? ' current' : '' %>" onmouseover="$(this).addClassName('current');" onmouseout="$(this).removeClassName('current');" onclick="changeGalleryImage('<%= name %>', <%= index %>);">
-        <%= image_tag '/' + thumb, :width => 39, :height => 39, :style => "float: left;" %>
+        <%= image_tag "/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}", size: '39x39', style: 'float: left;' %>
       </div>
     <%- end -%>
     <br clear="all" />

data/app/views/cms/content/_search_result.html.erb

@@ -9,7 +9,7 @@
         summary ||= excerpt(page.search_index, term_variant, radius: 150)
       end
     end
-  rescue Exception => e
+  rescue StandardError => e
     logger.error "Error creating search index excerpt: #{e}"
   end
   

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

@@ -34,7 +34,7 @@
 </script>
 
 <%- for feed in [].concat(@rss_feeds || []) -%>
-  <%= auto_discovery_link_tag(:rss, { :controller => '/cms/content', :action => 'rss_feed', :page_id => @pg.id, :page_list_name => feed }, :title => feed) if @pg && @pg.id %>
+  <%= auto_discovery_link_tag(:rss, { controller: '/cms/content', action: 'rss_feed', page_id: @pg.id, page_list_name: feed }, title: feed) if @pg && @pg.id %>
 <%- end -%>
 
 <%=raw @cms_head %>

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

@@ -1,28 +1,28 @@
 <%- if params[:action] != 'preview_template' -%>
   <style type="text/css">
-    #mainCCSToolbar { font-family: Arial; font-size: 12px; font-weight: normal; text-transform: none; line-height: 1.2; color: black; }
-    #mainCCSToolbar a { text-transform: none; font-weight: normal; color: black; }
+    #imagine_cms-toolbar { font-family: Arial; font-size: 12px; font-weight: normal; text-transform: none; line-height: 1.2; color: black; }
+    #imagine_cms-toolbar a { text-transform: none; font-weight: normal; color: black; }
   </style>
-  <table id="mainCCSToolbar" cellpadding="0" cellspacing="0" border="0" width="100%" style="display: none">
-    <%- if [ 'content', 'cms' ].include?(controller.controller_name) && params[:action] != 'preview_template' -%>
-      <tr>
-        <td>
+  <div id="imagine_cms-toolbar" style="display: none;">
+    <%- if [ 'cms/content', 'manage/cms_pages' ].include?(controller.controller_path) && params[:action] != 'preview_template' -%>
       <%- if is_editing_page? -%>
         <div dojoType="Editor2" widgetId="main_toolbar" useActiveX="false" htmlEditing="true" focusOnLoad="false"
-          toolbarTemplatePath="<%= url_for :controller => '/management/cms', :action => 'toolbar_edit', :id => @pg, :version => params[:version] %>"
+          toolbarTemplatePath="<%= url_for controller: '/manage/cms_pages', action: 'toolbar_edit', id: @pg, version: params[:version] %>"
           toolbarTemplateCssPath="/assets/dojo/src/widget/templates/EditorToolbarFullFeature.css"
           toolbarAlwaysVisible="true" style="height: 22px; vertical-align: middle" toolbarGroup="main">
         </div>
       <%- else -%>
         <div dojoType="Editor2" widgetId="main_toolbar" useActiveX="false" htmlEditing="false" focusOnLoad="false"
-          toolbarTemplatePath="<%= url_for :controller => '/management/cms', :action => 'toolbar_preview', :id => @pg, :version => params[:version] %>"
+          toolbarTemplatePath="<%= url_for controller: '/manage/cms_pages', action: 'toolbar_preview', id: @pg, version: params[:version] %>"
           toolbarTemplateCssPath="/assets/dojo/src/widget/templates/EditorToolbarFullFeature.css"
           toolbarAlwaysVisible="true" style="height: 25px; vertical-align: middle">
         </div>
       <%- end -%>
-        </td>
-      </tr>
     <%- end -%>
-  </table>
-  <%= javascript_tag "if (loggedIn()) $('mainCCSToolbar').show();" %>
+  </div>
+  <script type="text/javascript">
+    if (loggedIn()) {
+      document.getElementById('imagine_cms-toolbar').style.display = 'block';
+    }
+  </script>
 <%- end -%>

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

@@ -0,0 +1,10 @@
+<%= @sender.name %> (<%= @sender.username %>) has made a change to the web site and requests that the site administrators review and publish the change. (A copy of this request has been sent to each site administrator with a valid email address on file.)
+
+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

@@ -1,12 +1,12 @@
 <%-
-  @nav_sections = []
-  @subnav_sections = []
+  @nav_sections ||= []
+  @subnav_sections ||= []
   
   if is_logged_in_user?
     if user_has_permission?(:manage_cms)
-      @nav_sections << [ 'Pages', { controller: '/management/cms', action: 'pages' } ]
-      @nav_sections << [ 'Templates', { controller: '/management/cms', action: 'templates' } ]
-      @nav_sections << [ 'Snippets', { controller: '/management/cms', action: 'snippets' } ]
+      @nav_sections << [ 'Pages', manage_cms_pages_path ]
+      @nav_sections << [ 'Templates', manage_cms_templates_path ]
+      @nav_sections << [ 'Snippets', manage_cms_snippets_path ]
     end
     if user_has_permission?(:manage_users)
       @nav_sections << [ 'Users', { controller: '/management/users', action: 'index' } ]
@@ -16,6 +16,30 @@
   if defined?(ImagineCmsAdditionalNavSections)
     @nav_sections += ImagineCmsAdditionalNavSections.is_a?(Proc) ? ImagineCmsAdditionalNavSections.call(self) : ImagineCmsAdditionalNavSections
   end
+  
+  if defined?(ImagineCmsAdditionalSubnavSections)
+    @subnav_sections += ImagineCmsAdditionalSubnavSections.is_a?(Proc) ? ImagineCmsAdditionalSubnavSections.call(self) : ImagineCmsAdditionalSubnavSections
+  end
+  
+  #
+  # how to use a Proc to add nav sections:
+  #
+  # ImagineCmsAdditionalNavSections = Proc.new { |context|
+  #   addl_sections = []
+  #
+  #   context.instance_eval {
+  #     if is_logged_in_user?
+  #       if user_has_permission?(:manage_cms)
+  #         nav_sections << [ 'Recipes', { controller: '/management/recipes', action: 'index' } ]
+  #       end
+  #       if user_has_permission?(:manage_members)
+  #         nav_sections << [ 'Members', { controller: '/management/members', action: 'index' } ]
+  #       end
+  #     end
+  #   }
+  #
+  #   addl_sections
+  # }
 -%>
 <!DOCTYPE html>
 <html>

data/app/views/manage/cms/index.html.erb

@@ -0,0 +1,7 @@
+<h2>CMS</h2>
+
+<ul>
+  <li><%= link_to 'Pages', manage_cms_pages_path %></li>
+  <li><%= link_to 'Templates', manage_cms_templates_path %></li>
+  <li><%= link_to 'Snippets', manage_cms_snippets_path %></li>
+</ul>

data/app/views/{management/cms → manage/cms_pages}/_crop_feature_image.html.erb

@@ -7,6 +7,10 @@
         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;
@@ -159,13 +163,24 @@ Pressing "Save Feature Image" will crop the image and set it as the new feature
           </fieldset>
           
           <fieldset style="padding: 10px 15px; text-align: center;">
-            <legend>Final Image Dimensions:</legend>
-            <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "recalculateHeight();" %>
-             x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
+            <legend>Output Image Dimensions</legend>
+            
+            <%- if defined?(CmsFeatureImageCropPresets) -%>
+            <div style="text-align: left; margin-bottom: 20px;">
+              <strong>Presets:</strong><br>
+              <%- CmsFeatureImageCropPresets.each do |name, dimensions| -%>
+                <label><input type="radio" class="image-size-preset" onclick="jQuery('#image_max_width').val(<%= dimensions[0] %>); jQuery('#image_max_height').val(<%= dimensions[1] %>); lockImageSize();">
+                  <%= "#{name} (#{dimensions[0]}x#{dimensions[1]})" %></label><br>
+              <%- 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 => "lockImageSize();") %>
-            <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
+            <%= 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;" %>

data/app/views/{management/cms → manage/cms_pages}/_crop_image.html.erb

@@ -7,6 +7,10 @@
         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;
@@ -159,13 +163,24 @@ Pressing "Save Image" will crop the image and insert it into the page.
           </fieldset>
           
           <fieldset style="padding: 10px 15px; text-align: center;">
-            <legend>Final Image Dimensions:</legend>
-            <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "recalculateHeight();" %>
-             x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
+            <legend>Output Image Dimensions</legend>
+            
+            <%- if defined?(CmsImageCropPresets) -%>
+            <div style="text-align: left; margin-bottom: 20px;">
+              <strong>Presets:</strong><br>
+              <%- CmsImageCropPresets.each do |name, dimensions| -%>
+                <label><input type="radio" class="image-size-preset" onclick="jQuery('#image_max_width').val(<%= dimensions[0] %>); jQuery('#image_max_height').val(<%= dimensions[1] %>); lockImageSize();">
+                  <%= "#{name} (#{dimensions[0]}x#{dimensions[1]})" %></label><br>
+              <%- 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 => "lockImageSize();") %>
-            <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
+            <%= 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;" %>

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

@@ -0,0 +1 @@
+<%= javascript_tag "jQuery('#pg_feature_image_path').val('#{page_image_path(@pg, @image_file)}'); jQuery('#feature_image_preview').css({ 'background-image': 'url(\\\'#{page_image_path(@pg, @image_file)}\\\')' }); cancelSelectThumbnail();" %>

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

@@ -0,0 +1 @@
+<%= javascript_tag "jQuery('#pg_thumbnail_path').val('#{page_image_path(@pg, @image_file)}'); jQuery('#thumbnail_preview').css({ 'background-image': 'url(\\\'#{page_image_path(@pg, @image_file)}\\\')' }); cancelSelectThumbnail();" %>

data/app/views/{management/cms → manage/cms_pages}/_crop_thumb.html.erb

@@ -7,6 +7,10 @@
         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;
@@ -159,13 +163,24 @@ Pressing "Save Thumbnail" will crop the thumbnail and set it as the new thumbnai
           </fieldset>
           
           <fieldset style="padding: 10px 15px; text-align: center;">
-            <legend>Final Image Dimensions:</legend>
-            <%= text_field :image, :max_width, :size => 3, :value => @width, :onchange => "recalculateHeight();" %>
-             x <%= text_field :image, :max_height, :size => 3, :value => @height, :onchange => "recalculateWidth();" %>
+            <legend>Output Image Dimensions</legend>
+            
+            <%- if defined?(CmsThumbnailCropPresets) -%>
+            <div style="text-align: left; margin-bottom: 20px;">
+              <strong>Presets:</strong><br>
+              <%- CmsThumbnailCropPresets.each do |name, dimensions| -%>
+                <label><input type="radio" class="image-size-preset" onclick="jQuery('#image_max_width').val(<%= dimensions[0] %>); jQuery('#image_max_height').val(<%= dimensions[1] %>); lockImageSize();">
+                  <%= "#{name} (#{dimensions[0]}x#{dimensions[1]})" %></label><br>
+              <%- 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 => "lockImageSize();") %>
-            <%= image_tag('management/icon_locked.png', :id => 'icon_locked', :onclick => "unlockImageSize();", :style => 'display: none;') %>
+            <%= 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;" %>

data/app/views/{management/cms → manage/cms_pages}/_edit_page.html.erb

@@ -16,23 +16,23 @@
 
 <div id="save_errors" class="error"></div>
 
-<%= form_remote_tag :url => { :action => 'edit_page', :id => @pg },
-                    :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';" do %>
+<%= form_remote_tag url: { action: 'edit_page', id: @pg },
+                    loading: "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';" do %>
 <table id="dlg-page-properties">
   <col width="120"><col width="*"><col width="5">
-<%- if (@pg.id || 2) > 1 -%>
+<%- if @pg.id != 1 -%>
   <tr>
     <td>Name (for URL):</td>
     <td>
-      <%= text_field :pg, :name, :class => 'form', :style => 'margin-bottom: 0; width: 150px', :onchange => (@pg.new_record? ? '' : "if (!confirm('Are you sure you want to change the name of this page? Any bookmarks or links to this page will no longer work if you proceed with this change.')) { this.value = $('original_name').value; };") %><br/>
-      <%= text_field_tag :original_name, @pg.name, :style => 'display: none' %>
-      <%= text_field :pg, :parent_id, :style => 'display: none' %>
+      <%= text_field :pg, :name, class: 'form', style: 'margin-bottom: 0; width: 150px', onchange: (@pg.new_record? ? '' : "if (!confirm('Are you sure you want to change the name of this page? Any bookmarks or links to this page will no longer work if you proceed with this change.')) { this.value = $('original_name').value; };") %><br/>
+      <%= text_field_tag :original_name, @pg.name, style: 'display: none' %>
+      <%= text_field :pg, :parent_id, style: 'display: none' %>
     </td>
   </tr>
 <%- end -%>
   <tr>
     <td>Page Title:</td>
-    <td><%= text_field :pg, :title, :class => 'form', :style => 'width: 100%;' %></td>
+    <td><%= text_field :pg, :title, class: 'form', style: 'width: 100%;' %></td>
   </tr>
   <%- if @pg.respond_to?(:redirect_enabled) -%>
   <tr>
@@ -60,18 +60,11 @@
   <tr class="page-field">
     <td valign="top"><div style="margin-top: 4px;">Template:</div></td>
     <td>
-      <%= select :pg, :cms_template_id, CmsTemplate.order(:name).map { |t| [ t.name, t.id ] }, {}, :class => 'form', :style => 'width: 100%;' %>
+      <%= select :pg, :cms_template_id, CmsTemplate.order(:name).map { |t| [ t.name, t.id ] }, {}, class: 'form', style: 'width: 100%;' %>
       
       <div id="edit_page_template_options">
-        <%= render :partial => 'template_options' %>
+        <%= render partial: 'template_options' %>
       </div>
-      <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(), function (data) {
-            jQuery('#edit_page_template_options').html(data);
-          });
-        });
-      </script>
     </td>
   </tr>
   <tr>
@@ -80,10 +73,10 @@
       <table border="0" cellpadding="0" cellspacing="0" width="100%">
         <tr>
           <td width="115">
-            <%= date_picker :pg, :article_date, :default_value => (@pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %>
+            <%= date_picker :pg, :article_date, default_value: (@pg.article_date || @pg.created_on || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 5.years.from_now %>
           </td>
           <td width="120">
-            <div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"'.html_safe %>>&ndash; <%= date_picker :pg, :article_end_date, :default_value => (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %></div>
+            <div id="div_article_end_date"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? '' : 'style="display: none"'.html_safe %>>&ndash; <%= date_picker :pg, :article_end_date, default_value: (@pg.article_end_date || @pg.article_date || @pg.created_on || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 5.years.from_now %></div>
           </td>
           <td align="right" width="180">
             <input type="checkbox" id="use_article_date_range" name="use_article_date_range" value="1" onclick="$('div_article_end_date').toggle();"<%= @pg.article_end_date && @pg.article_date != @pg.article_end_date ? ' checked="checked"' : '' %> /><label for="use_article_date_range">Use date range</label>
@@ -94,20 +87,20 @@
   </tr>
   <tr>
     <td valign="middle">Tags:</td>
-    <td><%= text_field_tag :tags, @tags, :class => 'form', :style => 'width: 100%' %></td>
+    <td><%= text_field_tag :tags, @tags, class: 'form', style: 'width: 100%' %></td>
   </tr>
   <tr class="page-field">
     <td>Publish Version:</td>
-    <td><%= select :pg, :published_version, [ [ '[ None (offline) ]', -1 ], [ '[ Latest ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{ts_to_str pg.updated_on}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }), {}, :class => 'form', :style => 'width: 100%' %></td>
+    <td><%= select :pg, :published_version, [ [ '[ None (offline) ]', -1 ], [ '[ Latest ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{ts_to_str pg.updated_on}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }), {}, class: 'form', style: 'width: 100%' %></td>
   </tr>
   <tr>
     <td>Publish Date:</td>
     <td>
       <table border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <td width="120"><%= date_picker :pg, :published_date, :default_value => (@pg.published_date || @pg.created_on || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 2.years.from_now %></td>
+          <td width="120"><%= date_picker :pg, :published_date, default_value: (@pg.published_date || @pg.created_on || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 2.years.from_now %></td>
           <td width="60">Position:</td>
-          <td><%= text_field :pg, :position, :class => 'form', :style => 'width: 20px' %></td>
+          <td><%= text_field :pg, :position, class: 'form', style: 'width: 20px' %></td>
         </tr>
       </table>
     </td>
@@ -118,33 +111,27 @@
       <table border="0" cellpadding="0" cellspacing="0">
         <tr>
           <td width="100"><%= check_box :pg, :expires, {}, 'true', 'false' %><label>Expires on:</label></td>
-          <td width="120"><%= date_picker :pg, :expiration_date, :default_value => (@pg.expiration_date || @pg.published_date || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 2.years.from_now %></td>
+          <td width="120"><%= date_picker :pg, :expiration_date, default_value: (@pg.expiration_date || @pg.published_date || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 2.years.from_now %></td>
         </tr>
       </table>
     </td>
   </tr>
   <tr class="page-field">
     <td valign="top"><div style="margin-top: 4px;">Summary:</div></td>
-    <td><%= text_area :pg, :summary, :class => 'form', :style => 'width: 100%; height: 50px;' %></td>
+    <td><%= text_area :pg, :summary, class: 'form', style: 'width: 100%; height: 50px;' %></td>
   </tr>
   <tr>
-    <td>Thumbnail:</td>
+    <td style="vertical-align: top;">Thumbnail:</td>
     <td>
       <%- if @pg.new_record? -%>
         A thumbnail cannot be added until you save this page.
       <%- else -%>
-        <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
-          <%- if @pg.thumbnail_path.blank? -%>
-            <!-- no thumbnail image selected -->
-          <%- else -%>
-            <%= image_tag(@pg.thumbnail_path, onclick: "jQuery('#pg_thumbnail_path').toggle();") %>
-          <%- end -%>
-        </div>
+        <div id="thumbnail_preview" style="width: 100%; height: 120px; background: url('<%= @pg.thumbnail_path %>') left top no-repeat; background-size: contain;" onclick="jQuery('#pg_thumbnail_path').toggle();"></div>
         <%= button_to_function "Select Thumbnail...",
                                "selectThumbnail('#{url_for action: 'upload_thumb', id: @pg}');",
                                class: 'form_button' %>
         <%- if @pg.thumbnail_path.present? -%>
-          <%= button_to_function "Remove", "jQuery('#thumbnail_preview img').remove(); jQuery('#pg_thumbnail_path').val(''); jQuery(this).remove();", class: 'form_button' %>
+          <%= button_to_function "Remove", "jQuery('#thumbnail_preview').css({ 'background-image': 'none' }); jQuery('#pg_thumbnail_path').val(''); jQuery(this).remove();", class: 'form_button' %>
         <%- end -%>
         <%= text_field :pg, :thumbnail_path, class: 'form', style: 'width: 100%; display: none;' %>
       <%- end -%>
@@ -152,23 +139,17 @@
   </tr>
   <%- if @pg.respond_to?(:feature_image_path) -%>
   <tr>
-    <td>Feature Image:</td>
+    <td style="vertical-align: top;">Feature Image:</td>
     <td>
       <%- if @pg.new_record? -%>
         A feature image cannot be added until you save this page.
       <%- else -%>
-        <div id="feature_image_preview" style="width: 385px; overflow: auto;">
-          <%- if @pg.feature_image_path.blank? -%>
-            <!-- no feature image selected -->
-          <%- else -%>
-            <%= image_tag(@pg.feature_image_path, onclick: "jQuery('#pg_feature_image_path').toggle();") %>
-          <%- end -%>
-        </div>
+        <div id="feature_image_preview" style="width: 100%; height: 120px; background: url('<%= @pg.feature_image_path %>') left top no-repeat; background-size: contain;" onclick="jQuery('#pg_feature_image_path').toggle();"></div>
         <%= button_to_function "Select Feature Image...",
                                "selectThumbnail('#{url_for action: 'upload_feature_image', id: @pg}');",
                                class: 'form_button' %>
         <%- if @pg.feature_image_path.present? -%>
-          <%= button_to_function "Remove", "jQuery('#feature_image_preview img').remove(); jQuery('#pg_feature_image_path').val(''); jQuery(this).remove();", class: 'form_button' %>
+          <%= button_to_function "Remove", "jQuery('#feature_image_preview')..css({ 'background-image': 'none' }); jQuery('#pg_feature_image_path').val(''); jQuery(this).remove();", class: 'form_button' %>
         <%- end -%>
         <%= text_field :pg, :feature_image_path, class: 'form', style: 'width: 100%; display: none;' %>
       <%- end -%>
@@ -178,7 +159,7 @@
   <%- if @pg.respond_to?(:html_head) -%>
   <tr class="page-field">
     <td valign="top"><div style="margin-top: 4px;">HTML Head:<br>(advanced)</div></td>
-    <td><%= text_area :pg, :html_head, :class => 'form', :style => 'width: 100%; height: 35px; overflow: auto;' %></td>
+    <td><%= text_area :pg, :html_head, class: 'form', style: 'width: 100%; height: 35px; overflow: auto;' %></td>
   </tr>
   <%- end -%>
   <tr>
@@ -189,29 +170,36 @@
           <td>Add an attribute: &nbsp;</td>
           <td>
             <div style="position: relative;">
-              <%= text_field_tag :custom_attribute_name, '', :class => 'form', :style => 'margin-bottom: 4px;', :placeholder => '[ attribute name ]' %>
+              <%= 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 });" %>
               
-              <%= button_to_function 'Add', "new Ajax.Updater('custom_attributes', '/manage/cms/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;' %>
+              <%= 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>
         </tr>
       </table>
       <div id="custom_attributes" style="background-color: white; min-height: 40px; overflow: auto; border: 1px solid #aaaaaa">
-        <%- @page_objects.each do |key,val| -%>
+        <%- @page_objects.to_h.each do |key, val| -%>
           <%- key =~ /^obj-(\w+?)-(.+?)$/ -%>
-          <%= render :partial => 'page_attribute', :locals => { :name => $2 } if $1 == 'attribute' %>
+          <%= render partial: 'page_attribute', locals: { name: $2 } if $1 == 'attribute' %>
         <%- end -%>
       </div>
     </td>
   <tr>
     <td></td>
     <td>
-      <%= submit_tag 'Save', :id => 'btn_save', :class => 'form_button', :style => 'width: 70px;' %>
-      <%= link_to_function 'Cancel', "cancelEditProperties();", :style => 'font-weight: normal;' %>
+      <%= submit_tag 'Save', id: 'btn_save', class: 'form_button', style: 'width: 70px;' %>
+      <%= link_to_function 'Cancel', "cancelEditProperties();", style: 'font-weight: normal;' %>
       <%= hidden_field_tag 'return_to', params[:return_to] %>
     </td>
   </tr>
 </table>
 <% end -%>
+<<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);
+    });
+  });
+</script>