Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 9 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
7 Rakefile
@@ -1,7 +1,6 @@
require "rake"
require "rake/testtask"
-require "rake/rdoctask"
-require "test/integrator"
+require "rdoc/task"
begin
require "jeweler"
@@ -13,7 +12,7 @@ begin
gemspec.homepage = "http://codehero.es/rails_gems_plugins/rich_cms"
gemspec.author = "Paul Engel"
- gemspec.add_dependency "haml", "~> 3.0.25"
+ gemspec.add_dependency "haml", "~> 3.1.3"
gemspec.add_dependency "jzip", "~> 1.0.11"
end
Jeweler::GemcutterTasks.new
@@ -129,4 +128,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_files.include "README"
rdoc.rdoc_files.include "MIT-LICENSE"
rdoc.rdoc_files.include "lib/**/*.rb"
-end
+end
View
2  VERSION
@@ -1 +1 @@
-3.0.0
+3.0.1
View
4 app/controllers/rich/cms_controller.rb
@@ -4,7 +4,7 @@ class CmsController < ::ApplicationController
def display
(session[:rich_cms] ||= {})[:display] = params[:display]
- request.xhr? ? render(:nothing => true) : redirect_to(request.referrer)
+ request.xhr? ? render(:nothing => true) : redirect_to(request.referrer || root_path)
end
def position
@@ -33,4 +33,4 @@ def require_login
end
end
-end
+end
View
29 assets/sass/tools/_css3.sass
@@ -1,18 +1,17 @@
+=text_shadow($color, $x, $y, $blur: 0)
+ text-shadow: $color $x $y $blur
-=text_shadow(!color, !x, !y, !blur = 0)
- text-shadow: !color !x !y !blur
+=gradient($top, $bottom)
+ background: $top
+ background-image: -webkit-gradient(linear, left top, left bottom, from($top), to($bottom))
+ background-image: -moz-linear-gradient(top, $top, $bottom)
-=gradient(!top, !bottom)
- background: !top
- background-image: -webkit-gradient(linear, left top, left bottom, from(!top), to(!bottom))
- background-image: -moz-linear-gradient(top, !top, !bottom)
+=border_radius($radius)
+ border-radius: $radius
+ -moz-border-radius: $radius
+ -webkit-border-radius: $radius
-=border_radius(!radius)
- border-radius = !radius
- -moz-border-radius = !radius
- -webkit-border-radius = !radius
-
-=box_shadow(!color, !x, !y, !size)
- box-shadow: !color !x !y !size
- -moz-box-shadow: !color !x !y !size
- -webkit-box-shadow: !color !x !y !size
+=box_shadow($color, $x, $y, $size)
+ box-shadow: $color $x $y $size
+ -moz-box-shadow: $color $x $y $size
+ -webkit-box-shadow: $color $x $y $size
View
10 assets/sass/tools/_mixins.sass
@@ -45,8 +45,8 @@
+inline_block
text-indent: -9999px
-=opacity(!opacity)
- filter: alpha(opacity= !opacity * 100)
- -moz-opacity = !opacity
- -khtml-opacity = !opacity
- opacity = !opacity
+=opacity($opacity)
+ filter: alpha(opacity= $opacity * 100)
+ -moz-opacity: $opacity
+ -khtml-opacity: $opacity
+ opacity: $opacity
View
11 lib/rich/cms/content/group.rb
@@ -3,6 +3,15 @@ module Cms
module Content
class Group < Struct.new(:selector, :tag, :class_name, :key, :value, :add, :before_edit, :after_update)
+ class << self
+ def members
+ super.map(&:to_s)
+ end
+ end
+
+ def members
+ super.map(&:to_s)
+ end
def self.build(selector, specs)
self.new *{:selector => selector, :key => :key, :value => :value}.merge(specs).stringify_keys.values_at(*self.members)
@@ -64,4 +73,4 @@ def valid_reference?(reference)
end
end
-end
+end
View
141 rich_cms.gemspec
@@ -4,14 +4,14 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
- s.name = %q{rich_cms}
- s.version = "3.0.0"
+ s.name = "rich_cms"
+ s.version = "3.0.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Paul Engel"]
- s.date = %q{2011-02-07}
- s.description = %q{Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners.}
- s.email = %q{paul.engel@holder.nl}
+ s.date = "2013-11-05"
+ s.description = "Rich-CMS is a module of E9s (http://github.com/archan937/e9s) which provides a frontend for your CMS content. You can use this gem to manage CMS content or translations (in an internationalized application). The installation and setup process is very easily done. You will have to register content at the Rich-CMS engine and also you will have to specify the authentication mechanism. Both are one-liners."
+ s.email = "paul.engel@holder.nl"
s.extra_rdoc_files = [
"README.textile"
]
@@ -159,10 +159,6 @@ Gem::Specification.new do |s|
"test/rails-2/dummy/script/plugin",
"test/rails-2/dummy/script/runner",
"test/rails-2/dummy/script/server",
- "test/rails-2/dummy/test/fixtures/authlogic_users.yml",
- "test/rails-2/dummy/test/fixtures/devise_users.yml",
- "test/rails-2/pending.rb",
- "test/rails-2/test_helper.rb",
"test/rails-3/dummy/.bundle/config",
"test/rails-3/dummy/Gemfile",
"test/rails-3/dummy/Gemfile.lock",
@@ -201,12 +197,8 @@ Gem::Specification.new do |s|
"test/rails-3/dummy/public/javascripts/jquery/ui/rich_cms/widget.js",
"test/rails-3/dummy/public/javascripts/rich_cms.js",
"test/rails-3/dummy/script/rails",
- "test/rails-3/dummy/test/fixtures/authlogic_users.yml",
- "test/rails-3/dummy/test/fixtures/devise_users.yml",
- "test/rails-3/test_helper.rb",
"test/shared/dummy/db/schema.rb",
"test/shared/dummy/db/seeds.rb",
- "test/shared/dummy/fixtures/authlogic_users.yml",
"test/shared/dummy/models/authlogic_user.rb",
"test/shared/dummy/models/authlogic_user_session.rb",
"test/shared/dummy/models/cms_content.rb",
@@ -215,112 +207,47 @@ Gem::Specification.new do |s|
"test/shared/dummy/stylesheets/rich_cms.css",
"test/shared/dummy/views/application/index.html.erb",
"test/shared/dummy/views/layouts/application.html.erb",
- "test/shared/support/action_controller/integration.rb",
- "test/shared/support/action_controller/test_case.rb",
- "test/shared/support/capybara/setup.rb",
- "test/shared/support/test_helper.rb",
- "test/shared/tests/actionpack/action_controller/base_test.rb",
- "test/shared/tests/actionpack/action_view/base_test.rb",
- "test/shared/tests/activesupport/active_support/dependencies_test.rb",
- "test/shared/tests/app/integration/authenticated/authlogic.rb",
- "test/shared/tests/app/integration/authenticated/devise_test.rb",
- "test/shared/tests/app/integration/non_authenticated.rb",
- "test/shared/tests/app/routing_test.rb",
- "test/shared/tests/auth_test.rb",
- "test/shared/tests/content/group.rb",
- "test/shared/tests/content/item.rb",
- "test/shared/tests/core/string/html_safe.rb",
- "test/shared/tests/dummy_app.rb",
- "test/shared/tests/engine_test.rb",
- "test/shared/tests/rails/engine_test.rb",
- "test/shared/tests/readme_test.rb",
+ "test/shared/tests/fixtures/authlogic_users.yml",
+ "test/shared/tests/fixtures/devise_users/rails-2.yml",
+ "test/shared/tests/fixtures/devise_users/rails-3.yml",
+ "test/shared/tests/integration/authenticated/authlogic.rb",
+ "test/shared/tests/integration/authenticated/devise_test.rb",
+ "test/shared/tests/integration/non_authenticated.rb",
+ "test/shared/tests/integration/routing_test.rb",
+ "test/shared/tests/support/action_controller/integration_test.rb",
+ "test/shared/tests/support/action_controller/test_case.rb",
+ "test/shared/tests/support/dummy_app.rb",
+ "test/shared/tests/support/pending.rb",
+ "test/shared/tests/test_helper.rb",
+ "test/shared/tests/unit/actionpack/action_controller/base_test.rb",
+ "test/shared/tests/unit/actionpack/action_view/base_test.rb",
+ "test/shared/tests/unit/activesupport/active_support/dependencies_test.rb",
+ "test/shared/tests/unit/auth_test.rb",
+ "test/shared/tests/unit/content/group_test.rb",
+ "test/shared/tests/unit/content/item_test.rb",
+ "test/shared/tests/unit/core/string/html_safe_test.rb",
+ "test/shared/tests/unit/engine_test.rb",
+ "test/shared/tests/unit/rails/engine_test.rb",
+ "test/shared/tests/unit/readme_test.rb",
"uninstall.rb"
]
- s.homepage = %q{http://codehero.es/rails_gems_plugins/rich_cms}
+ s.homepage = "http://codehero.es/rails_gems_plugins/rich_cms"
s.require_paths = ["lib"]
- s.rubygems_version = %q{1.5.0}
- s.summary = %q{Enrichments (e9s) module for a pluggable CMS frontend}
- s.test_files = [
- "test/integrator.rb",
- "test/rails-2/dummy/app/controllers/application_controller.rb",
- "test/rails-2/dummy/app/helpers/application_helper.rb",
- "test/rails-2/dummy/config/boot.rb",
- "test/rails-2/dummy/config/environment.rb",
- "test/rails-2/dummy/config/environments/development.rb",
- "test/rails-2/dummy/config/environments/production.rb",
- "test/rails-2/dummy/config/environments/test.rb",
- "test/rails-2/dummy/config/initializers/backtrace_silencers.rb",
- "test/rails-2/dummy/config/initializers/cookie_verification_secret.rb",
- "test/rails-2/dummy/config/initializers/devise.rb",
- "test/rails-2/dummy/config/initializers/enrichments.rb",
- "test/rails-2/dummy/config/initializers/inflections.rb",
- "test/rails-2/dummy/config/initializers/mime_types.rb",
- "test/rails-2/dummy/config/initializers/new_rails_defaults.rb",
- "test/rails-2/dummy/config/initializers/session_store.rb",
- "test/rails-2/dummy/config/preinitializer.rb",
- "test/rails-2/dummy/config/routes.rb",
- "test/rails-2/dummy/db/schema.rb",
- "test/rails-2/dummy/db/seeds.rb",
- "test/rails-2/pending.rb",
- "test/rails-2/test_helper.rb",
- "test/rails-3/dummy/app/controllers/application_controller.rb",
- "test/rails-3/dummy/app/helpers/application_helper.rb",
- "test/rails-3/dummy/config/application.rb",
- "test/rails-3/dummy/config/boot.rb",
- "test/rails-3/dummy/config/environment.rb",
- "test/rails-3/dummy/config/environments/development.rb",
- "test/rails-3/dummy/config/environments/production.rb",
- "test/rails-3/dummy/config/environments/test.rb",
- "test/rails-3/dummy/config/initializers/backtrace_silencers.rb",
- "test/rails-3/dummy/config/initializers/devise.rb",
- "test/rails-3/dummy/config/initializers/enrichments.rb",
- "test/rails-3/dummy/config/initializers/inflections.rb",
- "test/rails-3/dummy/config/initializers/mime_types.rb",
- "test/rails-3/dummy/config/initializers/secret_token.rb",
- "test/rails-3/dummy/config/initializers/session_store.rb",
- "test/rails-3/dummy/config/routes.rb",
- "test/rails-3/dummy/db/schema.rb",
- "test/rails-3/dummy/db/seeds.rb",
- "test/rails-3/test_helper.rb",
- "test/shared/dummy/db/schema.rb",
- "test/shared/dummy/db/seeds.rb",
- "test/shared/dummy/models/authlogic_user.rb",
- "test/shared/dummy/models/authlogic_user_session.rb",
- "test/shared/dummy/models/cms_content.rb",
- "test/shared/dummy/models/devise_user.rb",
- "test/shared/support/action_controller/integration.rb",
- "test/shared/support/action_controller/test_case.rb",
- "test/shared/support/capybara/setup.rb",
- "test/shared/support/test_helper.rb",
- "test/shared/tests/actionpack/action_controller/base_test.rb",
- "test/shared/tests/actionpack/action_view/base_test.rb",
- "test/shared/tests/activesupport/active_support/dependencies_test.rb",
- "test/shared/tests/app/integration/authenticated/authlogic.rb",
- "test/shared/tests/app/integration/authenticated/devise_test.rb",
- "test/shared/tests/app/integration/non_authenticated.rb",
- "test/shared/tests/app/routing_test.rb",
- "test/shared/tests/auth_test.rb",
- "test/shared/tests/content/group.rb",
- "test/shared/tests/content/item.rb",
- "test/shared/tests/core/string/html_safe.rb",
- "test/shared/tests/dummy_app.rb",
- "test/shared/tests/engine_test.rb",
- "test/shared/tests/rails/engine_test.rb",
- "test/shared/tests/readme_test.rb"
- ]
+ s.rubygems_version = "2.0.3"
+ s.summary = "Enrichments (e9s) module for a pluggable CMS frontend"
if s.respond_to? :specification_version then
- s.specification_version = 3
+ s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<haml>, ["~> 3.0.25"])
+ s.add_runtime_dependency(%q<haml>, ["~> 3.1.3"])
s.add_runtime_dependency(%q<jzip>, ["~> 1.0.11"])
else
- s.add_dependency(%q<haml>, ["~> 3.0.25"])
+ s.add_dependency(%q<haml>, ["~> 3.1.3"])
s.add_dependency(%q<jzip>, ["~> 1.0.11"])
end
else
- s.add_dependency(%q<haml>, ["~> 3.0.25"])
+ s.add_dependency(%q<haml>, ["~> 3.1.3"])
s.add_dependency(%q<jzip>, ["~> 1.0.11"])
end
end

No commit comments for this range

Something went wrong with that request. Please try again.