imagine_cms 3.0.15 → 3.0.16

data/app/assets/stylesheets/management.css

@@ -98,6 +98,15 @@ img { display: inline; border: none; margin: 0; padding: 0; }
 #management-content ol { list-style-type: decimal; list-style-position: outside; margin: 0 0 15px 20px; }
 
 
+.form_button {
+    margin: 0;
+    font-size: 11px;
+    color: #ffffff;
+    text-decoration: none;
+    text-indent: 0;
+    background-color: #333;
+}
+
 /** auto complete **/
 
 div.auto_complete {

data/app/controllers/cms/content_controller.rb

@@ -212,14 +212,14 @@ module Cms # :nodoc:
       @pages = []
       
       if params[:q]
-        @terms = params[:q].split(/\s+/).reject { |t| t.length < 3 }
+        @terms = params[:q].split(/[^\w\-]+/).reject { |t| t.length < 3 }
       end
       
       CmsPage.index_all
       unless @terms.empty?
         term_variants = []
         @terms.each do |term|
-          term_variants << [ term, term.singularize, term.pluralize ].uniq.map { |v| v.gsub(/[\[\]\:\>\(\)\?]/, '').gsub(/\+/, '\+') }.join('|')
+          term_variants << [ term, term.singularize, term.pluralize ].uniq.map { |v| v.gsub(/[\[\]\|\:\>\(\)\?]/, '').gsub(/\+/, '\+') }.join('|')
         end
         
         conds = [ 'published_version >= 0' ]

data/app/controllers/management/cms_controller.rb

@@ -1040,7 +1040,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     data = params[:gallery_file][:data]
     data_dest = File.join(temp_location, data.original_filename)
-    File.open(data_dest, "w") { |f| f.write(data.read) }
+    File.open(data_dest, 'wb') { |f| f.write(data.read) }
     
     last_id = images.size
     ext = File.extname(data_dest).downcase

data/app/helpers/cms_application_helper.rb

@@ -122,7 +122,7 @@ module CmsApplicationHelper
     request.fullpath
   end
   
-  # Returns the first non-empty string in its arg list. Clearly, depends on nil_empty plugin.
+  # Returns the first non-blank string in its arg list.
   def first_non_empty(*args)
     while !args.empty?
       ret = args.shift
@@ -862,7 +862,7 @@ module CmsApplicationHelper
     
     ret = <<EOF
   <span><a href="#" onclick="showDatePicker('#{object}', '#{method_prefix}'); return false;"><span id="date_picker_#{object}_#{method_prefix}_value">#{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/interface/icon_time.gif" style="float: none" alt="date picker" /></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">
     <table width="190">
       <tr>

data/app/models/cms_page.rb

@@ -2,7 +2,7 @@ class CmsPage < ActiveRecord::Base
   include ActsAsTree
   
   attr_accessible :cms_template_id, :cms_template_version, :parent_id,
-                  :name, :title, :path, :summary, :position,
+                  :name, :title, :path, :html_head, :summary, :position,
                   :article_date, :article_end_date, :published_date, :expiration_date, :expires,
                   :thumbnail_path, :feature_image_path, :comment_count, :version, :published_version,
                   :search_index, :updated_by, :updated_by_username

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

@@ -11,7 +11,7 @@
         <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] %>"
           toolbarTemplateCssPath="/assets/dojo/src/widget/templates/EditorToolbarFullFeature.css"
-          toolbarAlwaysVisible="true" style="height: 25px; vertical-align: middle" toolbarGroup="main">
+          toolbarAlwaysVisible="true" style="height: 22px; vertical-align: middle" toolbarGroup="main">
         </div>
       <%- else -%>
         <div dojoType="Editor2" widgetId="main_toolbar" useActiveX="false" htmlEditing="false" focusOnLoad="false"

data/app/views/management/cms/_edit_page.html.erb

@@ -27,18 +27,12 @@
     <td>Title:</td>
     <td><%= text_field :pg, :title, :class => 'form', :style => 'width: 100%;' %></td>
   </tr>
-<%- if @pg.respond_to?(:html_head) -%>
-  <tr>
-    <td valign="top"><div style="margin-top: 4px;">HTML Head:<br/>(for advanced users)</div></td>
-    <td><%= text_area :pg, :html_head, :class => 'form', :style => 'width: 100%; height: 50px; overflow: auto;' %></td>
-  </tr>
-<%- end -%>
   <tr>
     <td valign="top"><div style="margin-top: 4px;">Template:</div></td>
     <td>
-      <%= select :pg, :cms_template_id, CmsTemplate.find(:all, :order => 'name').collect { |t| [ t.name, t.id ] }, {}, :class => 'form', :style => 'width: 100%;', :onchange => '' %>
+      <%= select :pg, :cms_template_id, CmsTemplate.find(:all, :order => 'name').collect { |t| [ t.name, t.id ] }, {}, :class => 'form', :style => 'width: 100%;' %>
       
