muck-contents 0.1.12 → 0.2.0

data/config/muck_contents_routes.rb

@@ -1,5 +1,11 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :contents, :controller => 'muck/contents'
+  map.tiny_mce_files '/tiny_mce_files', :controller => 'muck/tiny_mce', :action => 'tiny_mce_files'
+  map.tiny_mce_images '/tiny_mce_images', :controller => 'muck/tiny_mce', :action => 'tiny_mce_images'
+  map.tiny_mce_links '/tiny_mce_links', :controller => 'muck/tiny_mce', :action => 'tiny_mce_links'
+  
+  map.images_for_content '/images_for_content', :controller => 'muck/tiny_mce', :action => 'images_for_content'
+  map.files_for_content '/files_for_content', :controller => 'muck/tiny_mce', :action => 'files_for_content'
   
   # MuckContents.routes.each do |route|
   #   map.connect route[:uri], MuckContents.build_route_options(route)

data/lib/action_controller/acts/muck_content_handler.rb

@@ -35,7 +35,7 @@ module ActionController
 
           # Renders the show template with the current content.
           def render_show_content
-            activate_authlogic # HACK authlogic isn't turned on for the application controller so we force it
+            activate_authlogic # HACK authlogic isn't turned on for the application controller so we force it.  See http://www.mrkris.com/2009/08/21/authlogic-and-rescue_from-actioncontroller-routingerror/
             @page_title = @content.locale_title(I18n.locale)
             respond_to do |format|
               format.html do

data/locales/en.yml

@@ -9,6 +9,8 @@ en:
       preview: Preview
       delete_title: "Delete this page."
       edit_title: "Edit this page."
+      no_files: "No files available"
+      no_images: "No images available"
       create_error: "There was a problem adding your content"
       update_error: "There was a problem updating your content"
       content_removed: "Content successfully removed"

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.1.12"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-17}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "app/controllers/admin/muck/contents_controller.rb",
      "app/controllers/muck/contents_controller.rb",
+     "app/controllers/muck/tiny_mce_controller.rb",
      "app/helpers/muck_contents_helper.rb",
      "app/helpers/tinymce_helper.rb",
      "app/views/admin/contents/index.html.erb",
@@ -31,6 +32,10 @@ Gem::Specification.new do |s|
      "app/views/contents/edit.html.erb",
      "app/views/contents/new.html.erb",
      "app/views/contents/show.html.erb",
+     "app/views/layouts/tiny_mce.html.erb",
+     "app/views/tiny_mce/files.html.erb",
+     "app/views/tiny_mce/images.html.erb",
+     "app/views/tiny_mce/links.html.erb",
      "config/initializers/mce_options.rb",
      "config/muck_contents_routes.rb",
      "db/migrate/20090703055724_add_contents.rb",
@@ -88,6 +93,8 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "muck-contents.gemspec",
+     "public/images/tinymce/sample.gif",
+     "public/images/tinymce/upload.gif",
      "public/javascripts/tiny_mce/langs/ar.js",
      "public/javascripts/tiny_mce/langs/az.js",
      "public/javascripts/tiny_mce/langs/be.js",
@@ -154,11 +161,8 @@ Gem::Specification.new do |s|
      "public/javascripts/tiny_mce/langs/vi.js",
      "public/javascripts/tiny_mce/langs/zh.js",
      "public/javascripts/tiny_mce/license.txt",
-     "public/javascripts/tiny_mce/plugins/advfiletoo/css/advfile.css",
      "public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin.js",
      "public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin_src.js",
-     "public/javascripts/tiny_mce/plugins/advfiletoo/file.htm",
-     "public/javascripts/tiny_mce/plugins/advfiletoo/img/upload.gif",
      "public/javascripts/tiny_mce/plugins/advfiletoo/js/functions.js",
      "public/javascripts/tiny_mce/plugins/advfiletoo/langs/en_dlg.js",
      "public/javascripts/tiny_mce/plugins/advhr/css/advhr.css",
@@ -302,11 +306,8 @@ Gem::Specification.new do |s|
      "public/javascripts/tiny_mce/plugins/advimage/langs/uk_dlg.js",
      "public/javascripts/tiny_mce/plugins/advimage/langs/vi_dlg.js",
      "public/javascripts/tiny_mce/plugins/advimage/langs/zh_dlg.js",
-     "public/javascripts/tiny_mce/plugins/advimagetoo/css/advimage.css",
      "public/javascripts/tiny_mce/plugins/advimagetoo/editor_plugin.js",
      "public/javascripts/tiny_mce/plugins/advimagetoo/editor_plugin_src.js",
-     "public/javascripts/tiny_mce/plugins/advimagetoo/image.htm",
-     "public/javascripts/tiny_mce/plugins/advimagetoo/img/sample.gif",
      "public/javascripts/tiny_mce/plugins/advimagetoo/js/functions.js",
      "public/javascripts/tiny_mce/plugins/advimagetoo/langs/en_dlg.js",
      "public/javascripts/tiny_mce/plugins/advlink/css/advlink.css",
@@ -379,12 +380,10 @@ Gem::Specification.new do |s|
      "public/javascripts/tiny_mce/plugins/advlink/langs/vi_dlg.js",
      "public/javascripts/tiny_mce/plugins/advlink/langs/zh_dlg.js",
      "public/javascripts/tiny_mce/plugins/advlink/link.htm",
-     "public/javascripts/tiny_mce/plugins/advlinktoo/css/advlink.css",
      "public/javascripts/tiny_mce/plugins/advlinktoo/editor_plugin.js",
      "public/javascripts/tiny_mce/plugins/advlinktoo/editor_plugin_src.js",
      "public/javascripts/tiny_mce/plugins/advlinktoo/js/advlink.js",
      "public/javascripts/tiny_mce/plugins/advlinktoo/langs/en_dlg.js",
-     "public/javascripts/tiny_mce/plugins/advlinktoo/link.htm",
      "public/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js",
      "public/javascripts/tiny_mce/plugins/autoresize/editor_plugin_src.js",
      "public/javascripts/tiny_mce/plugins/autosave/editor_plugin.js",
@@ -1379,6 +1378,7 @@ Gem::Specification.new do |s|
      "public/javascripts/tiny_mce/utils/form_utils.js",
      "public/javascripts/tiny_mce/utils/mctabs.js",
      "public/javascripts/tiny_mce/utils/validate.js",
+     "public/stylesheets/tinymce.css",
      "rails/init.rb",
      "tasks/muck_contents_tasks.rake",
      "test/rails_root/.gitignore",
@@ -1387,12 +1387,14 @@ Gem::Specification.new do |s|
      "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/contents_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
+     "test/rails_root/app/controllers/uploads_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/.keep",
      "test/rails_root/app/models/comment.rb",
      "test/rails_root/app/models/content.rb",
      "test/rails_root/app/models/content_permission.rb",
      "test/rails_root/app/models/content_translation.rb",
+     "test/rails_root/app/models/upload.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/app/views/default/index.html.erb",
@@ -1412,62 +1414,178 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/mce_options.rb",
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
+     "test/rails_root/config/initializers/s3_credentials.rb",
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
-     "test/rails_root/db/migrate/20090608073052_create_friends.rb",
+     "test/rails_root/db/migrate/20090402234137_create_languages.rb",
+     "test/rails_root/db/migrate/20090426041056_create_countries.rb",
+     "test/rails_root/db/migrate/20090426041103_create_states.rb",
+     "test/rails_root/db/migrate/20090506000404_acts_as_taggable_on_migration.rb",
+     "test/rails_root/db/migrate/20090517040220_create_uploads.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
      "test/rails_root/db/migrate/20090704220055_create_slugs.rb",
-     "test/rails_root/db/migrate/20090704220120_acts_as_taggable_on_migration.rb",
+     "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090806230610_add_layout_to_contents.rb",
-     "test/rails_root/db/migrate/20090808005918_add_scope_index_to_slugs.rb",
      "test/rails_root/db/migrate/20090808175401_add_contents_comment_counter_cache.rb",
