browsercms 3.4.2 → 3.5.0.rc1

data/README.markdown

@@ -12,6 +12,7 @@ BrowserCMS is intended to offer features comparable to commercial CMS products,
 Here's a quick overview of some of the more notable features:
 
 * Mountable Engine: Each CMS project is a rails project that depends on the BrowserCMS engine. Developers can add new controllers, views, etc; just like any rails project.
+* Mobile Friendly: Sites can be built to use mobile optimized designs that are optimized for small screens, with low bandwidth, with responsive design.
 * In Context Editing: Users can browse their site to locate content and change it right on the page itself.
 * Design friendly Templates: Pages aren't just a template and giant single chunk of HTML. Templates can be built to have multiple editable areas, to allow for rich designs that are still easy to manage by non-technical users.
 * Sitemap: An explorer/finder style view of sections and pages in a site allowing users to add and organize pages.

data/app/assets/javascripts/cms/application.js

@@ -7,5 +7,6 @@
 //= require jquery.selectbox
 //= require jquery.taglist
 //= require cms/core_library
+//= require cms/attachment_manager
 //
 

data/app/assets/javascripts/cms/attachment_manager.js.erb

@@ -0,0 +1,87 @@
+// Allows users to upload files via AJAX as attachments for a given block.
+//
+$(function () {
+
+    // Return the authenticity token for any JS function that needs to do AJAX.
+    // Since AJAX posts will fail if you don't attach this as defined here: http://michaelhendrickx.com/201012_jquery-ajax-with-rails-authenticity-token.html
+    $.cms.auth_token = function () {
+        return $('meta[name=csrf-token]').attr('content');
+    };
+
+    $.cms.AttachmentManager = {
+        upload:function (file) {
+            var assetName = $('#asset_types').val()
+                    , attachableClass = $('#asset_attachable_class').val()
+                    , attachableIDField = $('#asset_attachable_id')
+                    , attachableID = attachableIDField.val()
+                    , file = $('#asset_add_file')
+                    , clone = file.clone()
+                    , form = $('<form target="asset_add_uploader" method="post" action="/cms/attachments" enctype="multipart/form-data" style="visibility:hidden">')
+                    , fields = '';
+
+            fields += '<input type="hidden" name="attachment[attachment_name]" value="' + assetName.toLowerCase() + '" />';
+            fields += '<input type="hidden" name="attachment[attachable_class]" value="' + attachableClass + '" />';
+            fields += '<input type="hidden" name="attachment[attachable_type]" value="' + attachableClass + '" />';
+            fields += '<input type="hidden" name="attachment[attachable_id]" value="' + attachableID + '" />';
+            fields += '<input type="hidden" name="authenticity_token" value="' + $.cms.authenticity_token + '" />';
+
+            $('body').append(form);
+            form.append(fields);
+            form.append(file);
+            attachableIDField.after(clone);
+
+            var inp = $('<input type="file" name="attachment[data]" id="asset_add_file" onchange="$.cms.AttachmentManager.upload(this)" />');
+
+            clone.after($('<img>')
+                    .css({position:'static', margin:'5px 0 0 5px', 'verticalAlign':'middle'})
+                    .attr({'id':'file-asset-uploader', 'src':'<%= asset_path 'cms/file-uploading.gif' %>'}));
+            clone.replaceWith(inp);
+
+            form.submit();
+
+            $('div.buttons').hide();
+
+        },
+
+        // @param [Integer] id The id of the attachment to delete.
+        destroy:function (id) {
+            if (confirm("Are you sure want to delete this attachment?")) {
+                $.post('/cms/attachments/' + id, {_method:'delete', authenticity_token:$.cms.auth_token()}, function (attachment_id) {
+                    console.log(attachment_id);
+                    $("#attachment_" + attachment_id).hide();
+                    if ($("#assets_table > table tr:visible").length <= 2) {
+                        $("#assets_table > table").hide();
+                    }
+                }, 'script');
+
+            }
+            return false;
+        }
+    }
+
+    $('#asset_types').selectbox({width:'445px'});
+
+    $('#asset_types').change(function () {
+        if ($(this).val().indexOf('Select') != 0) {
+            $('#asset_add').show();
+        } else {
+            $('#asset_add').hide();
+        }
+    });
+
+    // After an attachment is uploaded, copy the values into the main attachment table.
+    $('#asset_add_uploader').load(function () {
+        var response = $(this).contents();
+
+        if (response.find('tr').html()) {
+            var asset = $(response).find('tr').clone();
+            var id = $(response).find("#asset-id").html();
+            var asset_ids = $('#attachment_manager_ids_list');
+
+            $(asset_ids).val($(asset_ids).val() + id + ",");
+            $('#file-asset-uploader').remove();
+            $('#assets_table > table').append(asset).show();
+            $('div.buttons').show();
+        }
+    });
+});

