Skip to content

Commit b3afb75

Browse files
author
Jeffrey Dettmann
committed
Merge branch 'master' of git@github.com:browsermedia/browsercms
2 parents 06f4810 + 8fb5db3 commit b3afb75

35 files changed

+7238
-3409
lines changed

‎How_to_release_notes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Here are the basic steps required to release a new version of the browsercms gem, as well as testing, etc.
22

33
A. Releasing and testing the gem upgrade locally
4-
1. Update the lib/cms/version.rb with the correct version #
4+
1. Update the lib/cms/version.rb with the correct version number (i.e. 3.1.x)
55
2. [sudo] rake build install (Builds the gemspec, builds gem and installs it. Use sudo as needed
66
4. cd /myproject
77
5. script/generate browser_cms (Upgrades the project to use the latest gem version)

‎Rakefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ begin
4242
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
4343
end
4444
rescue LoadError
45-
puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
45+
puts $!
46+
puts "Jeweler might not available. Install it with: sudo gem install jeweler"
4647
end
4748

4849
# BrowserCMS gem will only be released to Gemcutter/rubygems. No longer going to RubyForge.

‎app/controllers/cms/dynamic_views_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ def load_view
6363
@view = dynamic_view_type.find(params[:id])
6464
end
6565

66-
end
66+
end

‎app/controllers/cms/portlet_controller.rb‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ class Cms::PortletController < Cms::ApplicationController
66
def execute_handler
77
@portlet = Portlet.find(params[:id])
88
@portlet.controller = self
9-
redirect_to @portlet.send(params[:handler])
9+
10+
method = params[:handler]
11+
if @portlet.class.superclass.method_defined?(method) or @portlet.class.private_method_defined?(method) or @portlet.class.protected_method_defined?(method)
12+
raise Cms::Errors::AccessDenied
13+
else
14+
redirect_to @portlet.send(method)
15+
end
16+
1017
end
1118

12-
end
19+
end

‎app/views/cms/dynamic_views/index.html.erb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@
5555
<div class="pagination">No results found for '<%= params[:key_word] %>'</div>
5656
<% elsif @views.total_pages > 1 %>
5757
<%= render_pagination @views, dynamic_view_type.name.pluralize.underscore.to_sym %>
58-
<% end %>
58+
<% end %>
59+

‎browsercms.gemspec‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
Gem::Specification.new do |s|
77
s.name = %q{browsercms}
8-
s.version = "3.1.1"
8+
s.version = "3.1.2"
99

1010
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
1111
s.authors = ["BrowserMedia"]
12-
s.date = %q{2010-06-28}
12+
s.date = %q{2010-06-30}
1313
s.description = %q{General purpose Web Content Management in Rails.}
1414
s.email = %q{github@browsermedia.com}
1515
s.executables = ["browsercms", "bcms"]
@@ -1342,88 +1342,88 @@ Gem::Specification.new do |s|
13421342
s.rdoc_options = ["--charset=UTF-8"]
13431343
s.require_paths = ["lib"]
13441344
s.rubyforge_project = %q{browsercms}
1345-
s.rubygems_version = %q{1.3.5}
1345+
s.rubygems_version = %q{1.3.7}
13461346
s.summary = %q{BrowserCMS is a general purpose, open source Web Content Management System (CMS) written in Ruby on Rails. Designed for web developers who want to create great looking websites while using standard Rails tools for customizing it.}
13471347
s.test_files = [
1348-
"test/integration/login_test.rb",
1349-
"test/integration/cms/password_management_test.rb",
1350-
"test/integration/cms/ckeditor_test.rb",
1351-
"test/functional/tests/pretend_controller_test.rb",
1352-
"test/functional/cms/links_controller_test.rb",
1353-
"test/functional/cms/image_blocks_controller_test.rb",
1348+
"test/custom_assertions.rb",
1349+
"test/factories.rb",
13541350
"test/functional/cms/cache_controller_test.rb",
1355-
"test/functional/cms/home_controller_test.rb",
1356-
"test/functional/cms/pages_controller_test.rb",
1351+
"test/functional/cms/categories_controller_test.rb",
1352+
"test/functional/cms/connectors_controller_test.rb",
13571353
"test/functional/cms/content_block_controller_test.rb",
1358-
"test/functional/cms/dashboard_controller_test.rb",
1354+
"test/functional/cms/content_controller_test.rb",
13591355
"test/functional/cms/content_types_controller_test.rb",
1360-
"test/functional/cms/portlets_controller_test.rb",
1356+
"test/functional/cms/dashboard_controller_test.rb",
1357+
"test/functional/cms/dynamic_views_controller_test.rb",
1358+
"test/functional/cms/file_blocks_controller_test.rb",
1359+
"test/functional/cms/groups_controller_test.rb",
1360+
"test/functional/cms/home_controller_test.rb",
13611361
"test/functional/cms/html_blocks_controller_test.rb",
1362+
"test/functional/cms/image_blocks_controller_test.rb",
1363+
"test/functional/cms/links_controller_test.rb",
1364+
"test/functional/cms/pages_controller_test.rb",
1365+
"test/functional/cms/portlets_controller_test.rb",
13621366
"test/functional/cms/section_nodes_controller_test.rb",
1363-
"test/functional/cms/toolbar_controller_test.rb",
1367+
"test/functional/cms/sections_controller_test.rb",
13641368
"test/functional/cms/sessions_controller_test.rb",
1369+
"test/functional/cms/toolbar_controller_test.rb",
13651370
"test/functional/cms/users_controller_test.rb",
1366-
"test/functional/cms/categories_controller_test.rb",
1367-
"test/functional/cms/file_blocks_controller_test.rb",
1368-
"test/functional/cms/content_controller_test.rb",
1369-
"test/functional/cms/connectors_controller_test.rb",
1370-
"test/functional/cms/dynamic_views_controller_test.rb",
1371-
"test/functional/cms/sections_controller_test.rb",
1372-
"test/functional/cms/groups_controller_test.rb",
1373-
"test/unit/behaviors/searching_test.rb",
1371+
"test/functional/tests/pretend_controller_test.rb",
1372+
"test/integration/cms/ckeditor_test.rb",
1373+
"test/integration/cms/password_management_test.rb",
1374+
"test/integration/login_test.rb",
1375+
"test/test_helper.rb",
1376+
"test/test_logging.rb",
13741377
"test/unit/behaviors/attaching_test.rb",
13751378
"test/unit/behaviors/dynamic_attributes_test.rb",
1376-
"test/unit/behaviors/taggable_test.rb",
13771379
"test/unit/behaviors/publishable_test.rb",
1380+
"test/unit/behaviors/searching_test.rb",
1381+
"test/unit/behaviors/taggable_test.rb",
1382+
"test/unit/extensions/active_record/base_test.rb",
13781383
"test/unit/extensions/hash_test.rb",
13791384
"test/unit/extensions/integer_test.rb",
1380-
"test/unit/extensions/active_record/base_test.rb",
1381-
"test/unit/models/page_test.rb",
1382-
"test/unit/models/email_page_portlet_test.rb",
1385+
"test/unit/helpers/application_helper_test.rb",
1386+
"test/unit/helpers/form_builder_test.rb",
1387+
"test/unit/helpers/menu_helper_test.rb",
1388+
"test/unit/helpers/page_helper_test.rb",
1389+
"test/unit/helpers/path_helper_test.rb",
1390+
"test/unit/lib/acts_as_content_page_test.rb",
1391+
"test/unit/lib/cms/authentication/controller_test.rb",
1392+
"test/unit/lib/cms_domain_support_test.rb",
1393+
"test/unit/lib/command_line_test.rb",
1394+
"test/unit/lib/content_block_test.rb",
1395+
"test/unit/lib/content_rendering_support_test.rb",
1396+
"test/unit/lib/generators_test.rb",
1397+
"test/unit/lib/routes_test.rb",
13831398
"test/unit/models/attachment_test.rb",
1399+
"test/unit/models/category_test.rb",
1400+
"test/unit/models/category_type_test.rb",
13841401
"test/unit/models/connector_test.rb",
1385-
"test/unit/models/html_block_test.rb",
1386-
"test/unit/models/portlet_test.rb",
1387-
"test/unit/models/section_node_test.rb",
13881402
"test/unit/models/content_type_test.rb",
1403+
"test/unit/models/email_page_portlet_test.rb",
1404+
"test/unit/models/file_block_test.rb",
13891405
"test/unit/models/group_test.rb",
1390-
"test/unit/models/page_template_test.rb",
1391-
"test/unit/models/site_test.rb",
1392-
"test/unit/models/permission_test.rb",
1406+
"test/unit/models/html_block_test.rb",
13931407
"test/unit/models/link_test.rb",
1394-
"test/unit/models/task_test.rb",
13951408
"test/unit/models/page_partial_test.rb",
1396-
"test/unit/models/user_test.rb",
1397-
"test/unit/models/file_block_test.rb",
1398-
"test/unit/models/category_type_test.rb",
13991409
"test/unit/models/page_route_test.rb",
1410+
"test/unit/models/page_template_test.rb",
1411+
"test/unit/models/page_test.rb",
1412+
"test/unit/models/permission_test.rb",
1413+
"test/unit/models/portlet_test.rb",
1414+
"test/unit/models/section_node_test.rb",
14001415
"test/unit/models/sections_test.rb",
1401-
"test/unit/models/category_test.rb",
1402-
"test/unit/schema_statements_test.rb",
1403-
"test/unit/lib/acts_as_content_page_test.rb",
1404-
"test/unit/lib/generators_test.rb",
1405-
"test/unit/lib/routes_test.rb",
1406-
"test/unit/lib/cms_domain_support_test.rb",
1407-
"test/unit/lib/cms/authentication/controller_test.rb",
1408-
"test/unit/lib/content_rendering_support_test.rb",
1409-
"test/unit/lib/command_line_test.rb",
1410-
"test/unit/lib/content_block_test.rb",
1411-
"test/unit/helpers/menu_helper_test.rb",
1412-
"test/unit/helpers/application_helper_test.rb",
1413-
"test/unit/helpers/page_helper_test.rb",
1414-
"test/unit/helpers/form_builder_test.rb",
1415-
"test/unit/helpers/path_helper_test.rb",
1416-
"test/custom_assertions.rb",
1417-
"test/test_logging.rb",
1418-
"test/factories.rb",
1419-
"test/test_helper.rb"
1416+
"test/unit/models/site_test.rb",
1417+
"test/unit/models/task_test.rb",
1418+
"test/unit/models/user_test.rb",
1419+
"test/unit/schema_statements_test.rb"
14201420
]
14211421

14221422
if s.respond_to? :specification_version then
14231423
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
14241424
s.specification_version = 3
14251425

1426-
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
1426+
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
14271427
else
14281428
end
14291429
else

‎doc/guides/files/bcmsorg.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
var bcmsOrg =
2+
{
3+
init : function()
4+
{
5+
$('ul').find('li:last').addClass('last-child');
6+
$('ul').find('li:first').addClass('first-child');
7+
$('ul * li:last').each(function(){$(this).addClass('final'); $(this).parents('li').addClass('final')});
8+
9+
Cufon.replace(Array('#topnav>ul>li>a'),{fontFamily:'HelveticaNeueCond'});
10+
Cufon.replace(Array('#slides .controls li a','h2','h3','h4','h5'),{fontFamily:'HelveticaNeueCondBold'});
11+
Cufon.replace(Array('#benefits blockquote ul.items li a.view'),{fontFamily:'HelveticaNeueBold',hover:true});
12+
Cufon.now();
13+
14+
$('#topnav>ul>li:last').hover(this.downloadHoverOn, this.downloadHoverOff);
15+
$('#browsercms .download').hover(this.downloadHoverOn, this.downloadHoverOff);
16+
17+
},
18+
downloadHoverOn: function()
19+
{
20+
$('#browsercms .download').css({opacity:1, backgroundImage:'url(/images/download-on.gif)'});
21+
$('#topnav>ul>li:last>a').addClass('active');
22+
},
23+
downloadHoverOff: function()
24+
{
25+
$('#browsercms .download').css({opacity:0.19, backgroundImage:'url(/images/download.gif)'});
26+
$('#topnav>ul>li:last>a').removeClass('active');
27+
}
28+
}

‎doc/guides/files/clearfix.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* @group clearfix */
2+
.clearfix:after { visibility: hidden; display: block; font-size: 0; content: " "; clear: both; height: 0; }
3+
.clearfix { display: inline-block; }
4+
/* start commented backslash hack \*/
5+
* html .clearfix { height: 1%; }
6+
.clearfix { display: block; }
7+
/* close commented backslash hack */
8+
/* @end */

‎doc/guides/files/cufon.js‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)