+     "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
+     "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/content_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/features/support/paths.rb",
      "test/rails_root/features/view_contents.feature",
+     "test/rails_root/lib/daemons/amazonaws.rb",
      "test/rails_root/lib/tasks/cucumber.rake",
+     "test/rails_root/lib/tasks/muck.rake",
      "test/rails_root/public/.htaccess",
      "test/rails_root/public/404.html",
      "test/rails_root/public/422.html",
      "test/rails_root/public/500.html",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/public/favicon.ico",
+     "test/rails_root/public/images/SWFUploadButton.png",
+     "test/rails_root/public/images/arrow_down.gif",
      "test/rails_root/public/images/arrow_left.gif",
      "test/rails_root/public/images/arrow_right.gif",
+     "test/rails_root/public/images/arrow_up.gif",
+     "test/rails_root/public/images/cancelbutton.gif",
+     "test/rails_root/public/images/fancybox/fancy_closebox.png",
+     "test/rails_root/public/images/fancybox/fancy_left.png",
+     "test/rails_root/public/images/fancybox/fancy_progress.png",
+     "test/rails_root/public/images/fancybox/fancy_right.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_e.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_n.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_ne.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_nw.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_s.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_se.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_sw.png",
+     "test/rails_root/public/images/fancybox/fancy_shadow_w.png",
+     "test/rails_root/public/images/fancybox/fancy_title_left.png",
+     "test/rails_root/public/images/fancybox/fancy_title_main.png",
+     "test/rails_root/public/images/fancybox/fancy_title_right.png",
+     "test/rails_root/public/images/file_icons/excel.gif",
+     "test/rails_root/public/images/file_icons/file.gif",
+     "test/rails_root/public/images/file_icons/file.png",
+     "test/rails_root/public/images/file_icons/file_aac.gif",
+     "test/rails_root/public/images/file_icons/file_ai.gif",
+     "test/rails_root/public/images/file_icons/file_avi.gif",
+     "test/rails_root/public/images/file_icons/file_bin.gif",
+     "test/rails_root/public/images/file_icons/file_bmp.gif",
+     "test/rails_root/public/images/file_icons/file_cue.gif",
+     "test/rails_root/public/images/file_icons/file_divx.gif",
+     "test/rails_root/public/images/file_icons/file_doc.gif",
+     "test/rails_root/public/images/file_icons/file_eps.gif",
+     "test/rails_root/public/images/file_icons/file_flac.gif",
+     "test/rails_root/public/images/file_icons/file_flv.gif",
+     "test/rails_root/public/images/file_icons/file_gif.gif",
+     "test/rails_root/public/images/file_icons/file_html.gif",
+     "test/rails_root/public/images/file_icons/file_ical.gif",
+     "test/rails_root/public/images/file_icons/file_indd.gif",
+     "test/rails_root/public/images/file_icons/file_inx.gif",
+     "test/rails_root/public/images/file_icons/file_iso.gif",
+     "test/rails_root/public/images/file_icons/file_jpg.gif",
+     "test/rails_root/public/images/file_icons/file_mov.gif",
+     "test/rails_root/public/images/file_icons/file_mp3.gif",
+     "test/rails_root/public/images/file_icons/file_mpg.gif",
+     "test/rails_root/public/images/file_icons/file_pdf.gif",
+     "test/rails_root/public/images/file_icons/file_php.gif",
+     "test/rails_root/public/images/file_icons/file_png.gif",
+     "test/rails_root/public/images/file_icons/file_pps.gif",
+     "test/rails_root/public/images/file_icons/file_ppt.gif",
+     "test/rails_root/public/images/file_icons/file_psd.gif",
+     "test/rails_root/public/images/file_icons/file_qxd.gif",
+     "test/rails_root/public/images/file_icons/file_qxp.gif",
+     "test/rails_root/public/images/file_icons/file_raw.gif",
+     "test/rails_root/public/images/file_icons/file_rtf.gif",
+     "test/rails_root/public/images/file_icons/file_svg.gif",
+     "test/rails_root/public/images/file_icons/file_tif.gif",
+     "test/rails_root/public/images/file_icons/file_txt.gif",
+     "test/rails_root/public/images/file_icons/file_vcf.gif",
+     "test/rails_root/public/images/file_icons/file_wav.gif",
+     "test/rails_root/public/images/file_icons/file_wma.gif",
+     "test/rails_root/public/images/file_icons/file_xls.gif",
+     "test/rails_root/public/images/file_icons/file_xml.gif",
+     "test/rails_root/public/images/file_icons/mp3.gif",
+     "test/rails_root/public/images/file_icons/pdf.gif",
+     "test/rails_root/public/images/file_icons/pdf.png",
+     "test/rails_root/public/images/file_icons/text.gif",
+     "test/rails_root/public/images/file_icons/text.png",
+     "test/rails_root/public/images/file_icons/word.gif",
      "test/rails_root/public/images/icons/accept.png",
      "test/rails_root/public/images/icons/add.png",