data/app/assets/javascripts/cms/core_library.js.erb

@@ -3,7 +3,7 @@
 //
 //= require jquery
 //
-jQuery(function($) {
+jQuery(function ($) {
 
     //It would be cool if these were added to the real jQuery
     //You can call this a few ways:
@@ -11,7 +11,7 @@ jQuery(function($) {
     //createElement('p','hi') => "<p>hi</p>"
     //createElement('p', {align: 'center'}) => "<p align="center"/>"
     //createElement('p','hi',{align: 'center'}) => "<p align="center">hi</p>"
-    $.createElement = function(tag_name, tag_value, tag_attrs) {
+    $.createElement = function (tag_name, tag_value, tag_attrs) {
         var name = tag_name
         if (typeof tag_value == "object") {
             var value = null
@@ -22,7 +22,7 @@ jQuery(function($) {
         }
         var element = $(document.createElement(tag_name))
         if (attrs) {
-            $.each(attrs, function(k, v) {
+            $.each(attrs, function (k, v) {
                 element.attr(k, v)
             })
         }
@@ -40,29 +40,29 @@ jQuery(function($) {
     ]
 
     $.cms = {
-        sanitizeFileName: function(s) {
+        sanitizeFileName:function (s) {
             var split = s.split(/\/|\\/)
             s = split[split.length - 1]
-            $.each(sanitizationRegexes, function(i, e) {
+            $.each(sanitizationRegexes, function (i, e) {
                 var r = new RegExp(e[0].source, 'g')
                 s = s.replace(r, e[1])
             })
             return s;
         },
-        slug: function(s) {
+        slug:function (s) {
             return $.trim(s.toLowerCase().replace(/[^a-zA-Z0-9_\s]+/g, '')).replace(/\ +/g, '-')
         },
-        showNotice: function(msg) {
-            $('#message').removeClass('error').addClass('notice').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+        showNotice:function (msg) {
+            $('#message').removeClass('error').addClass('notice').html(msg).parent().show().animate({opacity:1.0}, 3000).fadeOut("normal")
         },
-        showError: function(msg) {
-            $('#message').removeClass('notice').addClass('error').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+        showError:function (msg) {
+            $('#message').removeClass('notice').addClass('error').html(msg).parent().show().animate({opacity:1.0}, 3000).fadeOut("normal")
         },
-        attachEventHandlers: function(context) {
-            $('a.button', context).click(function() {
+        attachEventHandlers:function (context) {
+            $('a.button', context).click(function () {
                 if ($(this).hasClass('disabled')) return false;
             });
-            $('a.http_post, a.http_put, a.http_delete', context).click(function() {
+            $('a.http_post, a.http_put, a.http_delete', context).click(function () {
                 if ($(this).hasClass('disabled')) return false;
                 if ($(this).hasClass('confirm_with_title') ? confirm(this.title) : true) {
 
@@ -96,25 +96,38 @@ jQuery(function($) {
 
     $.cms.attachEventHandlers(document);
 
-    $('#message.notice').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
-    $('#message.error').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+    $('#message.notice').parent().show().animate({opacity:1.0}, 3000).fadeOut("normal")
+    $('#message.error').parent().show().animate({opacity:1.0}, 3000).fadeOut("normal")
 
 });
 
 // Automatically enable date_picker controls
-$(function() {
-	if($.datepicker){
-		$('input.date_picker').datepicker({ changeFirstDay: false, changeMonth:true, changeYear:true, closeText:'', showButtonPanel: true, dateFormat: '<%= Cms::DatePicker.jquery_format %>' });
-	}
+$(function () {
+    if ($.datepicker) {
+        $('input.date_picker').datepicker({ changeFirstDay:false, changeMonth:true, changeYear:true, closeText:'', showButtonPanel:true, dateFormat:'<%= Cms::DatePicker.jquery_format %>' });
+    }
+});
+
+// UI Enhancement to suggest paths for uploaded files
+$(function () {
+    var path_input = $('.suggest_file_path');
+    if (path_input.length) {
+        $('select[data-purpose=section_selector], input[data-purpose=cms_file_field]').change(function () {
+            var section_id = $('select[data-purpose=section_selector]').val();
+            var section_path = $('.section_id_map[data-id='+ section_id +']').data('path');
+            var file_path =  $.cms.sanitizeFileName($('input[data-purpose=cms_file_field]').val());
+            path_input.val(section_path + file_path);
+        });
+    }
 });
 
 //CookieSet allows us to treat one cookie value as a set of values
-jQuery(function($) {
+jQuery(function ($) {
     var sep = '|'
 
     $.cookieSet = {
         //Treats the cookie as an array
-        add: function(name, value, options) {
+        add:function (name, value, options) {
             this.remove(name, value, options)
             var set = this.get(name)
             if (set) {
@@ -126,7 +139,7 @@ jQuery(function($) {
             return this.get(name)
         },
 
-        get: function(name) {
+        get:function (name) {
             var val = $.cookie(name)
             if (val) {
                 return val.split(sep)
@@ -135,11 +148,11 @@ jQuery(function($) {
             }
         },
 
-        remove: function(name, value, options) {
+        remove:function (name, value, options) {
             var set = this.get(name)
             if (set) {
                 var arr = []
-                $.each(set, function() {
+                $.each(set, function () {
                     if (this != value + '') {
                         arr.push(this)
                     }
@@ -152,7 +165,7 @@ jQuery(function($) {
         },
 
         //Treats the cookie as an array
-        contains: function(name, value) {
+        contains:function (name, value) {
             var set = this.get(name)
             if (set) {
                 return $.inArray(value + '', set) > -1

data/app/assets/stylesheets/cms/application.css.erb

@@ -5,6 +5,7 @@
 *= require cms/menu
 *= require cms/buttons
 *= require cms/data_table
+*= require cms/attachment_manager
 *= require_self
 */
 

data/app/assets/stylesheets/cms/attachment_manager.css.scss

@@ -0,0 +1,28 @@
+/**
+*   Styles for the cms_attachment_manager form widget and attachment_viewer helper
+*/
+#assets_table {
+  label {
+    font-weight: bold;
+    color: #3E78C7
+  }
+  th {
+    font-weight: bold
+  }
+  td, th {
+    margin: 10px auto;
+    padding: 10px 15px;
+    text-align: center;
+    vertical-align: middle;
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+#asset_add {
+  #asset_add_uploader {
+    visibility: none;
+    height: 1px;
+    width: 1px
+  }
+}
+

data/app/controllers/cms/application_controller.rb

@@ -32,7 +32,7 @@ class ApplicationController < ::ApplicationController
     end
      
     def redirect_to_cms_site
-      if perform_caching && !cms_site?
+      if using_cms_subdomains? && !request_is_for_cms_subdomain?
         redirect_to(url_with_cms_domain_prefix)
       end
     end 

data/app/controllers/cms/attachments_controller.rb

@@ -1,13 +1,48 @@
 module Cms
-class AttachmentsController < Cms::BaseController
-  def show
-    @attachment = Attachment.find(params[:id])
-    @attachment = @attachment.as_of_version(params[:version]) if params[:version]
-    send_file(@attachment.full_file_location, 
-      :filename => @attachment.file_name,
-      :type => @attachment.file_type,
-      :disposition => "inline"
-    )     
+  class AttachmentsController < Cms::BaseController
+
+    skip_before_filter :redirect_to_cms_site, :only => [:download]
+    skip_before_filter :login_required, :only => [:download]
+    skip_before_filter :cms_access_required, :only => [:download]
+
+    include ContentRenderingSupport
+    include Cms::Attachments::Serving
+
+    # Returns a specific version of an attachment.
+    # Used to display older versions in the editor interface.
+    def show
+      @attachment = Attachment.unscoped.find(params[:id])
+      @attachment = @attachment.as_of_version(params[:version]) if params[:version]
+      send_attachment(@attachment)
+    end
+
+    # This handles serving files for attachments that don't have a user specified path. If a path is defined,
+    # the ContentController#try_to_stream will handle it.
+    #
+    # Users can only download files if they have permission to view it.
+    def download
+      @attachment = Attachment.find(params[:id])
+      send_attachment(@attachment)
+    end
+
+    def create
+      @attachment = Attachment.new(params[:attachment])
+      @attachment.published = true
+      if @attachment.save
+        render :partial => 'cms/attachments/attachment_wrapper', :locals => {:attachment => @attachment}
+      else
+        #TODO: render html error string
+        render :inline => 'an error ocurred'
+      end
+    end
+
+    def destroy
+      @attachment = Attachment.find(params[:id])
+      @attachment.destroy
+      render :json => @attachment.id
+    end
+
+    private
+
   end
-end
 end

data/app/controllers/cms/cache_controller.rb

@@ -10,7 +10,7 @@ class CacheController < Cms::BaseController
   end
   
   def destroy
-    Cms.flush_cache
+    Cms::Cache.flush
     flash[:notice] = "Page Cache Flushed"
     redirect_to :action => "show"
   end

data/app/controllers/cms/content_block_controller.rb

@@ -2,155 +2,156 @@ require 'cms/category_type'
 # This is not called directly
 # This is the base class for other content blocks
 module Cms
-class ContentBlockController < Cms::BaseController
-  
-  layout :determine_layout
-  
-  before_filter :set_toolbar_tab
-  
-  helper_method :block_form, :new_block_path, :block_path, :blocks_path, :content_type
-  helper Cms::RenderingHelper
-  # Basic REST Crud Action
-  
-  def index
-    load_blocks
-    render "#{template_directory}/index"
-  end
-  
-  def show
-    load_block_draft
-    render "#{template_directory}/show"
-  end
-  
-  def new
-    build_block
-    set_default_category
-    render "#{template_directory}/new"
-  end
-  
-  def create
-    if create_block
-      after_create_on_success
-    else
-      after_create_on_failure
+  class ContentBlockController < Cms::BaseController
+
+    layout :determine_layout
+
+    before_filter :set_toolbar_tab
+
+    helper_method :block_form, :new_block_path, :block_path, :blocks_path, :content_type
+    helper Cms::RenderingHelper
+    # Basic REST Crud Action
+
+    def index
+      load_blocks
+      render "#{template_directory}/index"
     end
-  rescue Exception => @exception
-    raise @exception if @exception.is_a?(Cms::Errors::AccessDenied)
-    after_create_on_error
-  end
-  
-  def edit
-    load_block_draft
-    render "#{template_directory}/edit"
-  end
-  
-  def update
-    if update_block
-      after_update_on_success
-    else
-      after_update_on_failure
+
+    def show
+      load_block_draft
+      render "#{template_directory}/show"
     end
-  rescue ActiveRecord::StaleObjectError => @exception
-    after_update_on_edit_conflict
-  rescue Exception => @exception
-    raise @exception if @exception.is_a?(Cms::Errors::AccessDenied)
-    after_update_on_error
-  end
-  
-  def destroy
-    do_command("deleted") { @block.destroy }
-    redirect_to_first params[:_redirect_to], blocks_path
-  end
-  
-  # Additional CMS Action
-  
-  def publish
-    do_command("published") { @block.publish! }
-    redirect_to_first params[:_redirect_to], block_path(@block)
-  end
-  
-  def revert_to
-    do_command("reverted to version #{params[:version]}") do
-      revert_block(params[:version])
+
+    def new
+      build_block
+      set_default_category
+      render "#{template_directory}/new"
     end
-    redirect_to_first params[:_redirect_to], block_path(@block)
-  end
-  
-  def version
-    load_block
-    if params[:version]
-      @block = @block.as_of_version(params[:version])
+
+    def create
+      if create_block
+        after_create_on_success
+      else
+        after_create_on_failure
+      end
+    rescue Exception => @exception
+      raise @exception if @exception.is_a?(Cms::Errors::AccessDenied)
+      after_create_on_error
     end
-    render "#{template_directory}/show"
-  end
-  
-  def versions
-    if model_class.versioned?
+
+    def edit
+      load_block_draft
+      render "#{template_directory}/edit"
+    end
+
+    def update
+      if update_block
+        after_update_on_success
+      else
+        after_update_on_failure
+      end
+    rescue ActiveRecord::StaleObjectError => @exception
+      after_update_on_edit_conflict
+    rescue Exception => @exception
+      raise @exception if @exception.is_a?(Cms::Errors::AccessDenied)
+      after_update_on_error
+    end
+
+    def destroy
+      do_command("deleted") { @block.destroy }
+      redirect_to_first params[:_redirect_to], blocks_path
+    end
+
+    # Additional CMS Action
+
+    def publish
+      do_command("published") { @block.publish! }
+      redirect_to_first params[:_redirect_to], block_path(@block)
+    end
+
+    def revert_to
+      do_command("reverted to version #{params[:version]}") do
+        revert_block(params[:version])
+      end
+      redirect_to_first params[:_redirect_to], block_path(@block)
+    end
+
+    def version
       load_block
-      render "#{template_directory}/versions"
-    else
-      render :text => "Not Implemented", :status => :not_implemented
-    end    
-  end
-    
-  def usages
-    load_block_draft
-    @pages = @block.connected_pages.all(:order => 'name')
-    render "#{template_directory}/usages"
-  end
-  
-  protected
+      if params[:version]
+        @block = @block.as_of_version(params[:version])
+      end
+      render "#{template_directory}/show"
+    end
+
+    def versions
+      if model_class.versioned?
+        load_block
+        render "#{template_directory}/versions"
+      else
+        render :text => "Not Implemented", :status => :not_implemented
+      end
+    end
+
+    def usages
+      load_block_draft
+      @pages = @block.connected_pages.all(:order => 'name')
+      render "#{template_directory}/usages"
+    end
+
+    protected
     # methods that are used to detemine what content block type we are dealing with
 
     def content_type_name
-      self.class.name.sub(/Controller/,'').singularize
+      self.class.name.sub(/Controller/, '').singularize
     end
 
     def content_type
       @content_type ||= ContentType.find_by_key(content_type_name)
-    end  
+    end
 
     def model_class
       content_type.model_class
     end
-  
+
     def model_form_name
       content_type.model_class_form_name
     end
-  
+
     # methods for loading one or a collection of blocks
-  
+
     def load_blocks
       options = {}
       if params[:section_id] && params[:section_id] != 'all'
-        options[:include] = { :attachment =>  :section_node }
+        options[:include] = {:attachments => :section_node}
         options[:conditions] = ["#{Namespacing.prefix("section_nodes")}.ancestry = ?", Section.find(params[:section_id]).ancestry_path]
       end
-      options[:page] = params[:page]    
+      options[:page] = params[:page]
       options[:order] = model_class.default_order if model_class.respond_to?(:default_order)
       options[:order] = params[:order] unless params[:order].blank?
+
       scope = model_class.respond_to?(:list) ? model_class.list : model_class
       @blocks = scope.searchable? ? scope.search(params[:search]).paginate(options) : scope.paginate(options)
       check_permissions
     end
-  
+
     def load_block
       @block = model_class.find(params[:id])
       check_permissions
     end
-  
+
     def load_block_draft
       @block = model_class.find(params[:id])
       @block = @block.as_of_draft_version if model_class.versioned?
       check_permissions
     end
-  
+
     # path related methods - available in the view as helpers
-  
+
     def new_block_path(block, options={})
       cms_new_path_for(block, options)
     end
-  
+
     def block_path(block, action=nil)
       path = []
       path << engine_for(block)
@@ -158,31 +159,34 @@ class ContentBlockController < Cms::BaseController
       path.concat path_elements_for(block)
       path
     end
-  
+
     def blocks_path(options={})
-      cms_index_path_for(@block.class, options)
+      cms_index_path_for(@content_type.model_class, options)
     end
 
     # This is the partial that will be used in the form
     def block_form
       @content_type.form
     end
-  
-    # new related methods
-  
+
+
     def build_block
-      @block = model_class.new(params[model_form_name])
+      begin
+        @block = model_class.new(params[model_form_name])
+      ensure
+        # Recover from an Exception thrown during binding of parameters to model class
+        # Need to make sure @block exists for form helpers to correctly generate paths
+        @block = model_class.new unless @block
+      end
       check_permissions
     end
 
     def set_default_category
       if @last_block = model_class.last
         @block.category = @last_block.category if @block.respond_to?(:category=)
-      end      
+      end
     end
-    
-    # create related methods
-    
+
     def create_block
       build_block
       @block.save
@@ -203,10 +207,22 @@ class ContentBlockController < Cms::BaseController
     end
 
     def after_create_on_error
-      logger.error "#{@exception.message}\n#{@exception.backtrace.join('\n')}"      
+      log_complete_stacktrace(@exception)
       after_create_on_failure
     end
 
+    def after_update_on_error
+      log_complete_stacktrace(@exception)
+      after_update_on_failure
+    end
+
+    # Print the underlying stack trace to the logs for debugging.
+    # Should be human readable (i.e. line breaks)
+    # See http://stackoverflow.com/questions/228441/how-do-i-log-the-entire-trace-back-of-a-ruby-exception-using-the-default-rails-l for discussion of implementation
+    def log_complete_stacktrace(exception)
+      logger.error "#{exception.message}\n#{exception.backtrace.join("\n")}"
+    end
+
     # update related methods
     def update_block
       load_block
@@ -227,10 +243,6 @@ class ContentBlockController < Cms::BaseController
       after_update_on_failure
     end
 
-    def after_update_on_error
-      logger.error "#{@exception.message}\n#{@exception.backtrace.join('\n')}"
-      after_update_on_failure
-    end
 
     # methods for other actions
 
@@ -255,7 +267,7 @@ class ContentBlockController < Cms::BaseController
         false
       end
     end
-    
+
     # Use a "whitelist" approach to access to avoid mistakes
     # By default everyone can create new block and view them and their properties,
     # but blocks can only be modified based on the permissions of the pages they
@@ -287,5 +299,5 @@ class ContentBlockController < Cms::BaseController
       "cms/blocks"
     end
 
-end
+  end
 end