fullstack-cms 0.3.32 → 0.3.33

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "http://rubygems.org"
 
-gem "fullstack-admin", '~> 0.2.19'
+gem "fullstack-admin", '~> 0.2.20'
 
 gem "ars-permalink"
 gem "acts-as-taggable-on"

data/Gemfile.lock

@@ -54,14 +54,11 @@ GEM
       rails
     builder (3.0.4)
     checkin (0.5.1)
-    chosen-rails (0.9.11.1)
+    chosen-rails (0.9.11.2)
       coffee-rails (>= 3.2)
       railties (>= 3.0)
       sass-rails (>= 3.2)
     chronic (0.9.0)
-    ckeditor (3.7.3)
-      mime-types
-      orm_adapter
     cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -86,7 +83,7 @@ GEM
     facebox-rails (0.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    flash_cookie_session (1.1.3)
+    flash_cookie_session (1.1.4)
       rails (~> 3.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
@@ -121,18 +118,20 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.2.19)
+    fullstack-admin (0.2.20)
       bootstrap-datepicker-rails
       bootstrap-helpers (~> 0.1.9)
       chosen-rails
-      ckeditor
       facebox-rails
       formtastic-bootstrap
       fullstack (~> 0.1.27)
+      fullstack-ckeditor (~> 0.1.2)
       has-attached (~> 0.2.5)
       meta_search
       plupload-rails
       rails (~> 3.2)
+    fullstack-ckeditor (0.1.2)
+      rails
     git (1.2.5)
     has-attached (0.2.5)
       aws-sdk
@@ -153,7 +152,7 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.6)
@@ -276,7 +275,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.2.19)
+  fullstack-admin (~> 0.2.20)
   jeweler
   rails_i18n_gettext
   rinku (~> 1.2.2)

data/VERSION

@@ -1 +1 @@
-0.3.32
+0.3.33

data/app/helpers/site_form_helper.rb

@@ -140,9 +140,6 @@ module SiteFormHelper
            
            if field && field.options[:markup]
              opts[:as] = :markup
-           
-           elsif field && field.options[:simple_markup]
-             opts[:as] = :simple_markup
 
            elsif field && field.options[:in]
              opts[:as] = :select

data/app/views/admin/settings/_form.html.erb

@@ -10,10 +10,6 @@
         <%= f.input :key, :input_html => {:readonly => true} %>
         <% if current_resource.kind.to_s == "text" && current_resource.options[:markup] %>
           <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value"), :as => :markup %>
-      
-        <% elsif current_resource.kind.to_s == "text" && current_resource.options[:simple_markup] %>
-          <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value"), :as => :simple_markup %>
-      
         <% else %>
           <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value") %>
         

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.32"
+  s.version = "0.3.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2013-01-18"
+  s.date = "2013-01-22"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -177,7 +177,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.19"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.20"])
       s.add_runtime_dependency(%q<ars-permalink>, [">= 0"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -188,7 +188,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.19"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.20"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -200,7 +200,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.19"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.20"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<acts_as_indexed>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.32
+  version: 0.3.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.19
+        version: 0.2.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.19
+        version: 0.2.20
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3030933524233212648
+      hash: -964471143851442796
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: