imagine_cms 4.1.4 → 4.2.0

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

@@ -2,46 +2,23 @@
 
 <h2>Edit Template</h2>
 
-<%= form_tag({}, { :onsubmit => "temp_content.toggleEditor();" }) do %>
-<table width="100%" height="100%">
-  <col width="100" />
-  <tr>
-    <td>Name:</td>
-    <td><%= text_field :temp, :name %></td>
-  </tr>
-  <tr>
-    <td valign="top"><div style="margin-top: 2px">Content:</div></td>
-    <td>
-      <%= text_area :temp, :content, :class => 'codepress html autocomplete-off', :style => 'width: 100%; height: 600px;' %>
-    </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-      <%= submit_tag 'Save Template', :class => 'form_button' %>
-      <button onclick="$('preview_frame').scrollIntoView(); temp_content.toggleEditor(); $('preview_content').value = $('temp_content_cp').value; $('preview_form').submit(); temp_content.toggleEditor(); return false;" class="form_button">Preview</button>
-      <%= link_to 'Cancel', :action => 'templates' %>
-    </td>
-  </tr>
-</table>
-<br/>
-
-<%= render :partial => 'template_reference' %>
-<br/>
-
-<table width="100%">
-  <col width="100" />
-  <tr>
-    <td valign="top"><div style="margin-top: 2px">Preview:</div></td>
-    <td>
-      <iframe id="preview_frame" name="preview_frame" style="width: 100%; height: 600px; border: 1px solid gray;"></iframe>
-      <%= submit_tag 'Save Template', :class => 'form_button' %>
-    </td>
-  </tr>
-</table>
+<%= form_tag do %>
+  <%= text_field :temp, :name, :placeholder => 'Template Name', :size => '50' %>
+  <div class="codemirror-html-container">
+    <%= text_area :temp, :content, :class => 'codemirror-html autocomplete-off' %>
+  </div>
+  <%= submit_tag 'Save Template', :class => 'form_button' %>
+  <button onclick="jQuery('#preview_frame').show(); jQuery('#preview_frame')[0].scrollIntoView(); jQuery('#preview_content').val(jQuery('#temp_content').val()); jQuery('#preview_form').submit(); return false;" class="form_button">Preview</button>
+  <%= link_to 'Cancel', :action => 'templates' %>
+  <br/>
+  
+  <br/>
+  <%= render :partial => 'template_reference' %>
+  <br/>
+  
+  <iframe id="preview_frame" name="preview_frame"></iframe>
 <% end %>
 
-
 <%= form_tag({ :controller => '/cms/content', :action => 'preview_template' }, :id => 'preview_form', :target => 'preview_frame') do %>
   <%= text_area_tag 'temp[content]', '', :id => 'preview_content', :style => 'display: none;' %>
   <%= hidden_field_tag 'mode', 'preview' %>

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

@@ -20,18 +20,12 @@ EOF
 
 <%= flash_message %>
 
