Permalink
Browse files

Enables tinemce for wiki editor

  • Loading branch information...
1 parent 8f4aabf commit 7cc38ac01083a1357d0eac5eff509af7661396b7 Shereef Bishay committed May 17, 2010
Showing with 13 additions and 17 deletions.
  1. +0 −6 .gitmodules
  2. +10 −10 app/controllers/wiki_controller.rb
  3. +1 −1 app/views/layouts/base.rhtml
  4. +2 −0 config/environment.rb
View
@@ -1,6 +0,0 @@
-[submodule "vendor/plugins/redmine_s3"]
- path = vendor/plugins/redmine_s3
- url = git://github.com/tigrish/redmine_s3.git
-[submodule "vendor/plugins/tiny_mce"]
- path = vendor/plugins/tiny_mce
- url = http://github.com/kete/tiny_mce.git
@@ -15,16 +15,16 @@ class WikiController < ApplicationController
include AttachmentsHelper
helper :watchers
- # uses_tiny_mce :options => {:theme => 'advanced',
- # :browsers => %w{msie gecko},
- # :theme_advanced_toolbar_location => "top",
- # :theme_advanced_toolbar_align => "left",
- # :theme_advanced_resizing => true,
- # :theme_advanced_resize_horizontal => false,
- # :theme_advanced_buttons1 => %w{formatselect fontselect fontsizeselect bold italic underline strikethrough separator justifyleft justifycenter justifyright indent outdent separator bullist numlist forecolor backcolor separator link unlink image undo redo},
- # :theme_advanced_buttons2 => [],
- # :theme_advanced_buttons3 => []
- # }, :only => [:edit]
+ uses_tiny_mce :options => {:theme => 'advanced',
+ :browsers => %w{msie gecko},
+ :theme_advanced_toolbar_location => "top",
+ :theme_advanced_toolbar_align => "left",
+ :theme_advanced_resizing => true,
+ :theme_advanced_resize_horizontal => false,
+ :theme_advanced_buttons1 => %w{formatselect fontselect fontsizeselect bold italic underline strikethrough separator justifyleft justifycenter justifyright indent outdent separator bullist numlist forecolor backcolor separator link unlink image undo redo},
+ :theme_advanced_buttons2 => [],
+ :theme_advanced_buttons3 => []
+ }, :only => [:edit]
# display a page (in editing mode if it doesn't exist)
def index
@@ -21,7 +21,7 @@
<%= javascript_include_tag 'jquery.scrollTo-min' %>
<%= javascript_include_tag 'jquery.fancybox-1.3.0.pack' %>
-<%#= include_tiny_mce_if_needed %>
+<%= include_tiny_mce_if_needed %>
<%= heads_for_wiki_formatter %>
<!--[if IE]>
@@ -58,6 +58,8 @@
config.action_controller.session = { :key => "_bettermeans_session", :secret => "95fd75499b43ada8cfbc538558d74312asdf" }
config.gem 'rubytree', :lib => 'tree'
+
+ config.gem 'tiny_mce'
# Load any local configuration that is kept out of source control
# (e.g. gems, patches).

0 comments on commit 7cc38ac

Please sign in to comment.