From 8756bd5e5ebe5edb7d534e2534b65df9fcf9c9cf Mon Sep 17 00:00:00 2001
From: will <will@spanner.org>
Date: Mon, 7 Sep 2009 18:13:29 +0100
Subject: [PATCH] moved under admin/assets, uses submenu

---
 paperclipped_uploader_extension.rb         | 7 +++++--
 public/javascripts/admin/asset_uploader.js | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/paperclipped_uploader_extension.rb b/paperclipped_uploader_extension.rb
index 4a49883..f74b3c6 100644
--- a/paperclipped_uploader_extension.rb
+++ b/paperclipped_uploader_extension.rb
@@ -8,8 +8,8 @@ class PaperclippedUploaderExtension < Radiant::Extension
   
   define_routes do |map|
     map.with_options(:controller => 'admin/assets') do |asset|
-      asset.upload_assets "/admin/uploader", :action => 'upload'
-      asset.describe_new_asset "/admin/describer", :action => 'describe'
+      asset.upload_assets "/admin/assets/uploader", :action => 'upload'
+      asset.describe_new_asset "/admin/assets/describer", :action => 'describe'
       asset.describe_asset "/admin/assets/:id/describe", :action => 'describe'
     end
   end
@@ -18,6 +18,9 @@ def activate
     require 'session_cookie_hack'     # to avoid duplicate alias_chains
     Asset.send :include, UploadableAsset
     Admin::AssetsController.send :include, AssetsControllerExtension
+    admin.tabs['Assets'].add_link('asset list', '/admin/assets')
+    admin.tabs['Assets'].add_link('uploader', '/admin/assets/uploader')
+    
   end
   
   def deactivate
diff --git a/public/javascripts/admin/asset_uploader.js b/public/javascripts/admin/asset_uploader.js
index fe9a5da..1b72beb 100644
--- a/public/javascripts/admin/asset_uploader.js
+++ b/public/javascripts/admin/asset_uploader.js
@@ -204,7 +204,7 @@ Upload.prototype = {
   	this.setWidth(100);
   	this.form_holder = new Element('div', {'class' : "fileform"});
   	this.progress.insert(this.form_holder);
-    new Ajax.Updater(this.form_holder, '/admin/describer', { method: 'get', parameters: {upload: this.token} });
+    new Ajax.Updater(this.form_holder, '/admin/assets/describer', { method: 'get', parameters: {upload: this.token} });
   },
 	setError: function (percentage) {
     this.setFailedWorking();