-<div id="columnBrowserToolbar" style="background-color: #d0d0d0; padding: 4px; margin-bottom: 5px;  ">
-  <a id="new_link" href="#"><img src="/assets/management/btn_top_new.gif" style="margin-right: 2px;" /></a>
-  <a id="edit_content_link" href="#" target="_blank"><img src="/assets/management/btn_top_edit.gif" style="margin-right: 2px;" /></a>
-  <form id="edit_content_form" action="#" onsubmit="this.action = $('edit_content_link').href;" target="_blank" style="display: none">
-    <button>dummy</button>
-  </form>
-  <a id="edit_link" href="#"><img src="/assets/management/btn_top_properties.gif" style="margin-right: 2px;" /></a>
-  <a id="view_link" href="#" target="_blank"><img src="/assets/management/btn_top_preview.gif" style="margin-right: 2px;" /></a>
-  <a id="delete_link" href="#" onclick="if (confirm('Are you sure you want to delete the selected page?')) { $('delete_form').submit(); } return false;"><img src="/assets/management/btn_top_delete.gif" style="margin: 0" /></a>
-  <%= form_tag('', :id => "delete_form", :style => "display: none") do %>
-    <button>dummy</button>
-  <% end %>
+<div id="columnBrowserToolbar" style="background-color: #ddd; padding: 5px 4px 0; margin: 0 0 5px;">
+  <%= link_to image_tag('management/btn-top-new.png', style: 'margin-right: 2px;'), '#', id: 'new_link' %>
+  <%= link_to image_tag('management/btn-top-edit.png', style: 'margin-right: 2px;'), '#', id: 'edit_content_link', target: '_blank' %>
+  <%= link_to image_tag('management/btn-top-properties.png', style: 'margin-right: 2px;'), '#', id: 'edit_link' %>
+  <%= link_to image_tag('management/btn-top-preview.png', style: 'margin-right: 2px;'), '#', id: 'view_link', target: '_blank' %>
+  <%= link_to image_tag('management/btn-top-delete.png', style: 'margin: 0;'), '#', id: 'delete_link', target: '_blank', method: :post, data: { confirm: 'Are you sure you want to delete the selected page?' } %>
   <div class="clearer"></div>
 </div>
 
@@ -39,8 +33,8 @@ EOF
   <div id="columnBrowser" style="width: <%= cbColWidthFull * (@page_levels.size) %>px;">
     <%- @page_levels.each_with_index do |name, i| -%>
       <%-
-        if !name.blank?
-          @path << '/' if !@path.blank?
+        if name.present?
+          @path << '/' if @path.present?
           @path << name
         end
         @parent = @page
@@ -51,23 +45,17 @@ EOF
         break_flag = false
         
         if !@page
-          if @parent && @parent.children.first
-            @page = @parent.children.first
-          elsif @parent
-            @page = @parent
-          else
-            @page = CmsPage.find(:first)
-          end
+          @page = @parent.children.first || @parent || CmsPage.first
           break_flag = true
         end
       -%>
       <div id="columnBrowserLevel<%= i %>" style="width: <%= cbColWidth %>px; height: <%= cbColHeight %>px; overflow: auto; float: left; border-width: <%= cbBorderWidth %>px <%= cbBorderWidth %>px <%= cbBorderWidth %>px <%= i == 0 ? "#{cbBorderWidth}px" : '0' %>; border-style: solid; border-color: gray;">
         <%- if i == 0 -%>
-          <%= render :partial => 'list_page', :locals => { :list_page => CmsPage.find(1) } %>
+          <%= render partial: 'list_page', locals: { list_page: CmsPage.first } %>
         <%- else -%>
-          <%= render :partial => 'list_pages' %>
+          <%= render partial: 'list_pages' %>
         <%- end -%>
-        <%= javascript_tag "$('cb_item_#{@parent.id}').className = 'cb_item cb_item_selected';" if @parent %>
+        <%= javascript_tag "jQuery('#cb_item_#{@parent.id}').addClass('cb_item_selected');" if @parent %>
       </div>
       <%- break if break_flag -%>
     <%- end -%>
@@ -80,10 +68,10 @@ EOF
     cbNumColumns = <%= @page_levels.size - 1 %>;
     $('columnBrowserLevel' + cbNumColumns).scrollIntoView();
     $('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>';
-    $('new_link').onclick = function () { editProperties('<%=raw url_for(:action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page, :authenticity_token => form_authenticity_token.to_s) %>', 'Create New Page under /<%= list_page.path %>'); return false; };
-    $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit', :authenticity_token => form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; };
-    $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page, :authenticity_token => form_authenticity_token.to_s %>';
-    $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id %>';
+    $('new_link').onclick = function () { editProperties('<%=raw url_for(action: 'edit_page', mode: 'ajax_new', parent_id: list_page, authenticity_token: form_authenticity_token.to_s) %>', 'Create New Page under /<%= list_page.path %>'); return false; };
+    $('edit_link').onclick = function () { editProperties('<%=raw url_for action: 'edit_page', id: list_page, mode: 'ajax_edit', authenticity_token: form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; };
+    $('edit_content_link').href = '<%=raw url_for action: 'edit_page_content', id: list_page, authenticity_token: form_authenticity_token.to_s %>';
+    $('delete_link').href = '<%=raw url_for action: 'delete_page', id: list_page.id %>';
 </script>
 
-<%= render :partial => '/imagine_cms/dialogs' %>
+<%= render '/imagine_cms/dialogs' %>

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

@@ -1,6 +1,6 @@
 <h2>CMS &raquo; Snippets</h2>
 
-<p><%= button_to 'Create New Snippet', { :action => 'edit_snippet' }, :method => :get %></p>
+<p><%= button_to 'Create New Snippet', { action: 'edit_snippet' }, method: :get %></p>
 
 <%= flash_message %>
 
@@ -8,5 +8,5 @@
   <tr>
     <th>Name</th>
   </tr>
-  <%= render :partial => 'snippet', :collection => @snippets %>
+  <%= render partial: 'snippet', collection: @snippets %>
 </table>

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

@@ -1,6 +1,6 @@
 <h2>CMS &raquo; Templates</h2>
 
-<p><%= button_to 'Create New Template', { :action => 'edit_template' }, :method => :get %></p>
+<p><%= button_to 'Create New Template', { action: 'edit_template' }, method: :get %></p>
 
 <%= flash_message %>
 
@@ -8,5 +8,5 @@
   <tr>
     <th>Name</th>
   </tr>
-  <%= render :partial => 'temp', :collection => @temps %>
+  <%= render partial: 'temp', collection: @temps %>
 </table>

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

@@ -56,6 +56,8 @@
             <option value="h2">Section Heading (H2)</option>
             <option value="h3">Sub-Heading (H3)</option>
             <option value="h4">Sub-Heading (H4)</option>
+            <option value="h5">Sub-Heading (H5)</option>
+            <option value="h6">Sub-Heading (H6)</option>
             <option value="blockquote">Block Quote</option>
           </select>
         </td>

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

@@ -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();">
-                <%- [ [ '[ 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| %>
+                <%- [ @pg.path == '' ? nil : [ '[ None (offline) ]', -1 ], [ '[ Latest ]', 0 ] ].compact.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>
@@ -89,7 +89,7 @@
           <%- end -%>
         </td>
         <td width="20">
-          <div id="set_page_version_loading" style="display: none"><img src="/assets/interface/form_loading.gif" /></div>
+          <div id="set_page_version_loading" style="display: none"><%= image_tag "interface/form_loading.gif" %></div>
         </td>
       <% end -%>
         

data/config/initializers/config_file.rb

@@ -1,6 +1,6 @@
 config_file = File.join(Rails.root, 'config', 'imagine_cms.yml')
 
-if File.exists?(config_file)
+if File.exist?(config_file)
   ImagineCmsConfig = YAML.load(File.read(config_file))
   
   if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']

data/imagine_cms.gemspec

@@ -31,16 +31,19 @@ Gem::Specification.new do |s|
   s.add_dependency "rails-observers",     "~> 0.1"
   s.add_dependency "actionpack-action_caching", "~> 1.0"
   s.add_dependency "actionpack-page_caching", "~> 1.0"
-  s.add_dependency "non-stupid-digest-assets", "~> 1.0"
-  s.add_dependency "prototype-rails",     "~> 4.0.0"
   s.add_dependency "aws-sdk",             "~> 2.0.0"
-  s.add_dependency "rmagick",             [ ">= 1.15.0", "< 3.0" ]
-  s.add_dependency "mini_magick",         "~> 3.3"
   s.add_dependency "rubyzip",             "~> 1.0"
   s.add_dependency "rinku",               "~> 1.7"
   s.add_dependency "net-dns",             "~> 0.7"
   s.add_dependency "acts_as_tree",        "~> 1.1"
   s.add_dependency "safe_yaml"
+  s.add_dependency "codemirror-rails"
+
+  # on the way out, but still needed for now
+  # s.add_dependency "prototype-rails",     "~> 4.2.0"
+  s.add_dependency "rmagick",             [ ">= 1.15.0", "< 3.0" ]
+  s.add_dependency "mini_magick",         "~> 3.3"
+  s.add_dependency "non-stupid-digest-assets", "~> 1.0"
 
   s.add_development_dependency "sqlite3"
 end

data/lib/extensions/action_controller_extensions.rb

@@ -144,10 +144,6 @@ module ActionControllerExtensions
           
           options[:wrapper_div] = true
           
-          # make options specified in snippets and templates accessible to
-          # page list segments and rss feeds
-          @page_objects["#{key}-template"] = options[:template] if @page_objects["#{key}-template"].blank?
-          
           render_page_list_segment(name, pages, options, html_options)
         end
       when :snippet
@@ -169,6 +165,20 @@ module ActionControllerExtensions
       end
     end
     
+    # shortcuts
+    def text_editor(name, options = {}, html_options = {})
+      insert_object(name, :text, options, html_options)
+    end
+    alias :texteditor :text_editor
+    def page_list(name, options = {}, html_options = {})
+      insert_object(name, :page_list, options, html_options)
+    end
+    alias :pagelist :page_list
+    def snippet(name, options = {}, html_options = {})
+      insert_object(name, :snippet, options, html_options)
+    end
+    
+    
     def render_page_list_segment(name, pages, options = {}, html_options = {})
       extend ActionView::Helpers::TagHelper
       extend ActionView::Helpers::TextHelper
@@ -204,27 +214,48 @@ module ActionControllerExtensions
                                                                          :page_list_name => name) : nil))
       
       num_segments = (pages.size.to_f / limit).ceil
-      if @page_objects["#{key}-use-pagination"].to_i == 1 && num_segments > 1
-        content << '<table style="margin-top: 4px;" align="right" cellpadding="0" cellspacing="0" border="0"><tr valign="bottom">'
-        content << '<td>Page:&nbsp;</td>'
+      Rails.logger.info "Number of page list segments: #{num_segments}"
+      if first_non_empty(options[:use_pagination], @page_objects["#{key}-use-pagination"], 0).to_i == 1 && num_segments > 1
+        content << '<div class="imagine_cms-paginator">'
+        content << 'Page:&nbsp;'
         num_segments.times do |seg|
           start = seg * limit
-          content << "<td><a href=\"#\""
+          content << "<a id=\"#{key}-segment-#{seg}\" href=\"#\""
           if offset >= start && offset < (start + limit)
-            content << " class=\"page_list_segment page_list_segment_selected\""
+            content << " class=\"imagine_cms-paginator-link imagine_cms-paginator-link-selected\""
           else
-            content << " class=\"page_list_segment\""
-            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; "
-            # FIXME: Prototype
-            content << " new Ajax.Updater('#{key}', '#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]), :only_path => true)}', {asynchronous:true, evalScripts:true, method:'get'});"
-            content << "; window.scrollBy(0, - 20 + document.getElementById('#{key}').getBoundingClientRect().top); return false;\""
+            content << " class=\"imagine_cms-paginator-link\""
           end
-          content << ">#{seg+1}</a></td>"
+          content << ">#{seg+1}</a>"
+        end
+        content << '</div>'
+        content << <<-EOT
+<script type="text/javascript">
+  jQuery('##{key}').css({ opacity: '1', cursor: 'default' });
+  jQuery('.imagine_cms-paginator-link').not('.imagine_cms-paginator-link-selected').mouseover(function () {
+    jQuery(this).addClass('imagine_cms-paginator-link-selected');
+  }).mouseout(function () {
+    jQuery(this).removeClass('imagine_cms-paginator-link-selected');
+  });
+  
+EOT
+        num_segments.times do |seg|
+          start = seg * limit
+          content << <<-EOT
+  jQuery('##{key}-segment-#{seg}').click(function () {
+    jQuery('##{key}').css({ cursor: 'wait', opacity: '0.5' });
+    jQuery('html,body').animate({ scrollTop: jQuery('##{key}').position().top }, 200);
+    jQuery.get('#{url_for(:content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]), :only_path => true)}', function (data) {
+      jQuery('##{key}').html(data);
+      jQuery('##{key}').css({ cursor: 'default', opacity: '1' });
+    });
+    return false;
+  })
+EOT
         end
-        content << '</tr></table>'
-        content << "<script type=\"text/javascript\">$('#{key}').style.opacity = 1; $('#{key}').style.cursor = 'default';</script>"
+        content << <<-EOT
+</script>
+EOT
       end
       
       if options[:wrapper_div]

data/lib/imagine_cms/engine.rb

@@ -7,7 +7,8 @@ module ImagineCms
     middleware.use ::ActionDispatch::Static, "#{root}/public"
     
     initializer "imagine_cms.assets.precompile" do |config|
-      Rails.application.config.assets.precompile += %w( codepress/** dojo/** management.css imagine_controls.css reset.css )
+      Rails.application.config.assets.precompile += %w( dojo/** management.css imagine_controls.css reset.css )
+      Rails.application.config.assets.precompile += ["codemirror*", "codemirror/**/*"]
       # Rails.application.config.load_paths << File.dirname(__FILE__) + "/../app/helpers"
     end
     
@@ -36,16 +37,19 @@ module ImagineCms
     require 'rails-observers'
     require 'actionpack/action_caching'
     require 'actionpack/page_caching'
-    require 'non-stupid-digest-assets'
-    require 'prototype-rails'
     require 'aws-sdk'
-    require 'RMagick'
-    require 'mini_magick'
     require 'zip'
     require 'rails_rinku'
-    require 'net/dns'
-    require 'acts_as_tree'
     require 'safe_yaml'
+    require 'acts_as_tree'
+    require 'net/dns'
+    require 'codemirror-rails'
+    
+    # on the way out, but still needed for now
+    require 'prototype-rails'
+    require 'RMagick'
+    require 'mini_magick'
+    require 'non-stupid-digest-assets'
     
     #
     # rails plugins
@@ -86,7 +90,7 @@ module ImagineCms
       
       helper_method :user_has_permission?
       helper_method :user_has_permissions?
-      helper_method :insert_object
+      helper_method :insert_object, :text_editor, :texteditor, :page_list, :pagelist, :snippet
       
       # before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
       before_filter :expire_session_data

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.1.4"
+  VERSION = "4.2.0"
 end

data/lib/prototype_legacy_helper/lib/prototype_legacy_helper.rb

@@ -175,7 +175,7 @@ module PrototypeHelper
   #     { :update => "posts", :url => { :action => "destroy", :id => post.id } },
   #     :href => url_for(:action => "destroy", :id => post.id)
   def link_to_remote(name, options = {}, html_options = nil)
-    link_to_function(name, remote_function(options), html_options || options.delete(:html))
+    link_to_function(name, remote_function(options), html_options || options.delete(:html)).gsub('&', '&').html_safe
   end
 
   # Returns a form tag that will submit using XMLHttpRequest in the
@@ -219,7 +219,7 @@ module PrototypeHelper
       (options[:html][:onsubmit] ? options[:html][:onsubmit] + "; " : "") +
       "#{remote_function(options)}; return false;"
 
-    form_tag(options[:html].delete(:action) || url_for(options[:url]), options[:html], &block)
+    form_tag(options[:html].delete(:action) || url_for(options[:url]), options[:html], &block).gsub('&', '&').html_safe
   end
 
   # Creates a form that will submit using XMLHttpRequest in the background

data/lib/tasks/imagine_cms_tasks.rake

@@ -20,4 +20,12 @@ namespace :imagine_cms do
     
   end
   
+  desc "Copy dojo editor files to public"
+  task :install_dojo => :environment do
+    sourcedir = File.expand_path('../../../app/assets/javascripts/dojo', __FILE__)
+    targetdir = File.expand_path(File.join(Rails.root, 'public', 'assets'))
+    FileUtils.mkdir_p targetdir
+    FileUtils.cp_r sourcedir, targetdir
+  end
+  
 end