browsercms 3.5.4 → 3.5.5

data/COPYRIGHT.txt

@@ -1,4 +1,4 @@
-All BrowserCMS code is Copyright (C) 1998-2012 by BrowserMedia, LLC.
+All BrowserCMS code is Copyright (C) 1998-2013 by BrowserMedia, LLC.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

data/README.markdown

@@ -28,7 +28,7 @@ Here's a quick overview of some of the more notable features:
 See the [Getting Started](https://github.com/browsermedia/browsercms/wiki/Getting-Started) guide for instructions on how to install and start a project with BrowserCMS.
 
 ## License
-BrowserCMS is released under a LGPL license, and is copyright 1998-2012 BrowserMedia. The complete copyright can be found in COPYRIGHT.txt, and copy of the license can be found in LICENSE.txt.
+BrowserCMS is released under a LGPL license, and is copyright 1998-2013 BrowserMedia. The complete copyright can be found in COPYRIGHT.txt, and copy of the license can be found in LICENSE.txt.
 
 ## Documentation / Support
 The user documentation and guides for this version of the application can be found at:

data/app/helpers/cms/form_builder.rb

@@ -66,12 +66,16 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   #
   # @param [Symbol] method The name of the model this form upload is associated with
   # @param [Hash] options
-  # @option options [String] :label (Data)
+  # @option options [String] :label (method) If no label is specified, the human readable name for method will be used.
   # @option options [String] :instructions (blank) Helpful tips for the person entering the field, appears blank if nothing is specified.
   # @option options [Boolean] :edit_path (false) If true, render a text field to allow users to edit path for this file.
   # @option options [Boolean] :edit_section (false) If true, render a select box which allows users to choose which section this attachment should be placed in.
   def cms_file_field(method, options={})
     @object.ensure_attachment_exists if @object.respond_to?(:ensure_attachment_exists)
+
+    unless options[:label]
+      options[:label] = method.to_s.humanize
+    end
     render_form_field("file_field", method, options)
   end
 

data/app/views/cms/blocks/edit.html.erb

@@ -3,7 +3,7 @@
   <%= stylesheet_link_tag('cms/content_library') %>
 <% end %>
 <% page_title "Content Library / Edit #{content_type.display_name}" %>
-<% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'" %>
+<% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'".html_safe %>
 <%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
 
 <% if @block.respond_to?(:deleted) && @block.deleted %>

data/app/views/cms/blocks/index.html.erb

@@ -23,7 +23,7 @@
            elsif i == 0
              %Q{ colspan='2' class='name first'}
           end %>
-        <th<%= attrs %>>
+        <th<%= raw attrs %>>
           <div class="dividers">
             <% if column[:order] %>
               <%= link_to column[:label], cms_sortable_column_path(content_type, column[:order])%>

data/app/views/cms/blocks/usages.html.erb

@@ -1,5 +1,5 @@
 <% page_title "Content Library / View Usages" %>
-<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'" %>
+<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'".html_safe %>
 <%= content_for :html_head do %>
   <%= stylesheet_link_tag("cms/content_library") %>
   <%= javascript_tag do %>

data/app/views/cms/connectors/new.html.erb

@@ -1,4 +1,4 @@
-<% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page" %>
+<% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page".html_safe %>
 
 <%= content_for :html_head do %>
   <%= stylesheet_link_tag("cms/content_library") %>

data/app/views/cms/content/no_page.html.erb

@@ -8,7 +8,7 @@
 %>
 
 <% @content_for_functions = "" %>
-<%= content_for :functions, "<h1>#{ page_title }</h1>" %>
+<%= content_for :functions, "<h1>#{ page_title }</h1>".html_safe %>
 
 <% @content_for_html_head = "" %>
 <%= content_for :html_head do %>

data/app/views/cms/file_blocks/_form.html.erb

@@ -1,5 +1,5 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
+<%= f.cms_file_field :file, :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= f.cms_tag_list %>
 
 

data/app/views/cms/image_blocks/_form.html.erb

@@ -1,3 +1,3 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
+<%= f.cms_file_field :file, :label => "Image", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= f.cms_tag_list %>

data/app/views/cms/sessions/new.html.erb

@@ -3,11 +3,11 @@
   <%= javascript_tag do %>
       jQuery(function($){
         $('#login_button').hover(function(){
-          $('#login_button').css('background-image', 'url(/images/cms/buttons/button_cap_h.png)');
-          $('#login_button > input').css('background-image', 'url(/images/cms/buttons/button_h.png)');
+          $('#login_button').css('background-image', 'url(<%= asset_path "cms/buttons/button_cap_h.png" %>)');
+          $('#login_button > input').css('background-image', 'url(<%= asset_path "cms/buttons/button_h.png" %>)');
         }, function(){
-          $('#login_button').css('background-image', 'url(/images/cms/buttons/button_cap.png)');
-          $('#login_button > input').css('background-image', 'url(/images/cms/buttons/button.png)');
+          $('#login_button').css('background-image', 'url(<%= asset_path "cms/buttons/button_cap.png" %>)');
+          $('#login_button > input').css('background-image', 'url(<%= asset_path "cms/buttons/button.png" %>)');
   })});
   <% end %>
 <% end %>

data/bin/bcms

@@ -193,7 +193,7 @@ Cms.table_prefix = "cms_"
   def configure_mail_server
     [
         "# Configure your mail server's address below",
-        "config.action_mailer.smtp_settings = {:address => 'mail.yourmailserver.com', :domain => config.cms.site_domain}}\n"
+        "config.action_mailer.smtp_settings = {:address => 'mail.yourmailserver.com', :domain => config.cms.site_domain}\n"
     ].reverse.each do |line|
       environment line, :env => "production"
     end

data/db/migrate/20080815014337_browsercms_3_0_0.rb

@@ -73,7 +73,7 @@ class Browsercms300 < ActiveRecord::Migration
 
     create_versioned_table :html_blocks do |t|
       t.string :name
-      t.string :content, :limit => 64.kilobytes + 1
+      t.text :content, :limit => 64.kilobytes + 1
     end
 
     create_table prefix(:sections) do |t|

data/doc/release_notes.md

@@ -1,3 +1,18 @@
+v3.5.5
+======
+
+Community contributed bug fixes, including making it easier to start contributing to the project.
+
+* [#561] Fix invalid code in generated production.rb file (Thanks RoopeHakulinen)
+* [#557] Fix extra column on blocks index page (Thanks metalon)
+* [#543] Allow cms_file_field to use default label (Thanks josiahivey)
+* [#563] Continuous Integration - Get Travis CI up and working for the project.
+* [#539] Fix missing assets on CMS Login page (Thanks korin)
+* [#537] Better support core contributions by removing database.yml from checkin. Run `rake project:setup[mysql]` to create a database.yml for your local database. (Thanks josiahivey)
+* [#564] Update to Rails 3.2.12 - Ensure tests to pass (there appeared to be some changes in inflection and html_safe between 3.2.5 and 3.2.8)
+
+See https://github.com/browsermedia/browsercms/issues?milestone=18&page=1&state=closed for more details.
+
 v3.5.4
 ======
 

data/lib/cms/commands/actions.rb

@@ -24,7 +24,7 @@ module Cms
 
       # i.e. BcmsWhatever
       def module_class
-        current_project.classify
+        current_project.camelize
       end
 
       # Runs `bundle install` inside the correct project directory (unless --skip_bundle was passed to the command)

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.4"
+  VERSION = "3.5.5"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -776,7 +776,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 250022716012071557
+      hash: -1146009963062196291
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24