+     "test/rails_root/public/images/icons/blue_guy.png",
+     "test/rails_root/public/images/icons/button_background.png",
+     "test/rails_root/public/images/icons/cancel.png",
+     "test/rails_root/public/images/icons/close.png",
+     "test/rails_root/public/images/icons/comment.png",
      "test/rails_root/public/images/icons/delete.png",
+     "test/rails_root/public/images/icons/exclaim.png",
+     "test/rails_root/public/images/icons/external.png",
+     "test/rails_root/public/images/icons/feed.png",
+     "test/rails_root/public/images/icons/grey_guy.png",
+     "test/rails_root/public/images/icons/hide.png",
+     "test/rails_root/public/images/icons/information.png",
+     "test/rails_root/public/images/icons/minus.png",
+     "test/rails_root/public/images/icons/pending.png",
+     "test/rails_root/public/images/icons/question.png",
+     "test/rails_root/public/images/icons/search_box.png",
+     "test/rails_root/public/images/icons/star.png",
+     "test/rails_root/public/images/icons/stop.png",
+     "test/rails_root/public/images/icons/thumb_down.png",
+     "test/rails_root/public/images/icons/thumb_up.png",
      "test/rails_root/public/images/icons/vote.png",
      "test/rails_root/public/images/loading.gif",
+     "test/rails_root/public/images/nothing.png",
      "test/rails_root/public/images/profile_default.jpg",
      "test/rails_root/public/images/rails.png",
      "test/rails_root/public/images/spinner.gif",
      "test/rails_root/public/images/sprites.png",
+     "test/rails_root/public/images/tinymce/sample.gif",
+     "test/rails_root/public/images/tinymce/upload.gif",
      "test/rails_root/public/javascripts/application.js",
      "test/rails_root/public/javascripts/builder.js",
      "test/rails_root/public/javascripts/controls.js",
      "test/rails_root/public/javascripts/dragdrop.js",
      "test/rails_root/public/javascripts/effects.js",
      "test/rails_root/public/javascripts/fancyzoom.min.js",
+     "test/rails_root/public/javascripts/jquery/colorpicker.js",
      "test/rails_root/public/javascripts/jquery/jquery-ui.js",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.js.readme",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.autocomplete.pack.js",
+     "test/rails_root/public/javascripts/jquery/jquery.easing.js",
+     "test/rails_root/public/javascripts/jquery/jquery.fancybox.js",
      "test/rails_root/public/javascripts/jquery/jquery.form.js",
      "test/rails_root/public/javascripts/jquery/jquery.jgrowl.js",
      "test/rails_root/public/javascripts/jquery/jquery.js",
+     "test/rails_root/public/javascripts/jquery/jquery.metadata.min.js",
+     "test/rails_root/public/javascripts/jquery/jquery.queryString.js",
+     "test/rails_root/public/javascripts/jquery/jquery.swapimage.js",
+     "test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js",
      "test/rails_root/public/javascripts/jquery/jquery.tips.js",
