imagine_cms 3.0.0.beta7 → 3.0.0.beta8

data/app/controllers/cms/content_controller.rb

@@ -59,7 +59,7 @@ module Cms # :nodoc:
     def show_from_db
       logger.debug 'Rendering content from database'
       
-      # begin
+      begin
         @content_levels = params[:content_path]
         db_path = params[:content_path]
         edit_mode = false
@@ -182,10 +182,10 @@ module Cms # :nodoc:
             return true
           end
         end
-      # rescue Exception => e
-      #   logger.debug "Error rendering from db: #{e.inspect.gsub(/</, '&lt;')} #{e.backtrace}"
-      #   log_error(e)
-      # end
+      rescue Exception => e
+        logger.debug "Error rendering from db: #{e.inspect.gsub(/</, '&lt;')} #{e.backtrace}"
+        log_error(e)
+      end
       
       # if we haven't rendered something from the db by now, return false
       false

data/app/controllers/management/cms_controller.rb

@@ -137,57 +137,61 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
   end
   
-  def edit_master
-    @file_type = case params[:id]
-      when 'template' then 'html'
-      when 'web_stylesheet', 'print_stylesheet' then 'css'
-      else nil
-    end
-    
-    filename = case params[:id]
-      when 'template'         then File.join('app', 'views', 'layouts', 'application.rhtml')
-      when 'web_stylesheet'   then File.join('public', 'stylesheets', 'default.css')
-      when 'print_stylesheet' then File.join('public', 'stylesheets', 'print.css')
-      when 'ie_stylesheet'    then File.join('public', 'stylesheets', 'ie.css')
-      when 'ie6_stylesheet'   then File.join('public', 'stylesheets', 'ie6.css')
-    end
-    filename = File.join(Rails.root, filename)
-    
-    case request.method
-    when :get
-      @file_content = File.open(filename, 'r').read
-    when :post
-      begin
-        @pg = CmsPage.new
-        @page_objects = HashObject.new
-        render_to_string :inline => params[:file_content]
-      rescue Exception => e
-        message = e.message
-        flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>"
-        logger.debug e
-        return
-      end
-      
-      begin
-        if params[:file_content].empty?
-          flash[:error] = 'An error occurred, please contact support.'
-        else
-          File.open(filename, 'w') { |f| f.write(params[:file_content]) }
-          flash[:notice] = 'File saved.'
-        end
-        
-        CmsPage.find(:all).each do |page|
-          expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
-        end
-        
-        redirect_to :action => 'edit_master', :id => params[:id]
-      rescue Exception => e
-        message = e.message
-        flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>"
-        log_error(e)
-      end
-    end
-  end
+  #
+  # AKN 2012-11-08: This was never really a good idea. Need to figure out a better way. Disabling for now.
+  #
+  
+  # def edit_master
+  #   @file_type = case params[:id]
+  #     when 'template' then 'html'
+  #     when 'web_stylesheet', 'print_stylesheet' then 'css'
+  #     else nil
+  #   end
+  #   
+  #   filename = case params[:id]
+  #     when 'template'         then File.join('app', 'views', 'layouts', 'application.rhtml')
+  #     when 'web_stylesheet'   then File.join('public', 'stylesheets', 'default.css')
+  #     when 'print_stylesheet' then File.join('public', 'stylesheets', 'print.css')
+  #     when 'ie_stylesheet'    then File.join('public', 'stylesheets', 'ie.css')
+  #     when 'ie6_stylesheet'   then File.join('public', 'stylesheets', 'ie6.css')
+  #   end
+  #   filename = File.join(Rails.root, filename)
+  #   
+  #   case request.method
+  #   when :get
+  #     @file_content = File.open(filename, 'r').read
+  #   when :post
+  #     begin
+  #       @pg = CmsPage.new
+  #       @page_objects = HashObject.new
+  #       render_to_string :inline => params[:file_content]
+  #     rescue Exception => e
+  #       message = e.message
+  #       flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>"
+  #       logger.debug e
+  #       return
+  #     end
+  #     
+  #     begin
+  #       if params[:file_content].empty?
+  #         flash[:error] = 'An error occurred, please contact support.'
+  #       else
+  #         File.open(filename, 'w') { |f| f.write(params[:file_content]) }
+  #         flash[:notice] = 'File saved.'
+  #       end
+  #       
+  #       CmsPage.find(:all).each do |page|
+  #         expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
+  #       end
+  #       
+  #       redirect_to :action => 'edit_master', :id => params[:id]
+  #     rescue Exception => e
+  #       message = e.message
+  #       flash.now[:error] = "<pre>#{ERB::Util.html_escape(message)}</pre>"
+  #       log_error(e)
+  #     end
+  #   end
+  # end
   
   def pages
     @page_levels = [ '' ].concat((params[:path] || session[:cms_pages_path] || '').split('/').reject { |l| l.empty? })

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

@@ -12,6 +12,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <title><%= controller.controller_path.split('/').concat([ params[:action] ]).map { |s| s.titlecase }.join(' > ') %></title>
+    <%#= javascript_tag 'var djConfig = { isDebug: true };' %>
+    <%- if is_logged_in_user? -%>
+      <script src="/assets/dojo/dojo.js" type="text/javascript"></script>
+    <%- end -%>
     <%= stylesheet_link_tag    "application", :media => "all" %>
     <%= stylesheet_link_tag    "manage", :media => "all" %>
     <%#= stylesheet_link_tag 'print', :media => 'print' %>

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

@@ -12,6 +12,7 @@
                    :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
                    :html => { :onsubmit => 'teardownTextFieldHints();' } do -%>
 <table>
