imagine_cms 4.1.4 → 4.2.0

data/app/helpers/cms_application_helper.rb

@@ -230,6 +230,7 @@ module CmsApplicationHelper
   
   def page_list_items(pg, key, options = {})
     pages = []
+    single_pages = []
     instance_tags_include = []
     instance_tags_exclude = []
     instance_tags_require = []
@@ -265,7 +266,7 @@ module CmsApplicationHelper
     require_tags = instance_tags_require.map { |t| t.strip }.reject { |t| t.blank? }
     
     if include_tags.empty?
-      include_tags = (options[:include_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
+      include_tags = substitute_placeholders(options[:include_tags] || '', pg).split(',').map { |t| t.strip }.reject { |t| t.blank? }
       include_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -274,7 +275,7 @@ module CmsApplicationHelper
       end
     end
     if exclude_tags.empty?
-      exclude_tags = (options[:exclude_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
+      exclude_tags = substitute_placeholders(options[:exclude_tags] || '', pg).split(',').map { |t| t.strip }.reject { |t| t.blank? }
       exclude_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -283,7 +284,7 @@ module CmsApplicationHelper
       end
     end
     if require_tags.empty?
-      require_tags = (options[:require_tags] || '').split(',').map { |t| t.strip }.reject { |t| t.blank? }
+      require_tags = substitute_placeholders(options[:require_tags] || '', pg).split(',').map { |t| t.strip }.reject { |t| t.blank? }
       require_tags.each do |t|
         i = @page_objects["#{key}-sources-tag-count"]
         @page_objects["#{key}-sources-tag#{i}"] = t
@@ -295,13 +296,13 @@ module CmsApplicationHelper
     # pull all folder content
     folders = []
     for i in 0...@page_objects["#{key}-sources-folder-count"].to_i
-      folders << HashObject.new(:src => @page_objects["#{key}-sources-folder#{i}"].strip,
-                                :expand_folders => @page_objects["#{key}-sources-folder#{i}-expand-folders"])
+      folders << HashObject.new(src: @page_objects["#{key}-sources-folder#{i}"].strip,
+                                expand_folders: @page_objects["#{key}-sources-folder#{i}-expand-folders"])
     end
     folders = folders.reject { |f| f.src.blank? }
     
     if folders.empty?
-      folders = (options[:folders] || '').split(',').map do |f|
+      folders = substitute_placeholders(options[:folders] || '', pg).split(',').map do |f|
         bits = f.strip.split(':')
         
         obj = HashObject.new
@@ -339,12 +340,9 @@ module CmsApplicationHelper
     end
     
     folders.each do |f|
+      logger.debug "Expanding folder #{f.src} (expand_folders: #{f.expand_folders})"
       begin
-        if f.expand_folders && f.expand_folders == 'false'
-          f.src = f.src.slice(1...f.src.length) if f.src.slice(0,1) == '/'
-          parent_page = CmsPage.find_by_path(f.src)
-          pages.concat parent_page.children.includes(:tags).where([ conditions.join(' and ') ].concat(cond_vars)).to_a
-        else
+        if f.expand_folders && f.expand_folders == 'true'  # expand folders (i.e. specified path is prefix)
           if f.src == '/'
             pages.concat CmsPage.includes(:tags).where([ conditions.join(' and ') ].concat(cond_vars))
           else
@@ -355,6 +353,16 @@ module CmsApplicationHelper
             fcond_vars << f.src+'/%'
             pages.concat CmsPage.includes(:tags).where([ fconditions.join(' and ') ].concat(fcond_vars))
           end
+        else
+          f.src = f.src.slice(1...f.src.length) if f.src.slice(0,1) == '/'
+          parent_page = CmsPage.find_by_path(f.src)
+          if parent_page.children.size > 0
+            logger.debug " > Adding children of #{f.src}"
+            pages.concat parent_page.children.includes(:tags).where([ conditions.join(' and ') ].concat(cond_vars)).to_a
+          else
+            logger.debug " > Adding single page #{f.src}"
+            single_pages << parent_page  # user specified a single page, not a folder
+          end
         end
       rescue Exception => e
         logger.debug e
@@ -396,9 +404,9 @@ module CmsApplicationHelper
       index = 0
       result = 0
       while result == 0 && index < keys_with_dir.size
-        key = keys_with_dir[index][0]
-        aval = a.send(key)
-        bval = b.send(key)
+        sort_key = keys_with_dir[index][0]
+        aval = a.send(sort_key)
+        bval = b.send(sort_key)
         
         if !aval
           result = 1
@@ -416,11 +424,21 @@ module CmsApplicationHelper
     end
     
     offset = first_non_empty(@page_objects["#{key}-item-offset"], options[:item_offset], 0).to_i
+    @page_objects["#{key}-item-offset"] = offset
+    
+    logger.debug "Page List Offset: #{offset} / #{pages.size} #{pages.map(&:id)}"
     pages = pages[offset, pages.size] || []
     
+    # since the user selected these pages individually, they expect them to be included (and prioritized!), no matter what
+    # (but make sure they are unique)
+    pages = (single_pages + pages).uniq
+    
     # randomize if requested
     randomize = first_non_empty(@page_objects["#{key}-use-randomization"], options[:use_randomization], 'false').to_s == 'true'
     random_pool_size = first_non_empty(@page_objects["#{key}-random-pool-size"], options[:random_pool_size], '').to_i
+    @page_objects["#{key}-use-randomization"] = randomize
+    @page_objects["#{key}-random-pool-size"] = random_pool_size
+    
     if randomize
       if random_pool_size > 0
         pages = pages.first(random_pool_size)
@@ -433,43 +451,61 @@ module CmsApplicationHelper
       end
     end
     
+    # make options specified in templates/snippets accessible to page list segments and rss feeds
+    @page_objects["#{key}-max-item-count"] = first_non_empty(@page_objects["#{key}-max-item-count"], options[:item_count], pages.size).to_i
+    @page_objects["#{key}-template"] = options[:template] if @page_objects["#{key}-template"].blank?
+    @page_objects["#{key}-use-pagination"] = options[:use_pagination] unless options[:use_pagination].blank?
+    
+    # also make return value accessible to page list segments and rss feeds (so we don't have to do this all again)
+    @page_list_pages ||= {}
+    @page_list_pages[key] = pages
+    
     pages
   end
   
+  def substitute_placeholder(html, page, key, value)
+    val = value
+    
+    html.gsub(/<#\s*#{key}(\..*?)*\s*#>/) do |match|
+      $1.to_s.scan(/\.([\w]+)(\(.*?\))?/).each do |func, args|
+        case func
+        when 'gsub', 'downcase', 'upcase'
+          val = eval(%["#{val}".#{func}#{args}])
+        end
+      end
+      
+      val
+    end
+  end
+  
   def substitute_placeholders(html, page, extra_attributes = {})
     return html unless page
     
     temp = html.dup
     
     # mangle anything inside of an insert_object so that it won't be caught (yet)
-    temp.gsub!(/(insert_object\()((?:\(.*?\)|[^()]*?)*)(\))/) do |match|
+    temp.gsub!(/((?:insert_object|text_editor|texteditor|page_list|pagelist|snippet)\()((?:\(.*?\)|[^()]*?)*)(\))/) do |match|
       one, two, three = $1, $2, $3
       one + two.gsub(/<#/, '<!#') + three
     end
     
     # first, extras passed in args
-    extra_attributes.each do |k,v|
-      temp.gsub!(/<#\s*#{k.to_s}\s*#>/, v.to_s)
-    end
+    extra_attributes.each { |k,v| temp = substitute_placeholder(temp, page, k, v) }
     
     # next, page object attributes and template options (from page properties)
-    page.objects.where(:obj_type => 'attribute').each do |obj|
-      temp.gsub!(/<#\s*#{obj.name}\s*#>/, (obj.content || '').to_s)
-    end
-    page.objects.where(:obj_type => 'option').each do |obj|
-      temp.gsub!(/<#\s*option_#{obj.name.gsub(/[^\w\d]/, '_')}\s*#>/, obj.content || '')
-    end
+    page.objects.where(obj_type: 'attribute').each { |obj| temp = substitute_placeholder(temp, page, obj.name, obj.content) }
+    page.objects.where(obj_type: 'option').each { |obj| temp = substitute_placeholder(temp, page, "option_#{obj.name.gsub(/[^\w\d]/, '_')}", obj.content) }
     
     # path is kind of a special case, we like to see it with a leading /
-    temp.gsub!(/<#\s*path\s*#>/, '/' + (page.path || ''))
+    temp = substitute_placeholder(temp, page, 'path', "/#{page.path}")
     
     # substitute tags in a helpful way
-    temp.gsub!(/<#\s*tags\s*#>/, page.tags.map { |t| t.name }.join(', '))
-    temp.gsub!(/<#\s*tags_as_css_classes\s*#>/, page.tags_as_css_classes)
+    temp = substitute_placeholder(temp, page, 'tags', page.tags.map { |t| t.name }.join(', '))
+    temp = substitute_placeholder(temp, page, 'tags_as_css_classes', page.tags_as_css_classes)
     
     # use full date/time format for created_on and updated_on
-    temp.gsub!(/<#\s*created_on\s*#>/, "#{page.created_on.strftime('%a')} #{date_to_str(page.created_on)} #{time_to_str(page.created_on)}") if page.created_on
-    temp.gsub!(/<#\s*updated_on\s*#>/, "#{page.updated_on.strftime('%a')} #{date_to_str(page.updated_on)} #{time_to_str(page.updated_on)}") if page.updated_on
+    temp = substitute_placeholder(temp, page, 'created_on', "#{page.created_on.strftime('%a')} #{date_to_str(page.created_on)} #{time_to_str(page.created_on)}") if page.created_on
+    temp = substitute_placeholder(temp, page, 'updated_on', "#{page.updated_on.strftime('%a')} #{date_to_str(page.updated_on)} #{time_to_str(page.updated_on)}") if page.updated_on
     
     # handle any custom substitutions
     temp = substitute_placeholders_custom(temp, page)
@@ -494,13 +530,18 @@ module CmsApplicationHelper
         # val = '<!-- attribute not found -->'
         val = ''
       end
-      temp.gsub!(/<#\s*#{attr}\s*#>/, val.to_s)
+      temp = substitute_placeholder(temp, page, attr, val)
     end
-    # temp.gsub!(/<#\s*(.*?)\s*#>/, "<!-- attribute not found -->")
+    
+    # unknown attributes will be simply deleted (unless we enable some kind of substitution debugging in the future)
+    # if SomeKindOfDebuggingEnabled
+    #   temp.gsub!(/<#\s*(.*?)\s*#>/, "<!-- attribute not found -->")
+    # else
     temp.gsub!(/<#\s*(.*?)\s*#>/, '')
+    # end
     
     # unmangle mangled stuff
-    temp.gsub!(/(insert_object\()((?:\(.*?\)|[^()]*?)*)(\))/) do |match|
+    temp.gsub!(/((?:insert_object|text_editor|texteditor|page_list|pagelist|snippet)\()((?:\(.*?\)|[^()]*?)*)(\))/) do |match|
       one, two, three = $1, $2, $3
       one + two.gsub(/<!#/, '<#') + three
     end
@@ -606,7 +647,7 @@ module CmsApplicationHelper
     ret << '</div>'
     
     ret << "<div id=\"#{object_name}_#{method_name}_loading\" class=\"form-loading\" style=\"display: none;\">"
-    ret << "<img src=\"/assets/interface/form_loading.gif\" width=\"16\" height=\"16\" border=\"0\" style=\"margin: 0 1px 1px 0;\" />"
+    ret << image_tag("interface/form_loading.gif", size: '16x16', border: 0, style: "margin: 0 1px 1px 0;")
     ret << "</div>"
     
     if errors.size > 0 && options[:display_messages]
@@ -641,12 +682,8 @@ module CmsApplicationHelper
     link << ' '.html_safe + link_to(flash[:link][0], flash[:link][1]) if flash[:link].present? && flash[:link].is_a?(Array)
     
     output = ''.html_safe
-    if (flash[:error] || @error || '') != ''
-      output << content_tag('div', h(flash[:error] || @error) + link, :class => 'alert alert-error error')
-    end
-    if (flash[:notice] || @notice || '') != ''
-      output << content_tag('div', h(flash[:notice] || @notice) + link, :class => 'alert alert-info notice')
-    end
+    output << content_tag('div', h(flash[:error]) + link, class: 'alert alert-error error') if flash[:error].present?
+    output << content_tag('div', h(flash[:notice]) + link, class: 'alert alert-info notice') if flash[:notice].present?
     output
   end
   

data/app/models/cms_page.rb

@@ -3,16 +3,21 @@ class CmsPage < ActiveRecord::Base
   include ActsAsTree
   
   acts_as_versioned
-  acts_as_tree :order => 'path'
+  acts_as_tree order: 'path'
   
-  belongs_to :template, :class_name => 'CmsTemplate', :foreign_key => 'cms_template_id'
-  has_many :objects, :class_name => 'CmsPageObject', :dependent => :destroy
-  has_many :tags, :class_name => 'CmsPageTag', :dependent => :destroy
-  has_many :versions, :class_name => 'CmsPageVersion', :dependent => :destroy
-  has_many :sub_pages, -> { where('published_version >= 0').order(:position, :title, :name) }, :class_name => 'CmsPage', :foreign_key => :parent_id
+  belongs_to :template, class_name: 'CmsTemplate', foreign_key: 'cms_template_id'
   
-  validates_format_of :name, :with => /\A[-\w\d%]+\Z/
-  validates_uniqueness_of :path, :message => 'conflicts with an existing page'
+  has_many :tags, class_name: 'CmsPageTag', dependent: :destroy
+  has_many :versions, class_name: 'CmsPageVersion', dependent: :destroy
+  has_many :sub_pages, -> { where('published_version >= 0').order(:position, :title, :name) }, class_name: 'CmsPage', foreign_key: :parent_id
+  
+  has_many :objects, class_name: 'CmsPageObject', dependent: :destroy
+  has_many :custom_attributes, -> { where(obj_type: 'attribute') }, class_name: 'CmsPageObject'
+  has_many :options, -> { where(obj_type: 'option') }, class_name: 'CmsPageObject'
+  has_many :custom_attributes_and_options, -> { where(obj_type: ['attribute', 'option']) }, class_name: 'CmsPageObject'
+  
+  validates_format_of :name, with: /\A[-\w\d%]+\Z/
+  validates_uniqueness_of :path, message: 'conflicts with an existing page'
   
   before_validation :compute_and_store_path, :set_versions
   
@@ -37,12 +42,18 @@ class CmsPage < ActiveRecord::Base
     
     self.published_version ||= -1
     self.published_date ||= self.created_on || Time.now
+    
+    if path == '' && published_version == -1
+      self.published_version = 0  # home page should never be set to offline
+    end
+    
+    true
   end
   
   def resave_children
     if path_changed?
       # get all pages under this one (even the offline ones)
-      CmsPage.where(:parent_id => id).each do |subpg|
+      CmsPage.where(parent_id: id).each do |subpg|
         subpg.save_without_revision if subpg.valid?
       end
     end
@@ -88,7 +99,10 @@ class CmsPage < ActiveRecord::Base
     if self.published_version.to_i >= 0
       idx_version = self.published_version.to_i == 0 ? self.version : self.published_version
       self.objects.where(cms_page_version: idx_version, obj_type: [ 'text', 'string' ]).each do |obj|
-        content << obj.content << "\n"
+        content << obj.content << "\n" if obj.content.to_s =~ /[^\d\.]/
+      end
+      self.custom_attributes_and_options.each do |obj|
+        content << obj.content << "\n" if obj.content.to_s =~ /[^\d\.]/
       end
     end
     
@@ -97,7 +111,11 @@ class CmsPage < ActiveRecord::Base
   
   def update_index!
     update_index
-    self.class.without_revision { save }
+    begin
+      self.class.without_revision { save }
+    rescue NoMethodError => e
+      # sometime the cache sweeper fails, but that's okay here
+    end
   end
   
   def set_parent_id!(new_id)
@@ -121,15 +139,15 @@ class CmsPage < ActiveRecord::Base
       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  
+          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+;/, '')
+        text.gsub(/<!--(.*?)-->[\n]?/m, "").gsub(/\<%.*?%\>/m, '').gsub(/&\w+;/, '').strip
       else
         html # already plain text
       end 

data/app/models/cms_page_object.rb

@@ -1,7 +1,7 @@
 class CmsPageObject < ActiveRecord::Base
   # attr_accessible :name, :obj_type
   
-  belongs_to :page, :class_name => 'CmsPage', :foreign_key => 'cms_page_id'
+  belongs_to :page, class_name: 'CmsPage', foreign_key: 'cms_page_id'
   
   before_create :set_page_version
   

data/app/models/cms_page_tag.rb

@@ -1,7 +1,7 @@
 class CmsPageTag < ActiveRecord::Base
   # attr_accessible :name
   
-  belongs_to :page, :class_name => 'CmsPage', :foreign_key => 'cms_page_id'
+  belongs_to :page, class_name: 'CmsPage', foreign_key: 'cms_page_id'
   
-  validates_uniqueness_of :name, :scope => 'cms_page_id'
+  validates_uniqueness_of :name, scope: 'cms_page_id'
 end

data/app/models/cms_template.rb

@@ -3,7 +3,7 @@ class CmsTemplate < ActiveRecord::Base
   
   attr_accessor :options
   
-  has_many :pages, :class_name => 'CmsPage'
+  has_many :pages, class_name: 'CmsPage'
   
   after_find :deserialize_yaml
   before_save :serialize_yaml

data/app/models/user.rb

@@ -5,14 +5,14 @@ class User < ActiveRecord::Base # :nodoc:
   # attr_accessible :first_name, :last_name
   attr_reader :password # :nodoc:
   
-  has_and_belongs_to_many :groups, :class_name => 'UserGroup', :join_table => 'user_group_memberships'
+  has_and_belongs_to_many :groups, class_name: 'UserGroup', join_table: 'user_group_memberships'
   
-  validates_presence_of [ :username, :password, :first_name, :last_name ], :message => 'is required'
-  validates_length_of :password, :minimum => 4
-  validates_uniqueness_of :username, :message => 'already in use'
+  validates_presence_of [ :username, :password, :first_name, :last_name ], message: 'is required'
+  validates_length_of :password, minimum: 4
+  validates_uniqueness_of :username, message: 'already in use'
   validates_confirmation_of :password
   
-  before_validation :fake_password_confirmation, :on => :update
+  before_validation :fake_password_confirmation, on: :update
   
   def name ; [ first_name, last_name ].compact.join(' ') ; end
   
@@ -44,7 +44,7 @@ class User < ActiveRecord::Base # :nodoc:
   def fake_password_confirmation # :nodoc:
     # if password is blank, user is not trying to change it.
     # just appease the validator by setting something valid
-    if ((@password ||= "") == "")
+    if @password.blank?
       @password = "imapassword" 
       @password_confirmation = "imapassword" 
     end

data/app/models/user_group.rb

@@ -1,5 +1,5 @@
 class UserGroup < ActiveRecord::Base # :nodoc:
-  has_and_belongs_to_many :users, :join_table => 'user_group_memberships'
+  has_and_belongs_to_many :users, join_table: 'user_group_memberships'
   
   validates_presence_of :name
   validates_uniqueness_of :name

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

@@ -2,7 +2,7 @@
   timeout ||= 0
   captions = []
   settings = HashObject.new({})
-  path = File.join(Rails.root, 'public', 'images', 'content', @pg.path, name)
+  path = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, name)
   
   begin
     captions = YAML.load(File.open(File.join(path, 'captions.yml')).read)
@@ -23,11 +23,11 @@
 -%>
 <%= javascript_tag "gallerySize['#{name}'] = #{images.size};" %>
 
-<div class="slideshow">
+<div class="imagine_cms-gallery">
   
-  <div class="slideshow-images">
+  <div class="imagine_cms-gallery-images">
     <%- images.each_with_index do |image, index| -%>
-      <table width="100%" id="<%= name %>_image_<%= index %>" class="<%= name %>_image slideshow-image" border="0" cellpadding="0" cellspacing="2" style="<%= index > 0 ? 'display: none;' : '' %>">
+      <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" %>
@@ -38,7 +38,7 @@
     <br clear="all" />
   </div>
   
-  <div id="<%= name %>_caption" class="slideshow-caption" style="<%= "display: none;" if captions[1].blank? %>">
+  <div id="<%= name %>_caption" class="imagine_cms-gallery-caption" style="<%= "display: none;" if captions[1].blank? %>">
     <%= captions[1] rescue '' %>
   </div>
   
@@ -47,19 +47,19 @@
   <%- end -%>
   
 
-  <div class="slideshow-nav">
+  <div class="imagine_cms-gallery-nav">
     <table width="100%" cellspacing="0" cellpadding="0" align="center">
       <tr>
-        <td id="<%= name %>_prev_button" class="slideshow-nav-button" align="right" onclick="changeGalleryImage('<%= name %>', <%= images.size-1 %>);">
+        <td id="<%= name %>_prev_button" class="imagine_cms-gallery-nav-button" align="right" onclick="changeGalleryImage('<%= name %>', <%= images.size-1 %>);">
           <img src="/assets/interface/photo_prev.gif" alt="prev" style="float: right; padding-right: 6px;" />
         </td>
-        <td id="<%= name %>_play_button" class="slideshow-nav-button" style="<%= autoplay ? ' display: none' : '' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); setTimeout(function () { advanceGallerySlideshow('<%= name %>', <%= timeout*1000 %>); }, <%= timeout*1000 %>); $('<%= name %>_play_button').hide(); $('<%= name %>_pause_button').show();">
+        <td id="<%= name %>_play_button" class="imagine_cms-gallery-nav-button" style="<%= autoplay ? ' display: none' : '' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); setTimeout(function () { advanceGallerySlideshow('<%= name %>', <%= timeout*1000 %>); }, <%= timeout*1000 %>); $('<%= name %>_play_button').hide(); $('<%= name %>_pause_button').show();">
           <img src="/assets/interface/photo_play.gif" alt="play" style="float: left" />
         </td>
-        <td id="<%= name %>_pause_button" class="slideshow-nav-button" style="<%= autoplay ? '' : ' display: none' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); $('<%= name %>_pause_button').hide(); $('<%= name %>_play_button').show();">
+        <td id="<%= name %>_pause_button" class="imagine_cms-gallery-nav-button" style="<%= autoplay ? '' : ' display: none' %>" align="left" onclick="clearTimeout(galleryTimeouts['<%= name %>']); $('<%= name %>_pause_button').hide(); $('<%= name %>_play_button').show();">
           <img src="/assets/interface/photo_pause.gif" alt="pause" style="float: left;" />
         </td>
-        <td id="<%= name %>_next_button" class="slideshow-nav-button" align="left" onclick="changeGalleryImage('<%= name %>', 1);">
+        <td id="<%= name %>_next_button" class="imagine_cms-gallery-nav-button" align="left" onclick="changeGalleryImage('<%= name %>', 1);">
           <img src="/assets/interface/photo_next.gif" alt="next" style="float: left; padding-left: 6px;" />
         </td>
       </tr>
@@ -67,9 +67,9 @@
   </div>
   
   <%- unless settings.show_thumbs == 'false' -%>
-  <div class="slideshow-thumbs">
+  <div class="imagine_cms-gallery-thumbs">
     <%- thumbs.each_with_index do |thumb, index| -%>
-      <div id="<%= name %>_thumb_<%= index %>" class="<%= name %>_thumb slideshow-thumb<%= index == 0 ? ' current' : '' %>" onmouseover="$(this).addClassName('current');" onmouseout="$(this).removeClassName('current');" onclick="changeGalleryImage('<%= name %>', <%= 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;" %>
       </div>
     <%- end -%>

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

@@ -1,5 +1,5 @@
-<%- if @pages.blank? -%>
+<%- if @pages.empty? -%>
   Sorry, no pages matched your search.
 <%- else -%>
-  <%= render :partial => 'search_result', :collection => @pages %>
+  <%= render partial: 'search_result', collection: @pages %>
 <%- end -%>

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

@@ -1,23 +1,29 @@
 <%-
   page = search_result
-  
   title = page.title
+  summary = nil
   
-  summary = 'error'
   begin
-    summary = truncate(page.search_index, :length => 300)
-    summary = excerpt(page.search_index, @terms.first, 150) || truncate(page.search_index, :length => 300)
+    @terms.each do |term|
+      [ term, term.singularize, term.pluralize ].uniq.each do |term_variant|
+        summary ||= excerpt(page.search_index, term_variant, radius: 150)
+      end
+    end
   rescue Exception => e
     logger.error "Error creating search index excerpt: #{e}"
   end
   
+  summary ||= truncate(page.search_index, length: 300)
+  
   @terms.each do |term|
-    title = highlight(title, term)
-    summary = highlight(summary, term)
+    [ term, term.singularize, term.pluralize ].uniq.each do |term_variant|
+      title = highlight(title, term_variant)
+      summary = highlight(summary, term_variant)
+    end
   end
 -%>
 
-<p>
-  <a href="/<%= page.path %>"><%= title %></a><br/>
-  <%= summary %>
-</p>
+<div class="search-result">
+  <div class="search-result-title"><a href="/<%= page.path %>"><%= title %></a></div>
+  <div class="search-result-summary"><%= summary %></div>
+</div>

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

@@ -4,26 +4,32 @@
   
   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', { controller: '/management/cms', action: 'pages' } ]
+      @nav_sections << [ 'Templates', { controller: '/management/cms', action: 'templates' } ]
+      @nav_sections << [ 'Snippets', { controller: '/management/cms', action: 'snippets' } ]
     end
     if user_has_permission?(:manage_users)
-      @nav_sections << [ 'Users', { :controller => '/management/users', :action => 'index' } ]
+      @nav_sections << [ 'Users', { controller: '/management/users', action: 'index' } ]
     end
   end
+  
+  if defined?(ImagineCmsAdditionalNavSections)
+    @nav_sections += ImagineCmsAdditionalNavSections.is_a?(Proc) ? ImagineCmsAdditionalNavSections.call(self) : ImagineCmsAdditionalNavSections
+  end
 -%>
 <!DOCTYPE html>
 <html>
   <head>
+    <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>
-      <script src="/assets/codepress/codepress.js" type="text/javascript"></script>
     <%- end -%>
-    <%= stylesheet_link_tag "application", :media => "all" %>
-    <%= stylesheet_link_tag "management", :media => "all" %>
+    <%= stylesheet_link_tag "application", media: "all" %>
+    <%= stylesheet_link_tag "management", media: "all" %>
     <%= javascript_include_tag "application" %>
+    
     <%= csrf_meta_tag %>
   </head>
   
@@ -34,14 +40,14 @@
         <%- if is_logged_in_user? -%>
           <!-- Header Navigation -->
           <div style="float: left; padding-top: 2px;">
-            <%= link_to image_tag("management/start.gif", :size => "44x14", :alt => "Start"), '/manage' %>
+            <%= link_to image_tag("management/start.gif", size: "44x14", alt: "Start"), '/manage' %>
           </div>
           <div style="float: left; padding-left: 20px;">
-            <%= @nav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
+            <%= @nav_sections.map { |nav| link_to(nav[0], nav[1], style: 'color: white') }.safe_join(' | ') %>
           </div>
           <div style="float: right">
-            <%= link_to 'Change password', { :controller => '/management/users', :action => 'edit', :id => session[:user_id] }, :style => 'color: white' %> |
-            <%= link_to 'Log out', { :controller => '/management/user', :action => 'logout' }, :style => 'color: white' %>
+            <%= link_to 'Change password', { controller: '/management/users', action: 'edit', id: session[:user_id] }, style: 'color: white' %> |
+            <%= link_to 'Log out', { controller: '/management/user', action: 'logout' }, style: 'color: white' %>
           </div>
         <%- end -%>
         </td>
@@ -51,7 +57,7 @@
         <td style="padding: 7px 15px 0 15px; border-bottom: solid #ffffff 1px; color: white">
           <!-- Header Navigation -->
           <div style="float: left; padding-left: 20px;">
-            <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], :style => 'color: white') }.safe_join(' | ') %>
+            <%= @subnav_sections.map { |nav| link_to(nav[0], nav[1], style: 'color: white') }.safe_join(' | ') %>
           </div>
           <div style="float: right">
           </div>
@@ -61,12 +67,7 @@
     </table>
     
     <div id="management-content" style="padding: 15px 10px 1px 15px">
-      <!-- Main Content -->
       <%= yield %>
     </div>
-    
-    <footer>
-      
-    </footer>
   </body>
 </html>