+     "test/rails_root/public/javascripts/jquery/jrails.js",
      "test/rails_root/public/javascripts/muck.js",
      "test/rails_root/public/javascripts/muck_activities.js",
+     "test/rails_root/public/javascripts/muck_time/en.js",
      "test/rails_root/public/javascripts/prototype.js",
      "test/rails_root/public/javascripts/scriptaculous.js",
      "test/rails_root/public/javascripts/slider.js",
      "test/rails_root/public/javascripts/sound.js",
+     "test/rails_root/public/javascripts/swfupload/fileprogress.js",
+     "test/rails_root/public/javascripts/swfupload/handlers.js",
+     "test/rails_root/public/javascripts/swfupload/swfupload.cookies.js",
+     "test/rails_root/public/javascripts/swfupload/swfupload.js",
+     "test/rails_root/public/javascripts/swfupload/swfupload.queue.js",
+     "test/rails_root/public/javascripts/swfupload/swfupload.speed.js",
+     "test/rails_root/public/javascripts/swfupload/swfupload.swfobject.js",
      "test/rails_root/public/javascripts/tiny_mce/langs/ar.js",
      "test/rails_root/public/javascripts/tiny_mce/langs/az.js",
      "test/rails_root/public/javascripts/tiny_mce/langs/be.js",
@@ -1534,11 +1652,8 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/tiny_mce/langs/vi.js",
      "test/rails_root/public/javascripts/tiny_mce/langs/zh.js",
      "test/rails_root/public/javascripts/tiny_mce/license.txt",
-     "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/css/advfile.css",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin_src.js",
-     "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/file.htm",
-     "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/img/upload.gif",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/js/functions.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advfiletoo/langs/en_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advhr/css/advhr.css",
@@ -1682,11 +1797,9 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimage/langs/uk_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimage/langs/vi_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimage/langs/zh_dlg.js",
-     "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/css/advimage.css",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/editor_plugin.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/editor_plugin_src.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/image.htm",
-     "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/img/sample.gif",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/js/functions.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advimagetoo/langs/en_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css",
@@ -2513,8 +2626,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/tiny_mce/plugins/xhtmlxtras/langs/uk_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/xhtmlxtras/langs/vi_dlg.js",
      "test/rails_root/public/javascripts/tiny_mce/plugins/xhtmlxtras/langs/zh_dlg.js",
-     "test/rails_root/public/javascripts/tiny_mce/templates/bio.htm",
-     "test/rails_root/public/javascripts/tiny_mce/templates/country.htm",
+     "test/rails_root/public/javascripts/tiny_mce/templates/example.htm",
      "test/rails_root/public/javascripts/tiny_mce/themes/advanced/about.htm",
      "test/rails_root/public/javascripts/tiny_mce/themes/advanced/anchor.htm",
      "test/rails_root/public/javascripts/tiny_mce/themes/advanced/charmap.htm",
@@ -2760,6 +2872,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/javascripts/tiny_mce/utils/form_utils.js",
      "test/rails_root/public/javascripts/tiny_mce/utils/mctabs.js",
      "test/rails_root/public/javascripts/tiny_mce/utils/validate.js",
+     "test/rails_root/public/javascripts/tree.js",
      "test/rails_root/public/robots.txt",
      "test/rails_root/public/stylesheets/.keep",
      "test/rails_root/public/stylesheets/admin.css",
@@ -2813,6 +2926,8 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-icons_cd0a0a_256x240.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/images/ui-icons_ffffff_256x240.png",
      "test/rails_root/public/stylesheets/jquery/cupertino/jquery-ui-1.7.1.custom.css",
+     "test/rails_root/public/stylesheets/jquery/jquery.autocomplete.css",
+     "test/rails_root/public/stylesheets/jquery/jquery.fancybox.css",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_flat_55_fbec88_40x100.png",
      "test/rails_root/public/stylesheets/jquery/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png",