-      <div id="edit_page_template_options" style="background-color: white; width: 100%; height: 60px; overflow: auto; border: 1px solid #aaaaaa">
+      <div id="edit_page_template_options" style="display: none; background-color: white; width: 100%; border: 1px solid #aaaaaa;">
         <%= render :partial => 'template_options' %>
       </div>
       <%= observe_field 'pg_cms_template_id', :update => 'edit_page_template_options', :with => 'template_id',
@@ -70,8 +64,8 @@
     <td><%= text_field_tag :tags, @tags, :class => 'form', :style => 'width: 100%' %></td>
   </tr>
   <tr>
-    <td>Published Version:</td>
-    <td><%= select :pg, :published_version, [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 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>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>
   </tr>
   <tr>
     <td>Publish Date:</td>
@@ -142,8 +136,14 @@
     </td>
   </tr>
   <%- end -%>
+  <%- if @pg.respond_to?(:html_head) -%>
+  <tr>
+    <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>
+  </tr>
+  <%- end -%>
   <tr>
-    <td valign="top"><div style="margin-top: 4px;">Custom Attributes:</div></td>
+    <td valign="top"><div style="margin-top: 4px;">Custom Attributes:<br>(advanced)</div></td>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

data/app/views/management/cms/_template_options.html.erb

@@ -1,18 +1,24 @@
+<%- if @template_options.nil? || @template_options.empty? -%>
+  <%= javascript_tag "Element.hide('edit_page_template_options');" %>
+<%- else -%>
+  <%= javascript_tag "Element.show('edit_page_template_options');" %>
+<%- end -%>
+
 <%-
   @template_options.each do |name, type|
     key = name.gsub(/[^\w\d]/, '_')
 -%>
 <table width="100%">
   <col width="45%" /><col width="55%" />
-  <tr style="border-bottom: 1px solid #aaa;">
-    <td><%=h name %></td>
+  <tr>
+    <td><%= name %></td>
     <td>
       <%=
         case type
         when :checkbox
           check_box :page_objects, "obj-option-checkbox-#{key}"
         when :string, :text
-          text_field :page_objects, "obj-option-string-#{key}", :style => 'width: 100%'
+          text_field :page_objects, "obj-option-string-#{key}", :style => 'width: 100%;'
         end
       %>
     </td>

data/app/views/management/cms/toolbar_preview.html.erb

@@ -42,7 +42,7 @@
         </td>
         
         <td style="vertical-align: middle;">
-          <span style="font-family: Arial">Preview:</span>
+          <span style="font-family: Arial">Preview Version:</span>
         </td>
         <td style="vertical-align: middle;">
           <%= form_tag('/' + @pg.path, { :method => 'get' }) do -%>
@@ -60,7 +60,7 @@
         </td>
         
         <td style="vertical-align: middle;">
-          <span style="font-family: Arial; margin-left: 10px;">Publish:</span>
+          <span style="font-family: Arial; margin-left: 10px;">Publish Version:</span>
         </td>
         
         <td style="vertical-align: middle;">
@@ -70,7 +70,7 @@
                                :complete => "$('set_page_version_loading').hide();" + (@pg ? "$('pg_published_version_container').style.borderColor = ($('pg_published_version').value == '0' || $('pg_published_version').value == '#{@pg.versions.last.version}') ? '#EBEBEB' : 'red';" : '')) do -%>
               <div id="pg_published_version_container" style="border-color: <%= @pg && (@pg.published_version == 0 || @pg.published_version == @pg.versions.last.version) ? '#EBEBEB' : 'red' %>; border-style: solid; border-width: 2px;">
               <select name="pg[published_version]" id="pg_published_version" style="font-size: 8pt; width: 210px;" onchange="this.form.onsubmit();">
-                <%- [ [ '[ Offline ]', -1 ], [ '[ Latest Version ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }).each do |label, version| %>
+                <%- [ [ '[ None (offline) ]', -1 ], [ '[ Latest ]', 0 ] ].concat(@pg.versions.reverse.map { |pg| [ "#{pg.version} - #{date_to_str(pg.updated_on)} #{time_to_str(pg.updated_on)}#{" by #{pg.updated_by_username}" unless pg.updated_by_username.blank? }", pg.version ] }).each do |label, version| %>
                 <option value="<%= version %>"<%= (@pg && @pg.published_version == version.to_i) ? ' selected="selected"' : '' %>><%= label %></option>
                 <%- end -%>
               </select>

data/lib/hash_object.rb

@@ -5,6 +5,8 @@ class HashObject
     @hash = HashWithIndifferentAccess.new(hash)
   end
   
+  def empty?        ; @hash.keys.empty?     ; end
+  
   def id            ; @hash['id']           ; end
   def id=(val)      ; @hash['id'] = val     ; end
   

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.15"
+  VERSION = "3.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails