From 1913f0aca88cee434c10991e2993231b30d29e01 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 15 Feb 2012 10:02:05 +0800
Subject: [PATCH] Add tinymce

---
 Gemfile                                                    | 1 +
 Gemfile.lock                                               | 3 +++
 app/assets/javascripts/new_admin.js                        | 3 ++-
 .../panel/announcement/back_end/bulletins/_form.html.erb   | 7 +++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 3ca0d51a..8c6b990d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
 gem 'therubyracer' # For linux
+gem 'tinymce-rails'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fc663b4..28e1ac54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,6 +179,8 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
+    tinymce-rails (3.4.8)
+      railties (>= 3.1)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -231,5 +233,6 @@ DEPENDENCIES
   spork
   sprockets
   therubyracer
+  tinymce-rails
   uglifier
   watchr
diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index ae43c4b6..002715b5 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -8,4 +8,5 @@
 //= require jquery_ujs
 //= require bootstrap
 //= require jquery.tinyscrollbar.min
-//= require orbit-1.0
\ No newline at end of file
+//= require orbit-1.0
+//= require tinymce-jquery
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 4c40cf2d..5c2b930b 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -137,5 +137,12 @@
 		  $('#bulletin_files').append(("<%= escape_javascript(add_attribute 'bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
 		});
 	</script>
+	<script type="text/javascript">
+	  $(function() {
+	    $('textarea').tinymce({
+	      theme: 'advanced'
+	    });
+	  });
+	</script>
 <% end %>
  
\ No newline at end of file