@@ -2858,8 +2973,11 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffd27a_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png",
      "test/rails_root/public/stylesheets/jquery/ui-lightness/jquery-ui-1.7.1.custom.css",
+     "test/rails_root/public/stylesheets/muck-activities.css",
      "test/rails_root/public/stylesheets/reset.css",
      "test/rails_root/public/stylesheets/styles.css",
+     "test/rails_root/public/stylesheets/swfupload.css",
+     "test/rails_root/public/stylesheets/tinymce.css",
      "test/rails_root/script/about",
      "test/rails_root/script/breakpointer",
      "test/rails_root/script/console",
@@ -2900,11 +3018,13 @@ Gem::Specification.new do |s|
     "test/rails_root/app/controllers/application_controller.rb",
      "test/rails_root/app/controllers/contents_controller.rb",
      "test/rails_root/app/controllers/default_controller.rb",
+     "test/rails_root/app/controllers/uploads_controller.rb",
      "test/rails_root/app/helpers/application_helper.rb",
      "test/rails_root/app/models/comment.rb",
      "test/rails_root/app/models/content.rb",
      "test/rails_root/app/models/content_permission.rb",
      "test/rails_root/app/models/content_translation.rb",
+     "test/rails_root/app/models/upload.rb",
      "test/rails_root/app/models/user.rb",
      "test/rails_root/app/models/user_session.rb",
      "test/rails_root/config/boot.rb",
@@ -2917,26 +3037,34 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/mce_options.rb",
      "test/rails_root/config/initializers/mime_types.rb",
      "test/rails_root/config/initializers/requires.rb",
+     "test/rails_root/config/initializers/s3_credentials.rb",
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090327231918_create_users.rb",
      "test/rails_root/db/migrate/20090402033319_add_muck_activities.rb",
-     "test/rails_root/db/migrate/20090602041838_create_users.rb",
-     "test/rails_root/db/migrate/20090608073052_create_friends.rb",
+     "test/rails_root/db/migrate/20090402234137_create_languages.rb",
+     "test/rails_root/db/migrate/20090426041056_create_countries.rb",
+     "test/rails_root/db/migrate/20090426041103_create_states.rb",
+     "test/rails_root/db/migrate/20090506000404_acts_as_taggable_on_migration.rb",
+     "test/rails_root/db/migrate/20090517040220_create_uploads.rb",
      "test/rails_root/db/migrate/20090613173314_create_comments.rb",
      "test/rails_root/db/migrate/20090703055724_add_contents.rb",
      "test/rails_root/db/migrate/20090704220055_create_slugs.rb",
-     "test/rails_root/db/migrate/20090704220120_acts_as_taggable_on_migration.rb",
+     "test/rails_root/db/migrate/20090730044139_add_comment_cache.rb",
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090806230610_add_layout_to_contents.rb",
-     "test/rails_root/db/migrate/20090808005918_add_scope_index_to_slugs.rb",
      "test/rails_root/db/migrate/20090808175401_add_contents_comment_counter_cache.rb",
+     "test/rails_root/db/migrate/20090818204527_add_activity_indexes.rb",
+     "test/rails_root/db/migrate/20090819030523_add_attachable_to_activities.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/content_steps.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/features/support/paths.rb",
+     "test/rails_root/lib/daemons/amazonaws.rb",
      "test/rails_root/public/dispatch.rb",
+     "test/rails_root/public/system/locals/000/000/026/original/deploy-1.rb",
      "test/rails_root/script/create_project.rb",
      "test/rails_root/test/functional/contents_controller_test.rb",
      "test/rails_root/test/test_helper.rb",

data/public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin.js

@@ -1,55 +1,42 @@
 /**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * Modified version of advfile
+ * @author Tatamae
+ * @copyright Copyright © 2009, Tatemae.
  */