+  <col width="120"><col width="*"><col width="5">
 <%- if (@pg.id || 2) > 1 -%>
   <tr>
     <td>Name/URL:</td>

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

@@ -1,8 +1,8 @@
-<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '/<%= list_page.path %>'; $('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, :authenticity_token => form_authenticity_token.to_s %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
+<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '/<%= 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, :authenticity_token => form_authenticity_token.to_s %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>
-      <td<%= list_page.published_version >= 0 ? '' : ' style="color: gray"' %>><%= list_page.name %></td>
+      <td<%= list_page.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page.name %></td>
     </tr>
   </table>
 </div>

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

@@ -21,24 +21,14 @@ 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>
+  <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>
+  <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 %>

data/config/initializers/constants.rb

@@ -0,0 +1,33 @@
+#
+# define constants related to configurable behaviors (change to proper config.imagine_cms.X later)
+# for now, to override at the site-level:
+#   Object.send(:remove_const, :UseCmsPageCaching)
+#   UseCmsPageCaching = false
+#
+
+# Shouldn't need to adjust these
+ContentIgnoreDirectories = [ '.svn', 'CVS' ] unless defined? ContentIgnoreDirectories
+ContentIgnoreFilesRE = /^\./ unless defined? ContentIgnoreFilesRE
+ContentExcludeFiles = [ 'index' ] unless defined? ContentExcludeFiles
+UseCmsPageCaching = false unless defined? UseCmsPageCaching
+# UseCmsPageDatabase = CmsPage.table_exists? unless defined? UseCmsPageDatabase
+UseCmsAccessLevels = false unless defined? UseCmsAccessLevels
+EnableAssetTimestamping = true unless defined? EnableAssetTimestamping
+
+# CMS gallery setup
+GalleryMaxWidth = 586 unless defined? GalleryMaxWidth
+GalleryMaxHeight = 400 unless defined? GalleryMaxHeight
+GalleryThumbWidth = 50 unless defined? GalleryThumbWidth
+GalleryThumbHeight = 50 unless defined? GalleryThumbHeight
+
+# SSL settings
+SSL_REDIRECTS_ON = false unless defined?(SSL_REDIRECTS_ON)
+SSL_STANDARD_HOST = 'localhost' unless defined?(SSL_STANDARD_HOST)
+SSL_SECURE_HOST = '127.0.0.1' unless defined?(SSL_SECURE_HOST)
+# if using non-standard ports, also set these:
+# SSL_STANDARD_PORT = 80
+# SSL_SECURE_PORT = 443
+
+# Member component
+Member_AllowEmailAsLogin = true unless defined? Member_AllowEmailAsLogin
+Member_RequireMembername = false unless defined? Member_RequireMembername

data/lib/imagine_cms/engine.rb

@@ -6,8 +6,8 @@ module ImagineCms
     config.app_root = root
     middleware.use ::ActionDispatch::Static, "#{root}/public"
     
-    initializer :assets do |config|
-      Rails.application.config.assets.precompile += %w( codepress/** dojo/** manage.css )
+    initializer "imagine_cms.assets.precompile" do |config|
+      Rails.application.config.assets.precompile += %w( codepress/** dojo/** management.css reset.css )
     end
     
     #

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta7"
+  VERSION = "3.0.0.beta8"
 end

data/lib/imagine_cms.rb

@@ -14,35 +14,3 @@ end
 
 # Require our engine
 require "imagine_cms/engine"
-
-
-#
-# define constants related to configurable behaviors (change to proper config.imagine_cms.X later)
-#
-
-# Shouldn't need to adjust these
-ContentIgnoreDirectories = [ '.svn', 'CVS' ] unless defined? ContentIgnoreDirectories
-ContentIgnoreFilesRE = /^\./ unless defined? ContentIgnoreFilesRE
-ContentExcludeFiles = [ 'index' ] unless defined? ContentExcludeFiles
-UseCmsPageCaching = false unless defined? UseCmsPageCaching
-# UseCmsPageDatabase = CmsPage.table_exists? unless defined? UseCmsPageDatabase
-UseCmsAccessLevels = false unless defined? UseCmsAccessLevels
-EnableAssetTimestamping = true unless defined? EnableAssetTimestamping
-
-# CMS gallery setup
-GalleryMaxWidth = 586 unless defined? GalleryMaxWidth
-GalleryMaxHeight = 400 unless defined? GalleryMaxHeight
-GalleryThumbWidth = 50 unless defined? GalleryThumbWidth
-GalleryThumbHeight = 50 unless defined? GalleryThumbHeight
-
-# SSL settings
-SSL_REDIRECTS_ON = false unless defined?(SSL_REDIRECTS_ON)
-SSL_STANDARD_HOST = 'localhost' unless defined?(SSL_STANDARD_HOST)
-SSL_SECURE_HOST = '127.0.0.1' unless defined?(SSL_SECURE_HOST)
-# if using non-standard ports, also set these:
-# SSL_STANDARD_PORT = 80
-# SSL_SECURE_PORT = 443
-
-# Member component
-Member_AllowEmailAsLogin = true unless defined? Member_AllowEmailAsLogin
-Member_RequireMembername = false unless defined? Member_RequireMembername

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta7
+  version: 3.0.0.beta8
   prerelease: 6
 platform: ruby
 authors:
@@ -346,6 +346,7 @@ files:
 - app/views/util/_message.html.erb
 - app/views/util/_show_message.js.erb
 - app/views/util/_tab.html.erb
+- config/initializers/constants.rb
 - config/routes.rb
 - doc/Gemfile.html
 - doc/ImagineCms.html