Diff
Modified: branches/rails2/app/views/announcements/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/announcements/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/announcements/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= error_messages_for 'announcement' %>
Modified: branches/rails2/app/views/blobs/edit.rhtml (2742 => 2743)
--- branches/rails2/app/views/blobs/edit.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/blobs/edit.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "Manage" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "osp.js" %>
<h1>Manage File: <%= contributable_name(@blob.id, 'Blob') %></h1>
Modified: branches/rails2/app/views/blobs/new.rhtml (2742 => 2743)
--- branches/rails2/app/views/blobs/new.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/blobs/new.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "New" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "osp.js" %>
<h1>Upload File</h1>
Modified: branches/rails2/app/views/comments/_comments.rhtml (2742 => 2743)
--- branches/rails2/app/views/comments/_comments.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/comments/_comments.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h2>
<%= icon "comments", nil, nil, { :style => "vertical-align: middle;" }, "" -%>
Modified: branches/rails2/app/views/content_types/edit.rhtml (2742 => 2743)
--- branches/rails2/app/views/content_types/edit.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/content_types/edit.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "Manage" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h1>Manage Content Type: <%= h @content_type.title %></h1>
Modified: branches/rails2/app/views/experiments/edit.rhtml (2742 => 2743)
--- branches/rails2/app/views/experiments/edit.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/experiments/edit.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h1>Edit Experiment</h1>
@@ -38,4 +38,4 @@
<center><%= submit_tag "Update", :disable_with => "Updating..." %></center>
<% end -%>
</div>
-</center>
\ No newline at end of file
+</center>
Modified: branches/rails2/app/views/experiments/new.rhtml (2742 => 2743)
--- branches/rails2/app/views/experiments/new.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/experiments/new.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h1>New Experiment</h1>
@@ -39,4 +39,4 @@
<center><%= submit_tag "Create", :disable_with => "Creating..." %></center>
<% end -%>
</div>
-</center>
\ No newline at end of file
+</center>
Modified: branches/rails2/app/views/group_announcements/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/group_announcements/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/group_announcements/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= error_messages_for 'announcement' %>
Modified: branches/rails2/app/views/jobs/new.rhtml (2742 => 2743)
--- branches/rails2/app/views/jobs/new.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/jobs/new.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor -%>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" -%>
<h1>New Job</h1>
@@ -86,4 +86,4 @@
</div>
</center>
-<% end -%>
\ No newline at end of file
+<% end -%>
Modified: branches/rails2/app/views/licenses/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/licenses/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/licenses/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag 'license_attributes' %>
<!--[form:license]-->
@@ -18,4 +18,4 @@
<%= fckeditor_textarea(:license, :description, :toolbarSet => 'Simple', :width => '700px', :height => '300px') %></p>
<br/><br/>
-<!--[eoform:license]-->
\ No newline at end of file
+<!--[eoform:license]-->
Modified: branches/rails2/app/views/networks/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/networks/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/networks/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
- <%= _javascript__include_tag :fckeditor %>
+ <%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<p>
<b>Administrator</b><br />
Modified: branches/rails2/app/views/packs/edit.rhtml (2742 => 2743)
--- branches/rails2/app/views/packs/edit.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/packs/edit.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "Manage" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "osp.js" %>
<h1>Manage Pack: <%= contributable_name(@pack.id, 'Pack') %></h1>
Modified: branches/rails2/app/views/packs/new.rhtml (2742 => 2743)
--- branches/rails2/app/views/packs/new.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/packs/new.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "New" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "osp.js" %>
<h1>New Pack</h1>
Modified: branches/rails2/app/views/profiles/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/profiles/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/profiles/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<p style="color: #666666; font-weight: bold;">
Note: information you enter on this page will be visible to everyone (ie: will be public), but all fields are optional.
Modified: branches/rails2/app/views/reviews/_form.rhtml (2742 => 2743)
--- branches/rails2/app/views/reviews/_form.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/reviews/_form.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= error_messages_for 'review' %>
Modified: branches/rails2/app/views/reviews/_reviews.rhtml (2742 => 2743)
--- branches/rails2/app/views/reviews/_reviews.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/reviews/_reviews.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h2>
<%= icon "review", nil, "Reviews", { :style => "vertical-align: middle;" }, "" -%>
Modified: branches/rails2/app/views/workflows/edit_version.rhtml (2742 => 2743)
--- branches/rails2/app/views/workflows/edit_version.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/workflows/edit_version.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "Edit Version" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h1>
Edit Version <%= @viewing_version_number.to_s %>
@@ -52,4 +52,4 @@
</div>
</center>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: branches/rails2/app/views/workflows/new.rhtml (2742 => 2743)
--- branches/rails2/app/views/workflows/new.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/workflows/new.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "New" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "osp.js" %>
<h1>Upload Workflow</h1>
Modified: branches/rails2/app/views/workflows/new_version.rhtml (2742 => 2743)
--- branches/rails2/app/views/workflows/new_version.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/workflows/new_version.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,6 +1,6 @@
<% t "Upload New Version" -%>
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<h1>
Upload New Version
Modified: branches/rails2/app/views/workflows/tag_suggestions.rhtml (2742 => 2743)
--- branches/rails2/app/views/workflows/tag_suggestions.rhtml 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/app/views/workflows/tag_suggestions.rhtml 2011-10-24 20:29:30 UTC (rev 2743)
@@ -1,4 +1,4 @@
-<%= _javascript__include_tag :fckeditor %>
+<%= _javascript__include_tag "fckeditor/fckeditor.js" %>
<%= _javascript__include_tag "tag_suggestions.js" %>
<h1>Extra workflow metadata</h1>
Modified: branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb (2742 => 2743)
--- branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb 2011-10-24 20:29:30 UTC (rev 2743)
@@ -17,7 +17,7 @@
xml.instruct!
#=> <?xml version="1.0" encoding="utf-8" ?>
xml.Connector("command" => params[:Command], "resourceType" => 'File') do
- xml.CurrentFolder("url" => @url, "path" => params[:CurrentFolder])
+ xml.CurrentFolder("url" => @uurl, "path" => params[:CurrentFolder])
xml.Folders do
@folders.each do |folder|
xml.Folder("name" => folder)
@@ -49,7 +49,7 @@
@folders = Array.new
@files = {}
begin
- @url = ""
+ @uurl = upload_directory_path
@current_folder = current_directory_path
Dir.entries(@current_folder).each do |entry|
next if entry =~ /^\./
@@ -64,9 +64,9 @@
def create_folder
begin
- @url = ""
- path = @url + params[:NewFolderName]
- if !(File.stat(@url).writable?)
+ @uurl = current_directory_path
+ path = @uurl + params[:NewFolderName]
+ if !(File.stat(@uurl).writable?)
@errorNumber = 103
elsif params[:NewFolderName] !~ /[\w\d\s]+/
@errorNumber = 102
@@ -84,7 +84,7 @@
def upload_file
begin
@new_file = check_file(params[:NewFile])
- @url = ""
+ @uurl = upload_directory_path
ftype = @new_file.content_type.strip
if ! MIME_TYPES.include?(ftype)
@errorNumber = 202
Modified: branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb (2742 => 2743)
--- branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb 2011-10-24 20:28:39 UTC (rev 2742)
+++ branches/rails2/vendor/plugins/fckeditor/lib/fckeditor.rb 2011-10-24 20:29:30 UTC (rev 2743)
@@ -81,21 +81,21 @@
end
end
-include ActionView
-module ActionView::Helpers::AssetTagHelper
- alias_method :rails_javascript_include_tag, :_javascript__include_tag
-
- # <%= _javascript__include_tag :defaults, :fckeditor %>
- def _javascript__include_tag(*sources)
- main_sources, application_source = [], []
- if sources.include?(:fckeditor)
- sources.delete(:fckeditor)
- sources.push('fckeditor/fckeditor')
- end
- unless sources.empty?
- main_sources = rails_javascript_include_tag(*sources).split("\n")
- application_source = main_sources.pop if main_sources.last.include?('application.js')
- end
- [main_sources.join("\n"), application_source].join("\n")
- end
-end
+# include ActionView
+# module ActionView::Helpers::AssetTagHelper
+# alias_method :rails_javascript_include_tag, :_javascript__include_tag
+#
+# # <%= _javascript__include_tag :defaults, :fckeditor %>
+# def _javascript__include_tag(*sources)
+# main_sources, application_source = [], []
+# if sources.include?(:fckeditor)
+# sources.delete(:fckeditor)
+# sources.push('fckeditor/fckeditor')
+# end
+# unless sources.empty?
+# main_sources = rails_javascript_include_tag(*sources).split("\n")
+# application_source = main_sources.pop if main_sources.last.include?('application.js')
+# end
+# [main_sources.join("\n"), application_source].join("\n")
+# end
+# end