-
 (function() {
 	tinymce.create('tinymce.plugins.AdvancedFileTooPlugin', {
 		init : function(ed, url) {
 			// Register commands
 			ed.addCommand('mceAdvFileToo', function() {
 				var e = ed.selection.getNode();
-
 				// Internal file object like a flash placeholder
 				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
 					return;
-
 				ed.windowManager.open({
-					file : url + '/file.htm?path=' + jQuery('#file-path').val() + 
-								'&id=' + jQuery('#parent-id').val() + 
-								'&type=' + jQuery('#parent-type').val() +
-								'&sessionkey=' + jQuery('#session-key').val() + 
-								'&sessionid=' + jQuery('#session-id').val(),
-					width : 675 + parseInt(ed.getLang('advfiletoo.delta_width', 0)),
-					height : 540 + parseInt(ed.getLang('advfiletoo.delta_height', 0)),
+					file : jQuery('#tiny_mce_files_path').val(),
+					width : parseInt(jQuery('#tiny_mce_files_width').val()) + parseInt(ed.getLang('advfiletoo.delta_width', 0)),
+					height : parseInt(jQuery('#tiny_mce_files_height').val()) + parseInt(ed.getLang('advfiletoo.delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
 				});
 			});
-
 			// Register button
 			ed.addButton('file', {
 				title : 'Upload Files',
 				cmd : 'mceAdvFileToo',
-				image : url + '/img/upload.gif'
+				image : '/images/tinymce/upload.gif'
 			});
-			
 		},
-
 		getInfo : function() {
 			return {
 				longname : 'Advanced file',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advfile',
+				author : 'Tatemae',
+				authorurl : 'http://Tatemae.com',
 				version : tinymce.majorVersion + "." + tinymce.minorVersion
 			};
 		}
 	});
-
 	// Register plugin
 	tinymce.PluginManager.add('advfiletoo', tinymce.plugins.AdvancedFileTooPlugin);
 })();

data/public/javascripts/tiny_mce/plugins/advfiletoo/editor_plugin_src.js

@@ -1,55 +1,42 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright � 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AdvancedFileTooPlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceAdvFileToo', function() {
-				var e = ed.selection.getNode();
-
-				// Internal file object like a flash placeholder
-				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
-					return;
-
-				ed.windowManager.open({
-					file : url + '/file.htm?path=' + jQuery('#file-path').val() + 
-								'&id=' + jQuery('#parent-id').val() + 
-								'&type=' + jQuery('#parent-type').val() +
-								'&sessionkey=' + jQuery('#session-key').val() + 
-								'&sessionid=' + jQuery('#session-id').val(),
-					width : 675 + parseInt(ed.getLang('advfiletoo.delta_width', 0)),
-					height : 540 + parseInt(ed.getLang('advfiletoo.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register button
-			ed.addButton('file', {
-				title : 'Upload Files',
-				cmd : 'mceAdvFileToo',
-				image : url + '/img/upload.gif'
-			});
-			
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Advanced file',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advfile',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('advfiletoo', tinymce.plugins.AdvancedFileTooPlugin);
+/**
+ * Modified version of advfile
+ * @author Tatamae
+ * @copyright Copyright © 2009, Tatemae.
+ */
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedFileTooPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvFileToo', function() {
+				var e = ed.selection.getNode();
+				// Internal file object like a flash placeholder
+				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
+					return;
+				ed.windowManager.open({
+					file : jQuery('#tiny_mce_files_path').val(),
+					width : parseInt(jQuery('#tiny_mce_files_width').val()) + parseInt(ed.getLang('advfiletoo.delta_width', 0)),
+					height : parseInt(jQuery('#tiny_mce_files_height').val()) + parseInt(ed.getLang('advfiletoo.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+			// Register button
+			ed.addButton('file', {
+				title : 'Upload Files',
+				cmd : 'mceAdvFileToo',
+				image : '/images/tinymce/upload.gif'
+			});
+		},
+		getInfo : function() {
+			return {
+				longname : 'Advanced file',
+				author : 'Tatemae',
+				authorurl : 'http://Tatemae.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	// Register plugin
+	tinymce.PluginManager.add('advfiletoo', tinymce.plugins.AdvancedFileTooPlugin);
 })();