app/views/admin/templates/_rich_text.html.erb @@ -20,7 +20,7 @@ module Admin::FormHelper when :belongs_to then typus_belongs_to_field(key, options) when :tree then typus_tree_field(key, :form => options[:form]) when :boolean, :date, :datetime, :file, :password, - :selector, :string, :text, :time, :tiny_mce + :selector, :string, :text, :time, :tiny_mce, :rich_text typus_template_field(key, value, options) else typus_template_field(key, :string, options) app/helpers/admin/form_helper.rb @@ -18,6 +18,7 @@ <%= javascript_include_tag 'admin/jquery-1.3.2.min' %> <%= javascript_include_tag 'admin/jquery.fancybox-1.2.1.min' %> <%= include_tiny_mce_if_needed if defined?(TinyMCE) -%> + <%= javascript_include_tag :fckeditor if defined?(Fckeditor) %> <%= yield :javascripts -%> </head> app/views/layouts/admin.html.erb @@ -69,6 +69,10 @@ module Typus attribute_type = :tiny_mce end + if typus_field_options_for(:rich_text).include?(field) + attribute_type = :rich_text + end + # Custom field_type depending on the attribute name. case field.to_s when 'parent', 'parent_id' then attribute_type = :tree lib/typus/active_record.rb @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Francesc Esplugas"] - s.date = %q{2009-11-02} + s.date = %q{2009-11-03} s.description = %q{Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator.)} s.email = %q{francesc@intraducibles.com} s.extra_rdoc_files = [ @@ -47,6 +47,7 @@ Gem::Specification.new do |s| "app/views/admin/templates/_datetime.html.erb", "app/views/admin/templates/_file.html.erb", "app/views/admin/templates/_password.html.erb", + "app/views/admin/templates/_rich_text.html.erb", "app/views/admin/templates/_selector.html.erb", "app/views/admin/templates/_string.html.erb", "app/views/admin/templates/_text.html.erb", @@ -267,16 +268,13 @@ Gem::Specification.new do |s| "test/helpers/typus_helper_test.rb", "test/lib/active_record_test.rb", "test/lib/configuration_test.rb", - "test/lib/hash_test.rb", "test/lib/routes_test.rb", - "test/lib/string_test.rb", "test/lib/typus_test.rb", "test/schema.rb", "test/unit/typus_mailer_test.rb", "test/unit/typus_test.rb", "test/unit/typus_user_roles_test.rb", "test/unit/typus_user_test.rb", - "test/vendor/active_record_test.rb", "test/vendor/paginator_test.rb" ] typus.gemspec 08a254ebd655a7a13c0b3712d6cb89abfd731fe9 Francesc Esplugas francesc@intraducibles.com http://github.com/fesplugas/typus/commit/372b5c923538b9ecc1cdfd74af6052f657ef2edc 372b5c923538b9ecc1cdfd74af6052f657ef2edc 2009-11-02T22:40:35-08:00 2009-11-02T22:40:35-08:00 Support for FCkeditor (Gaston Kleiman). adb733139489a3a8a8063d38f4ea14637fe646db Francesc Esplugas francesc@intraducibles.com