imagine_cms 3.0.31 → 3.0.32

data/app/controllers/cms/content_controller.rb

@@ -157,6 +157,11 @@ module Cms # :nodoc:
               end
             end
             
+            # redirect if redirect enabled
+            if @pg.redirect_enabled
+              redirect_to @pg.redirect_to and return true
+            end
+            
             # load appropriate page version and associated objects
             # if we had to authenticate, load_page_objects = false, but return true so we don't call not_found
             load_page_objects or return true
@@ -187,7 +192,7 @@ module Cms # :nodoc:
             
             render :inline => template_content
             
-            if perform_caching && UseCmsPageCaching && @allow_caching
+            if UseCmsPageCaching && @allow_caching && perform_caching && request.format == Mime::HTML
               cache_page
             end
             

data/app/controllers/management/cms_controller.rb

@@ -205,6 +205,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       end
       @pg.updated_by ||= session[:user_id]
       @pg.updated_by_username ||= session[:user_username]
+      @pg.published_version = 0 if @pg.redirect_enabled
       
       save_function = @pg.new_record? ? 'save' : 'save_without_revision'
       

data/app/helpers/cms_application_helper.rb

@@ -864,7 +864,7 @@ module CmsApplicationHelper
                     "'&method_prefix=#{method_prefix}', {method:'get', asynchronous:true, evalScripts:true})"
     
     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><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">
     <table width="190">

data/app/models/cms_page.rb

@@ -6,7 +6,8 @@ class CmsPage < ActiveRecord::Base
                   :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
+                  :search_index, :updated_by, :updated_by_username,
+                  :redirect_enabled, :redirect_to
   
   acts_as_versioned
   acts_as_tree :order => 'path'
@@ -135,4 +136,4 @@ class CmsPage < ActiveRecord::Base
       html # already plain text
     end 
   end
-end
+end

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

@@ -11,11 +11,11 @@
 <%= form_remote_tag :url => { :action => 'edit_page', :id => @pg },
                     :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
                     :html => { :onsubmit => 'teardownTextFieldHints();' } do %>
-<table>
+<table id="dlg-page-properties">
   <col width="120"><col width="*"><col width="5">
 <%- if (@pg.id || 2) > 1 -%>
   <tr>
-    <td>Name/URL:</td>
+    <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' %>
@@ -24,36 +24,62 @@
   </tr>
 <%- end -%>
   <tr>
-    <td>Title:</td>
+    <td>Page Title:</td>
     <td><%= text_field :pg, :title, :class => 'form', :style => 'width: 100%;' %></td>
   </tr>
+  <%- if @pg.respond_to?(:redirect_enabled) -%>
   <tr>
+    <td>Page Type:</td>
+    <td>
+      <%= radio_button :pg, :redirect_enabled, false %> Normal
+      <%= radio_button :pg, :redirect_enabled, true %> Redirect to:
+      <%= text_field :pg, :redirect_to %>
+      <script type="text/javascript">
+        jQuery('#pg_redirect_enabled_false').click(function () {
+          jQuery('#pg_redirect_to').prop('disabled', true);
+          jQuery('#dlg-page-properties tr.page-field').show();
+          jQuery('#dlg-page-properties tr.redirect-field').hide();
+        });
+        jQuery('#pg_redirect_enabled_true').click(function () {
+          jQuery('#pg_redirect_to').prop('disabled', false);
+          jQuery('#dlg-page-properties tr.page-field').hide();
+          jQuery('#dlg-page-properties tr.redirect-field').show();
+        });
+        jQuery('#pg_redirect_enabled_<%= @pg.redirect_enabled == true %>').trigger('click');
+      </script>
+    </td>
+  </tr>
+  <%- end -%>
+  <tr class="page-field">
     <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%;' %>
       
-      <div id="edit_page_template_options" style="display: none; background-color: white; width: 100%; border: 1px solid #aaaaaa;">
+      <div id="edit_page_template_options">
         <%= render :partial => 'template_options' %>
       </div>
-      <%= observe_field 'pg_cms_template_id', :update => 'edit_page_template_options', :with => 'template_id',
-                                              :url => { :action => 'show_template_options', :id => @pg },
-                                              :loading => "$('edit_page_template_options').innerHTML = 'Loading...';"
-                                               %>
+      <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>
+  <tr class="page-field">
     <td>Article Date:</td>
     <td>
       <table border="0" cellpadding="0" cellspacing="0" width="100%">
         <tr>
-          <td width="110">
+          <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 %>
           </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>
           </td>
           <td align="right" width="180">
-            <input type="checkbox" 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>
+            <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>
           </td>
         </tr>
       </table>
@@ -63,7 +89,7 @@
     <td>Tags:</td>
     <td><%= text_field_tag :tags, @tags, :class => 'form', :style => 'width: 100%' %></td>
   </tr>
-  <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>
   </tr>
@@ -90,7 +116,7 @@
       </table>
     </td>
   </tr>
-  <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>
   </tr>
@@ -102,7 +128,7 @@
       <%- else -%>
       <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
         <%- if @pg.thumbnail_path.blank? -%>
-          no thumbnail image selected
+          <!-- no thumbnail image selected -->
         <%- else -%>
           <%= image_tag(@pg.thumbnail_path, :onclick => "jQuery('#pg_thumbnail_path').show();") %>
         <%- end -%>
@@ -123,7 +149,7 @@
       <%- else -%>
       <div id="feature_image_preview" style="width: 385px; overflow: auto;">
         <%- if @pg.feature_image_path.blank? -%>
-          no feature image selected
+          <!-- no feature image selected -->
         <%- else -%>
           <%= image_tag(@pg.feature_image_path, :onclick => "jQuery('#pg_feature_image_path').show();") %>
         <%- end -%>
@@ -137,7 +163,7 @@
   </tr>
   <%- end -%>
   <%- if @pg.respond_to?(:html_head) -%>
-  <tr>
+  <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>
   </tr>
@@ -169,7 +195,7 @@
     <td></td>
     <td>
       <%= submit_tag 'Save', :id => 'btn_save', :class => 'form_button', :style => 'width: 70px;' %>
-      <%= link_to_function 'Cancel', "cancelEditProperties();" %>
+      <%= link_to_function 'Cancel', "cancelEditProperties();", :style => 'font-weight: normal;' %>
       <%= hidden_field_tag 'return_to', params[:return_to] %>
     </td>
   </tr>

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

@@ -1,27 +1,23 @@
-<%- 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>
-    <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%;'
-        end
-      %>
-    </td>
-  </tr>
-</table>
+<%- unless @template_options.empty? -%>
+<div style="background-color: white; width: 100%; border: 1px solid #aaaaaa;">
+  <%- @template_options.each do |name, type| -%>
+    <%- key = name.gsub(/[^\w\d]/, '_') -%>
+    <table width="100%">
+      <col width="45%" /><col width="55%" />
+      <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%;'
+            end
+          %>
+        </td>
+      </tr>
+    </table>
+  <%- end -%>
+</div>
 <%- end -%>

data/db/migrate/20140423085357_add_redirect_fields_to_cms_pages.rb

@@ -0,0 +1,6 @@
+class AddRedirectFieldsToCmsPages < ActiveRecord::Migration
+  def change
+    add_column :cms_pages, :redirect_enabled, :boolean, :null => false, :default => false
+    add_column :cms_pages, :redirect_to, :text
+  end
+end

data/lib/extensions/action_controller.rb

@@ -158,7 +158,8 @@ module ActionControllerExtensions
             content << " onmouseover=\"this.className = 'page_list_segment page_list_segment_selected'\""
             content << " onmouseout=\"this.className = 'page_list_segment'\""
             content << " onclick=\"$('#{key}').style.cursor = 'wait'; $('#{key}').style.opacity = 0.5; "
-            content << remote_function(:update => key, :url => { :content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]) })
+            # FIXME: Prototype
+            content << " new Ajax.Updater('#{key}', '#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]))}', {asynchronous:true, evalScripts:true, method:'get'});"
             content << "; window.scrollBy(0, - 20 + document.getElementById('#{key}').getBoundingClientRect().top); return false;\""
           end
           content << ">#{seg+1}</a></td>"

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.31"
+  VERSION = "3.0.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.31
+  version: 3.0.32
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -301,6 +301,7 @@ files:
 - app/assets/javascripts/dojo/src/widget/templates/incrementWeek.gif
 - app/assets/javascripts/dojo/src/widget/templates/richtextframe.html
 - app/assets/javascripts/imagine.js
+- app/assets/javascripts/imagine_cms.js
 - app/assets/javascripts/jquery_no_conflict.js
 - app/assets/stylesheets/codepress/codepress.css
 - app/assets/stylesheets/codepress/languages/css.css
@@ -412,6 +413,7 @@ files:
 - db/migrate/20121115083748_add_logs_table.rb
 - db/migrate/20121115083811_add_users_tables.rb
 - db/migrate/20121115084028_add_cms_tables.rb
+- db/migrate/20140423085357_add_redirect_fields_to_cms_pages.rb
 - imagine_cms.gemspec
 - lib/acts_as_versioned/.document
 - lib/acts_as_versioned/.gitignore