From 84cb12a4651dcf53aacfcfb1237ee799a09cd0c5 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Tue, 1 Jul 2014 19:25:58 +0200
Subject: [PATCH] Upload action now ask for the uploader type. Downloader.http
 moved as an uploader. Add some color in orbit theme.

---
 core/src/plugins/access.fs/fsActions.xml      |  30 +-
 core/src/plugins/gui.ajax/manifest.xml        |   2 +-
 .../res/themes/orbit/css/ajaxplorer.css       |  63 +++-
 core/src/plugins/uploader.html/manifest.xml   |  34 +-
 .../bookmarklet/ajxp.css                      | 206 +++++------
 .../bookmarklet/ajxp.js                       | 346 +++++++++---------
 .../class.HttpDownloader.php                  |   0
 .../manifest.xml                              |  87 +++--
 .../plugin_doc.html                           |   0
 .../resources/downloader.css                  |  26 +-
 .../resources/i18n/ca.php                     |   0
 .../resources/i18n/cs.php                     |   0
 .../resources/i18n/de.php                     |   0
 .../resources/i18n/en.php                     |   0
 .../resources/i18n/es.php                     |   0
 .../resources/i18n/et.php                     |   0
 .../resources/i18n/fr.php                     |   0
 .../resources/i18n/pt.php                     |   0
 .../resources/images/16/add_bookmarklet.png   | Bin
 .../resources/images/16/bookmarklet.png       | Bin
 .../resources/images/16/computer_upload.png   | Bin
 .../resources/images/16/external_download.png | Bin
 .../resources/images/16/kget_list.png         | Bin
 .../resources/images/16/make.png              | Bin
 .../resources/images/22/add_bookmarklet.png   | Bin
 .../resources/images/22/bookmarklet.png       | Bin
 .../resources/images/22/computer_upload.png   | Bin
 .../resources/images/22/external_download.png | Bin
 .../resources/images/22/kget_list.png         | Bin
 .../resources/images/22/make.png              | Bin
 .../resources/images/32/add_bookmarklet.png   | Bin
 .../resources/images/32/bookmarklet.png       | Bin
 .../resources/images/32/kget_list.png         | Bin
 .../resources/images/32/make.png              | Bin
 .../resources/images/64/kget_list.png         | Bin
 .../resources/images/64/make.png              | Bin
 36 files changed, 438 insertions(+), 356 deletions(-)
 rename core/src/plugins/{downloader.http => uploader.http}/bookmarklet/ajxp.css (95%)
 rename core/src/plugins/{downloader.http => uploader.http}/bookmarklet/ajxp.js (96%)
 rename core/src/plugins/{downloader.http => uploader.http}/class.HttpDownloader.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/manifest.xml (72%)
 rename core/src/plugins/{downloader.http => uploader.http}/plugin_doc.html (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/downloader.css (95%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/ca.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/cs.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/de.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/en.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/es.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/et.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/fr.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/i18n/pt.php (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/add_bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/computer_upload.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/external_download.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/kget_list.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/16/make.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/add_bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/computer_upload.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/external_download.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/kget_list.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/22/make.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/32/add_bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/32/bookmarklet.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/32/kget_list.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/32/make.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/64/kget_list.png (100%)
 rename core/src/plugins/{downloader.http => uploader.http}/resources/images/64/make.png (100%)

diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
index 97e39750d1..dfcf854357 100644
--- a/core/src/plugins/access.fs/fsActions.xml
+++ b/core/src/plugins/access.fs/fsActions.xml
@@ -70,7 +70,12 @@
 				<clientCallback prepareModal="true"><![CDATA[
 					var uploaders = ajaxplorer.getActiveExtensionByType("uploader");
 					if(uploaders.length){
-						var uploader = uploaders[0];
+					    var uploader;
+					    if(window.actionArguments[0]){
+                            uploader = window.actionArguments[0];
+					    }else{
+    						uploader = uploaders[0];
+                        }
 						if(ajaxplorer.actionBar.getActionByName("trigger_remote_copy")){
                             modal.setCloseAction(function(){
                                 ajaxplorer.fireContextRefresh();
@@ -87,7 +92,28 @@
 							uploader.resourcesManager.load();
 							var dialogOnComplete = new Function("oForm", uploader.dialogOnComplete);
 						}
-						modal.showDialogForm('Upload', uploader.formId, dialogOnOpen, null, dialogOnComplete, true, true);
+						var dialogOpen = function(form){
+						    if (form.down('#uploader_chooser')) form.down('#uploader_chooser').remove();
+						    var chooser = new Element('div', {id:'uploader_chooser'});
+						    form.insert({top:chooser});
+						    var chooserList = new Element('ul');
+                            chooser.insert(chooserList);
+                            uploaders.each(function(up){
+                                var label = up.xmlNode.getAttribute("label");
+                                var desc = up.xmlNode.getAttribute("description")
+                                var item = new Element('li', {title:desc}).update(label).observe("click", function(){
+                                    ajaxplorer.actionBar.fireAction("upload", up);
+                                });
+                                if(up == uploader) item.addClassName('current');
+                                chooserList.insert(item);
+                            });
+                            if(uploader.dialogOnOpen){
+                                uploader.resourcesManager.load();
+                                var dialogOnOpen = new Function("oForm", uploader.dialogOnOpen);
+                                dialogOnOpen(form);
+                            }
+						};
+						modal.showDialogForm('Upload', uploader.formId, dialogOpen, null, dialogOnComplete, true, true);
 					}
 				]]></clientCallback>
 				<serverCallback methodName="switchAction" restParams="/input_stream/dir+" preferredHttp="PUT" sdkMethodName="upload" developerComment="Post a file content for upload, by default as x-www-form-urlencoded, but can be passed as input stream as well." checkParams="false">
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
index 6556782704..e366445087 100644
--- a/core/src/plugins/gui.ajax/manifest.xml
+++ b/core/src/plugins/gui.ajax/manifest.xml
@@ -169,7 +169,7 @@
 					<div id="workspace_toolbar" ajxpClass="AjxpPane">
                         <div id="repo_chooser" style="width:15px;" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":5, "menuOffsetLeft":110, "menuMaxHeight":535, "menuEvent":"over", "simpleLabel":"<span class=\"icon-caret-down\"></span>"}'></div>
                         <div id="breadcrumb" class="breadcrumbs-arrow" ajxpClass="Breadcrumb" ajxpOptions='{"use_ul":true, "always_show_root":true, "hide_home_icon":true, "flexTo":"workspace_toolbar", "checkSiblings":true}'></div>
-						<div style="float:right;" ajxpClass="AjxpPane" ajxpOptions='{}' id="search_engine_cont">
+						<div style="float:right; width:260px;" ajxpClass="AjxpPane" ajxpOptions='{}' id="search_engine_cont">
 						    <div id="buttons_bar_top" style="float:right;" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
 						    <div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
 						</div>
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
index 9d5fc83675..8a39a287b4 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -27,7 +27,7 @@ table.sort-table tr:nth-child(even)
 }
 
 .blue_gradient,div.selected-webfx-tree-item, .selected-focus{
-    background: #5599ff !important; /* Old browsers */ /* FF3.6+ */ /* Chrome,Safari4+ */ /* Chrome10+,Safari5.1+ */ /* Opera11.10+ */ /* IE10+ */ /* IE6-9 */ /* W3C */
+    background: #77b8e2 !important; /* Old browsers */ /* FF3.6+ */ /* Chrome,Safari4+ */ /* Chrome10+,Safari5.1+ */ /* Opera11.10+ */ /* IE10+ */ /* IE6-9 */ /* W3C */
 }
 
 .grey_gradient_light_inputs, .dialogContent input, .dialogContent input[type="text"], .dialogContent input[type="password"], .dialogContent select, #search_txt, #location_form,#treeCopy
@@ -450,7 +450,7 @@ div.shadow_class
 .dialogContent select:focus
 {
     background: white;
-    border: 1px solid #5599ff;
+    border: 1px solid #77b8e2;
 }
 
 .dialogContent input:disabled,
@@ -1232,10 +1232,17 @@ input.SF_input.SF_number{
 
 
 .dialogTitle{
+    /*
     border-radius: 2px 2px 0 0;
     background-color: #4dc5c3;
     border-bottom: 1px solid rgb(67, 156, 155);
-}
+    */
+    border-radius: 2px 2px 0 0;
+    background-color: #77b8e2;
+    border-bottom: 0px solid #b5b5b5;
+    color: #ffffff;
+    padding: 10px 2px 8px 9px;
+    font-weight: bold;}
 
 #sidebar_splitter div.panelHeader,
 #search_panel div.panelHeader{
@@ -1580,7 +1587,7 @@ div.class-FetchedResultPane > div.panelHeader
     padding: 14px 8px 6px;
     margin: 0;
     background-color: #f7f7f7;
-    color: #555;
+    color: #4dc5c3;
     text-transform: uppercase;
     letter-spacing: 1px;
     border-left: 1px solid #d5d5d5;
@@ -2269,7 +2276,7 @@ UPLOAD MULTIFILE FORM
 div#upload_files_list, div#multiple_download_container
 {
     overflow: auto;
-    height: 210px;
+    height: 350px;
     border: 4px dashed rgb(221, 221, 221);
     text-align: left;
     -moz-border-radius: 11px;
@@ -2278,7 +2285,7 @@ div#upload_files_list, div#multiple_download_container
 
 .droparea {
     background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
-    background-position: 10px 100%;
+    background-position: center;
 }
 
 .dropareaHover{
@@ -2291,6 +2298,44 @@ div#upload_files_list, div#multiple_download_container
     background-color: white !important;
 }
 
+#uploader_chooser{
+    width: 100%;
+}
+
+#uploader_chooser ul{
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    display: block;
+    position: relative;
+    border-bottom: 1px solid #4DC5C2;
+    background-color: #d5d5d5;
+}
+
+#uploader_chooser li {
+    display: inline-block;
+    background-color: white;
+    padding: 7px 14px;
+    border-radius: 4px 4px 0 0;
+    margin: 8px 2px;
+    margin-bottom: 0;
+    border-bottom: 0;
+    cursor: pointer;
+    font-size: 13px;
+}
+
+#uploader_chooser li:hover {
+    background-color: #f7f7f7;
+}
+#uploader_chooser li.current:hover {
+    background-color: #4DC5C2;
+}
+#uploader_chooser li.current {
+    background-color: #4DC5C2;
+    color: white;
+    cursor: default;
+}
+
 div#uploader_options_pane {
     background-color: white;
     border-top: 1px solid #CCCCCC;
@@ -2440,7 +2485,7 @@ div#upload_files_list span.item_relative_path{
 
 
 .fakeUploadButton {
-    width: 151px;
+    width: 161px;
     padding-top: 6px;
     padding-bottom: 6px;
     border: 1px solid #ccc;
@@ -2587,7 +2632,7 @@ span.toggleHeader{
 }
 
 span.toggleHeader.toggleInactive{
-    background-color: #f7f7f7;
+    background-color: #e5e5e5;
     cursor: pointer;
     border: 1px solid #f7f7f7;
 }
@@ -3177,7 +3222,7 @@ td.infoPanelLabel {
 
 .panelContent div.panelHeader{
 
-    color: #555;
+    color: #77b8e2;
     font-weight: bold;
     font-size: 12px;
     padding: 6px 7px;
diff --git a/core/src/plugins/uploader.html/manifest.xml b/core/src/plugins/uploader.html/manifest.xml
index ff192a42f1..1ef4c3b961 100644
--- a/core/src/plugins/uploader.html/manifest.xml
+++ b/core/src/plugins/uploader.html/manifest.xml
@@ -92,23 +92,25 @@
 		]]></clientForm>
         <clientForm id="originalUploadForm" theme="orbit"><![CDATA[
 			<!-- UPLOAD FORM -->
-			<form action="AJXP_SERVER_ACCESS" target="hidden_iframe" enctype="multipart/form-data" method="POST" id="originalUploadForm" style="text-align:left; display:none;" box_width="420">
-			<div id="fileInputContainer">
-			    <div id="uploaderTextActions">
-                    <span id="uploadSendButton">AJXP_MESSAGE[77] |</span>
-                    <span id="clear_list_button">AJXP_MESSAGE[216] |</span>
-                    <span id="uploadOptionsButton">AJXP_MESSAGE[310] <span style="display:none;">[x]</span></span>
-			    </div>
-                <div id="fileInputContainerDiv">
-                        <div id="fileInputPos"><input type="file" name="userfile_1" class="dialogFocus"></div>
-                        <div id="uploadBrowseButton" class="fakeUploadButton"><span class="icon-desktop"></span>AJXP_MESSAGE[454]</div>
+			<form action="AJXP_SERVER_ACCESS" target="hidden_iframe" enctype="multipart/form-data" method="POST" id="originalUploadForm" style="text-align:left; display:none;" box_width="60%" box_padding="0">
+			<div style="padding:10px;">
+                <div id="fileInputContainer">
+                    <div id="uploaderTextActions">
+                        <span id="uploadSendButton">AJXP_MESSAGE[77] |</span>
+                        <span id="clear_list_button">AJXP_MESSAGE[216] |</span>
+                        <span id="uploadOptionsButton">AJXP_MESSAGE[310] <span style="display:none;">[x]</span></span>
+                    </div>
+                    <div id="fileInputContainerDiv">
+                            <div id="fileInputPos"><input type="file" name="userfile_1" class="dialogFocus"></div>
+                            <div id="uploadBrowseButton" class="fakeUploadButton"><span class="icon-desktop"></span>AJXP_MESSAGE[454]</div>
+                    </div>
                 </div>
-            </div>
-			<div id="uploader_options_pane"></div>
-            <div id="upload_files_list" class="uploadFilesList rowAsProgressBar"></div>
-            <div id="total_files_list"></div>
-			<input type="hidden" name="get_action" value="upload">
-			<input type="hidden" name="simple_uploader" value="true">
+                <div id="uploader_options_pane"></div>
+                <div id="upload_files_list" class="uploadFilesList rowAsProgressBar"></div>
+                <div id="total_files_list"></div>
+                <input type="hidden" name="get_action" value="upload">
+                <input type="hidden" name="simple_uploader" value="true">
+			<div>
 			</form>
 			<script language="javascript">$('originalUploadForm').hide();</script>
 		]]></clientForm>
diff --git a/core/src/plugins/downloader.http/bookmarklet/ajxp.css b/core/src/plugins/uploader.http/bookmarklet/ajxp.css
similarity index 95%
rename from core/src/plugins/downloader.http/bookmarklet/ajxp.css
rename to core/src/plugins/uploader.http/bookmarklet/ajxp.css
index 2315ffcd46..95991d5454 100644
--- a/core/src/plugins/downloader.http/bookmarklet/ajxp.css
+++ b/core/src/plugins/uploader.http/bookmarklet/ajxp.css
@@ -1,104 +1,104 @@
-#ajxp_bm_main, #ajxp_bm_main a {
-	color: #999 !important;
-}
-
-.ajxp_bm_menu{
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    width: 245px;
-    background-color: rgba(255, 255, 255, 0.9);
-    border-radius: 5px;
-    padding: 5px 10px;
-    font-family: arial;
-    font-size: 16px;
-    opacity: 1;
-    box-shadow: 4px 4px 15px rgba(0,0,0,0.3);
-    z-index: 1000000;
-    font-weight: bold;
-    /*text-shadow: 1px 1px 3px black;*/
-}
-
-.ajxp_bm_menu_legend{
-    color: #ccc;
-    font-size: 0.5em;
-    padding: 10px 5px;
-    text-shadow: none;
-}
-
-#ajxp_bm_iframe{
-    margin-bottom: 5px;
-    width: 248px;
-    height: 134px;
-    margin-top: 12px;
-    /*border-radius: 5px;*/
-}
-
-#ajxp_bm_link_title{
-	font-size: 11px;
-	border-bottom: 1px solid #999;
-	padding: 3px 0px 5px 0px;
-}
-
-#ajxp_bm_link_menu{
-	display:none;
-	width:240px;
-	right: 300px;
-    background-color: rgba(255,255,255,0.70);
-    -moz-opacity:1;
-    opacity: 1;
-    filter:alpha(opacity=100);
-    padding: 5px;
-    color: #000;
-    text-align: center;
-}
-
-#ajxp_bm_link_menu.ajxp_bm_small{
-    width:200px;
-    text-align: left;
-    background-color: rgba(255,255,255,0.90);
-}
-#ajxp_bm_link_menu.ajxp_bm_small a{
-    font-family: inherit;
-    font-size: inherit;
-}
-
-#ajxp_bm_link_menu a#ajxp_bm_link_dl1,
-#ajxp_bm_link_menu a#ajxp_bm_link_dl2{
-    display: block;
-    color: #999 !important;
-    margin-top: 4px;
-    text-shadow: 1px 1px white;
-    font-weight: bold;
-    cursor: pointer;
-}
-
-#ajxp_bm_link_menu.ajxp_bm_big a#ajxp_bm_link_dl1{
-	display:inline-block;
-	cursor:pointer;
-	color:#aaa;
-    font-size: 18px;
-    line-height: 33px;
-    border: 2px solid #BBB;
-    display: inline-block;
-    padding: 2px 5px;
-    border-radius: 5px;
-    margin-top: 20%;
-    background-color: white;
-    box-shadow: 0px 0px 29px #999;
-}
-
-#ajxp_bm_link_menu.ajxp_bm_small a#ajxp_bm_link_dl1{
-    background-color: transparent;
-    box-shadow: none;
-    border: none;
-    margin-top: 0px;
-}
-
-#ajxp_bm_link_menu a img{
-    vertical-align: middle;
-}
-
-#ajxp_bm_link_menu.ajxp_bm_small a img{
-    display: none;
+#ajxp_bm_main, #ajxp_bm_main a {
+	color: #999 !important;
+}
+
+.ajxp_bm_menu{
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 245px;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 5px;
+    padding: 5px 10px;
+    font-family: arial;
+    font-size: 16px;
+    opacity: 1;
+    box-shadow: 4px 4px 15px rgba(0,0,0,0.3);
+    z-index: 1000000;
+    font-weight: bold;
+    /*text-shadow: 1px 1px 3px black;*/
+}
+
+.ajxp_bm_menu_legend{
+    color: #ccc;
+    font-size: 0.5em;
+    padding: 10px 5px;
+    text-shadow: none;
+}
+
+#ajxp_bm_iframe{
+    margin-bottom: 5px;
+    width: 248px;
+    height: 134px;
+    margin-top: 12px;
+    /*border-radius: 5px;*/
+}
+
+#ajxp_bm_link_title{
+	font-size: 11px;
+	border-bottom: 1px solid #999;
+	padding: 3px 0px 5px 0px;
+}
+
+#ajxp_bm_link_menu{
+	display:none;
+	width:240px;
+	right: 300px;
+    background-color: rgba(255,255,255,0.70);
+    -moz-opacity:1;
+    opacity: 1;
+    filter:alpha(opacity=100);
+    padding: 5px;
+    color: #000;
+    text-align: center;
+}
+
+#ajxp_bm_link_menu.ajxp_bm_small{
+    width:200px;
+    text-align: left;
+    background-color: rgba(255,255,255,0.90);
+}
+#ajxp_bm_link_menu.ajxp_bm_small a{
+    font-family: inherit;
+    font-size: inherit;
+}
+
+#ajxp_bm_link_menu a#ajxp_bm_link_dl1,
+#ajxp_bm_link_menu a#ajxp_bm_link_dl2{
+    display: block;
+    color: #999 !important;
+    margin-top: 4px;
+    text-shadow: 1px 1px white;
+    font-weight: bold;
+    cursor: pointer;
+}
+
+#ajxp_bm_link_menu.ajxp_bm_big a#ajxp_bm_link_dl1{
+	display:inline-block;
+	cursor:pointer;
+	color:#aaa;
+    font-size: 18px;
+    line-height: 33px;
+    border: 2px solid #BBB;
+    display: inline-block;
+    padding: 2px 5px;
+    border-radius: 5px;
+    margin-top: 20%;
+    background-color: white;
+    box-shadow: 0px 0px 29px #999;
+}
+
+#ajxp_bm_link_menu.ajxp_bm_small a#ajxp_bm_link_dl1{
+    background-color: transparent;
+    box-shadow: none;
+    border: none;
+    margin-top: 0px;
+}
+
+#ajxp_bm_link_menu a img{
+    vertical-align: middle;
+}
+
+#ajxp_bm_link_menu.ajxp_bm_small a img{
+    display: none;
 }
\ No newline at end of file
diff --git a/core/src/plugins/downloader.http/bookmarklet/ajxp.js b/core/src/plugins/uploader.http/bookmarklet/ajxp.js
similarity index 96%
rename from core/src/plugins/downloader.http/bookmarklet/ajxp.js
rename to core/src/plugins/uploader.http/bookmarklet/ajxp.js
index 33dc9a58b7..5b9f2bb9ba 100644
--- a/core/src/plugins/downloader.http/bookmarklet/ajxp.js
+++ b/core/src/plugins/uploader.http/bookmarklet/ajxp.js
@@ -1,174 +1,174 @@
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-var currentLink;
-function parseLinks(){
-    var bmlink1 = '<a id="ajxp_bm_link_dl1" title="Send to Pydio">\
-                Download <img ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png" align="absmiddle"><img align="absmiddle" ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png"></a>';
-	jQuery('body').append('<link rel="stylesheet" type="text/css" href="'+ajxp_bm_target+'plugins/downloader.http/bookmarklet/ajxp.css"></link>');
-	jQuery('body').append('<div id="ajxp_bm_main" style="display:none;" class="ajxp_bm_menu" ><div><a id="ajxp_bm_close" style="float:right;font-size:12px;cursor:pointer;border-left:1px solid #fff;padding-left: 10px;">X</a>Pydio direct download</div><div class="ajxp_bm_menu_legend">Click on any link or image to send the link directly to your Pydio account.</div><div style="display:none" id="ajxp_bm_frame_div"><iframe frameborder="0" id="ajxp_bm_iframe"></iframe></div></div><div style="position:absolute;" class="ajxp_bm_menu" id="ajxp_bm_link_menu">'+bmlink1+'<a id="ajxp_bm_link_dl2">Process link normally</a></div>').click(function(){jQuery('#ajxp_bm_link_menu').slideUp();}) ;
-
-    jQuery('#ajxp_bm_main').css("background-color", "#ffffff").css("width", "400px").css("font-size","29px").css("line-height","auto");
-    window.setTimeout(function(){
-        jQuery('#ajxp_bm_main').css("top", ((jQuery(window).height() - jQuery('#ajxp_bm_main').outerHeight()) / 2) + jQuery(window).scrollTop() + "px");
-        jQuery('#ajxp_bm_main').css("right", ((jQuery(window).width() - jQuery('#ajxp_bm_main').outerWidth()) / 2) + jQuery(window).scrollLeft() + "px");
-        jQuery('#ajxp_bm_main').slideDown();
-    }, 100);
-    window.setTimeout(function(){
-        var wTop = jQuery(window).scrollTop() + 5;
-        jQuery("#ajxp_bm_main").animate({
-            top:jQuery(window).scrollTop() + 5,
-            right:5,
-            width:250,
-            fontSize:"16px",
-            lineHeight:"20px",
-            opacity:0.9
-        });
-        jQuery(".ajxp_bm_menu_legend").slideUp();
-    }, 2500);
-    
-	jQuery(window).bind('scroll', function(){
-		jQuery('#ajxp_bm_main').css('top', jQuery(window).scrollTop() + 5);
-	});
-	//jQuery('#ajxp_bm_main').css('top', jQuery(window).scrollTop() + 5);
-	jQuery('#ajxp_bm_link_dl1').click(triggerAjxpDL);
-	jQuery('#ajxp_bm_link_dl2').click(triggerOriginalDL);
-	var linkHandler = function(event){
-		event.preventDefault();
-		event.stopPropagation();
-		currentLink = jQuery(this);
-		var offset = currentLink.offset();
-		var height = currentLink.height();
-        var width = currentLink.width();
-		var href = currentLink.attr("href") || currentLink.attr('src');
-		var title = realHref(href);
-		jQuery('#ajxp_bm_link_dl2').show();
-		if(currentLink.attr("src")){
-			if(!currentLink.parents('a').size()){
-				jQuery('#ajxp_bm_link_dl2').hide();
-			}
-		}
-		if(title.length > 38){
-			title = title.substring(0,10)+'...'+title.substring(title.length-28);
-		}
-        jQuery("#ajxp_bm_link_menu a[ajxp_clone],#ajxp_bm_link_menu img[ajxp_clone]").remove();
-        if(height > 45){
-            jQuery("#ajxp_bm_link_menu").addClass("ajxp_bm_big").removeClass("ajxp_bm_small");
-            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none'){
-                jQuery("#ajxp_bm_link_menu").css('top', offset.top-5).css('left',offset.left-5).css('height',height).css('width',width).slideDown();
-            }else{
-                jQuery("#ajxp_bm_link_menu").animate({top:offset.top-5,left:offset.left-5,height:height,width:width});
-            }
-            jQuery("#ajxp_bm_link_dl1").css("margin-top",(height/2)-30);
-        }else{
-            jQuery("#ajxp_bm_link_menu").removeClass("ajxp_bm_big").addClass("ajxp_bm_small");
-            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none'){
-                jQuery("#ajxp_bm_link_menu").css('top', offset.top-5).css('left',offset.left-5).css('height','auto').css('width',Math.max(width,200)).slideDown();
-            }else{
-                jQuery("#ajxp_bm_link_menu").animate({top:offset.top-5,left:offset.left-5,width:Math.max(width,200)}).css('height','auto');
-            }
-            jQuery("#ajxp_bm_link_dl1").css("margin-top",5);
-            jQuery("#ajxp_bm_link_dl1").before(jQuery(currentLink[0].cloneNode(true)).attr("ajxp_clone", "true"));
-        }
-	};
-	var eachFuncAttacher = function(index){
-		var link = jQuery(this);		
-		var href = link.attr("href") || link.attr('src');
-        if(link.attr('ajxp_image')) return;
-		if(!href) return;
-		link.bind('click', linkHandler).bind("mouseenter", function(){
-            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none') return;
-            $(this).linkHandler();
-        }) .attr('ajxp_bound', 'true');
-	};
-	jQuery('a,img').each(eachFuncAttacher);
-	jQuery('#ajxp_bm_close').click(function(){
-		jQuery('a,img').each(function(index){
-			var link = jQuery(this);
-			if(link.attr('ajxp_bound')){
-				link.unbind('click', linkHandler);				
-			}
-		});
-		jQuery('#ajxp_bm_main').remove();
-		jQuery('#ajxp_bm_link_menu').remove();
-	});	
-}
-function triggerAjxpDL(){
-	jQuery("#ajxp_bm_link_menu").slideUp();
-	var href = currentLink.attr("href") || currentLink.attr('src');
-	var params = [
-		'gui=light',
-		'dl_later='+encodeURIComponent(realHref(href)),
-		'tmp_repository_id='+ajxp_bm_repository_id,
-		'folder='+ajxp_bm_folder,
-        'dl_now=true'//+(jQuery('#ajxp_dl_now')[0].checked ? "true":"false")
-	];
-	jQuery('#ajxp_bm_iframe').attr("src", ajxp_bm_target+"?" + params.join("&"));
-    jQuery('#ajxp_bm_frame_div').slideDown();
-    var firstLoad = true;
-    jQuery('#ajxp_bm_iframe')[0].onload = function(){
-        if(firstLoad){
-            firstLoad = false;
-        }else{
-            jQuery('#ajxp_bm_frame_div').slideUp();
-        }
-    };
-
-    /*
-	window.setTimeout(function(){
-		jQuery('#ajxp_bm_frame_div').slideUp();
-	}, 10000);
-	*/
-}
-function triggerOriginalDL(){
-	jQuery("#ajxp_bm_link_menu").slideUp();
-	var href = currentLink.attr("href");
-	if(currentLink.attr("src")){
-		href = currentLink.parents('a').first().attr("href");
-	}
-	document.location.href = href;	
-}
-function realHref(href){
-	var path = jQuery("<div style=\"background-image:url('"+href+"');\"></div>").css("background-image");
-	if (path.indexOf("url(" == 0)) { path = path.substring(4); }
-	if (path.lastIndexOf(")") === path.length-1) { path = path.substring(0, path.length - 1); }
-	if (path.indexOf("\"") === 0) { path = path.substring(1, path.length); }
-	if (path.lastIndexOf("\"") === path.length-1) { path = path.substring(0, path.length - 1); }	
-	return path;
-}
-if(!window.jQuery){
-	var element=document.createElement('scr'+'ipt');
-	element.setAttribute('src','https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js?t='+(new Date().getTime()));
-	if(document.all){
-		element.onreadystatechange = function(){
-			if(element.readyState == 'loaded'){
-				jQuery.noConflict();
-				parseLinks();
-			}
-		};
-	}else{
-		element.onload = function(){
-			jQuery.noConflict();
-			parseLinks();
-		};
-	}
-	document.body.appendChild(element);
-}else{
-	parseLinks();
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
+ */
+var currentLink;
+function parseLinks(){
+    var bmlink1 = '<a id="ajxp_bm_link_dl1" title="Send to Pydio">\
+                Download <img ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png" align="absmiddle"><img align="absmiddle" ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png"></a>';
+	jQuery('body').append('<link rel="stylesheet" type="text/css" href="'+ajxp_bm_target+'plugins/uploader.http/bookmarklet/ajxp.css"></link>');
+	jQuery('body').append('<div id="ajxp_bm_main" style="display:none;" class="ajxp_bm_menu" ><div><a id="ajxp_bm_close" style="float:right;font-size:12px;cursor:pointer;border-left:1px solid #fff;padding-left: 10px;">X</a>Pydio direct download</div><div class="ajxp_bm_menu_legend">Click on any link or image to send the link directly to your Pydio account.</div><div style="display:none" id="ajxp_bm_frame_div"><iframe frameborder="0" id="ajxp_bm_iframe"></iframe></div></div><div style="position:absolute;" class="ajxp_bm_menu" id="ajxp_bm_link_menu">'+bmlink1+'<a id="ajxp_bm_link_dl2">Process link normally</a></div>').click(function(){jQuery('#ajxp_bm_link_menu').slideUp();}) ;
+
+    jQuery('#ajxp_bm_main').css("background-color", "#ffffff").css("width", "400px").css("font-size","29px").css("line-height","auto");
+    window.setTimeout(function(){
+        jQuery('#ajxp_bm_main').css("top", ((jQuery(window).height() - jQuery('#ajxp_bm_main').outerHeight()) / 2) + jQuery(window).scrollTop() + "px");
+        jQuery('#ajxp_bm_main').css("right", ((jQuery(window).width() - jQuery('#ajxp_bm_main').outerWidth()) / 2) + jQuery(window).scrollLeft() + "px");
+        jQuery('#ajxp_bm_main').slideDown();
+    }, 100);
+    window.setTimeout(function(){
+        var wTop = jQuery(window).scrollTop() + 5;
+        jQuery("#ajxp_bm_main").animate({
+            top:jQuery(window).scrollTop() + 5,
+            right:5,
+            width:250,
+            fontSize:"16px",
+            lineHeight:"20px",
+            opacity:0.9
+        });
+        jQuery(".ajxp_bm_menu_legend").slideUp();
+    }, 2500);
+    
+	jQuery(window).bind('scroll', function(){
+		jQuery('#ajxp_bm_main').css('top', jQuery(window).scrollTop() + 5);
+	});
+	//jQuery('#ajxp_bm_main').css('top', jQuery(window).scrollTop() + 5);
+	jQuery('#ajxp_bm_link_dl1').click(triggerAjxpDL);
+	jQuery('#ajxp_bm_link_dl2').click(triggerOriginalDL);
+	var linkHandler = function(event){
+		event.preventDefault();
+		event.stopPropagation();
+		currentLink = jQuery(this);
+		var offset = currentLink.offset();
+		var height = currentLink.height();
+        var width = currentLink.width();
+		var href = currentLink.attr("href") || currentLink.attr('src');
+		var title = realHref(href);
+		jQuery('#ajxp_bm_link_dl2').show();
+		if(currentLink.attr("src")){
+			if(!currentLink.parents('a').size()){
+				jQuery('#ajxp_bm_link_dl2').hide();
+			}
+		}
+		if(title.length > 38){
+			title = title.substring(0,10)+'...'+title.substring(title.length-28);
+		}
+        jQuery("#ajxp_bm_link_menu a[ajxp_clone],#ajxp_bm_link_menu img[ajxp_clone]").remove();
+        if(height > 45){
+            jQuery("#ajxp_bm_link_menu").addClass("ajxp_bm_big").removeClass("ajxp_bm_small");
+            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none'){
+                jQuery("#ajxp_bm_link_menu").css('top', offset.top-5).css('left',offset.left-5).css('height',height).css('width',width).slideDown();
+            }else{
+                jQuery("#ajxp_bm_link_menu").animate({top:offset.top-5,left:offset.left-5,height:height,width:width});
+            }
+            jQuery("#ajxp_bm_link_dl1").css("margin-top",(height/2)-30);
+        }else{
+            jQuery("#ajxp_bm_link_menu").removeClass("ajxp_bm_big").addClass("ajxp_bm_small");
+            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none'){
+                jQuery("#ajxp_bm_link_menu").css('top', offset.top-5).css('left',offset.left-5).css('height','auto').css('width',Math.max(width,200)).slideDown();
+            }else{
+                jQuery("#ajxp_bm_link_menu").animate({top:offset.top-5,left:offset.left-5,width:Math.max(width,200)}).css('height','auto');
+            }
+            jQuery("#ajxp_bm_link_dl1").css("margin-top",5);
+            jQuery("#ajxp_bm_link_dl1").before(jQuery(currentLink[0].cloneNode(true)).attr("ajxp_clone", "true"));
+        }
+	};
+	var eachFuncAttacher = function(index){
+		var link = jQuery(this);		
+		var href = link.attr("href") || link.attr('src');
+        if(link.attr('ajxp_image')) return;
+		if(!href) return;
+		link.bind('click', linkHandler).bind("mouseenter", function(){
+            if(jQuery("#ajxp_bm_link_menu").css('display') == 'none') return;
+            $(this).linkHandler();
+        }) .attr('ajxp_bound', 'true');
+	};
+	jQuery('a,img').each(eachFuncAttacher);
+	jQuery('#ajxp_bm_close').click(function(){
+		jQuery('a,img').each(function(index){
+			var link = jQuery(this);
+			if(link.attr('ajxp_bound')){
+				link.unbind('click', linkHandler);				
+			}
+		});
+		jQuery('#ajxp_bm_main').remove();
+		jQuery('#ajxp_bm_link_menu').remove();
+	});	
+}
+function triggerAjxpDL(){
+	jQuery("#ajxp_bm_link_menu").slideUp();
+	var href = currentLink.attr("href") || currentLink.attr('src');
+	var params = [
+		'gui=light',
+		'dl_later='+encodeURIComponent(realHref(href)),
+		'tmp_repository_id='+ajxp_bm_repository_id,
+		'folder='+ajxp_bm_folder,
+        'dl_now=true'//+(jQuery('#ajxp_dl_now')[0].checked ? "true":"false")
+	];
+	jQuery('#ajxp_bm_iframe').attr("src", ajxp_bm_target+"?" + params.join("&"));
+    jQuery('#ajxp_bm_frame_div').slideDown();
+    var firstLoad = true;
+    jQuery('#ajxp_bm_iframe')[0].onload = function(){
+        if(firstLoad){
+            firstLoad = false;
+        }else{
+            jQuery('#ajxp_bm_frame_div').slideUp();
+        }
+    };
+
+    /*
+	window.setTimeout(function(){
+		jQuery('#ajxp_bm_frame_div').slideUp();
+	}, 10000);
+	*/
+}
+function triggerOriginalDL(){
+	jQuery("#ajxp_bm_link_menu").slideUp();
+	var href = currentLink.attr("href");
+	if(currentLink.attr("src")){
+		href = currentLink.parents('a').first().attr("href");
+	}
+	document.location.href = href;	
+}
+function realHref(href){
+	var path = jQuery("<div style=\"background-image:url('"+href+"');\"></div>").css("background-image");
+	if (path.indexOf("url(" == 0)) { path = path.substring(4); }
+	if (path.lastIndexOf(")") === path.length-1) { path = path.substring(0, path.length - 1); }
+	if (path.indexOf("\"") === 0) { path = path.substring(1, path.length); }
+	if (path.lastIndexOf("\"") === path.length-1) { path = path.substring(0, path.length - 1); }	
+	return path;
+}
+if(!window.jQuery){
+	var element=document.createElement('scr'+'ipt');
+	element.setAttribute('src','https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js?t='+(new Date().getTime()));
+	if(document.all){
+		element.onreadystatechange = function(){
+			if(element.readyState == 'loaded'){
+				jQuery.noConflict();
+				parseLinks();
+			}
+		};
+	}else{
+		element.onload = function(){
+			jQuery.noConflict();
+			parseLinks();
+		};
+	}
+	document.body.appendChild(element);
+}else{
+	parseLinks();
 }
\ No newline at end of file
diff --git a/core/src/plugins/downloader.http/class.HttpDownloader.php b/core/src/plugins/uploader.http/class.HttpDownloader.php
similarity index 100%
rename from core/src/plugins/downloader.http/class.HttpDownloader.php
rename to core/src/plugins/uploader.http/class.HttpDownloader.php
diff --git a/core/src/plugins/downloader.http/manifest.xml b/core/src/plugins/uploader.http/manifest.xml
similarity index 72%
rename from core/src/plugins/downloader.http/manifest.xml
rename to core/src/plugins/uploader.http/manifest.xml
index f7ba0fac84..18d7ce64d7 100644
--- a/core/src/plugins/downloader.http/manifest.xml
+++ b/core/src/plugins/uploader.http/manifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxp_plugin id="downloader.http" label="CONF_MESSAGE[Remote Download]" description="CONF_MESSAGE[Async downloader to load a file from another source]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/downloader.http/class.HttpDownloader.php" classname="HttpDownloader"/>
+<uploader text="51" title="132" id="uploader.http" label="CONF_MESSAGE[Remote Download]" description="CONF_MESSAGE[Async downloader to load a file from another source]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+	<class_definition filename="plugins/uploader.http/class.HttpDownloader.php" classname="HttpDownloader"/>
 	<client_settings>
 		<resources>
-	        <i18n namespace="httpdownloader" path="plugins/downloader.http/resources/i18n" />
-	        <img_library alias="httpdownloader_images" path="plugins/downloader.http/resources/images" />
-            <css file="plugins/downloader.http/resources/downloader.css" autoload="true"/>
+	        <i18n namespace="httpdownloader" path="plugins/uploader.http/resources/i18n" />
+	        <img_library alias="httpdownloader_images" path="plugins/uploader.http/resources/images" />
+            <css file="plugins/uploader.http/resources/downloader.css" autoload="true"/>
 		</resources>
 	</client_settings>
 	<registry_contributions>
@@ -14,6 +14,7 @@
             <extension mime="dlpart" messageId="httpdownloader.18" icon="httpdownloader_images/ICON_SIZE/make.png"/>
         </extensions>
 		<actions>
+            <!--
             <action name="upload">
                 <subMenu>
                     <dynamicBuilder><![CDATA[
@@ -38,7 +39,8 @@
                     ]]></dynamicBuilder>
                 </subMenu>
             </action>
-			<action name="external_download">
+            -->
+            <action name="external_download">
 				<gui text="httpdownloader.1" title="httpdownloader.2" src="httpdownloader_images/ICON_SIZE/external_download.png" accessKey="httpdownloader.3" hasAccessKey="true">
 					<context selection="false" dir="true" recycle="hidden"
 						actionBar="false" contextMenu="false" infoPanel="false"
@@ -47,39 +49,10 @@
 				</gui>
 				<rightsContext noUser="true" userLogged="only" read="false" write="true" adminOnly=""></rightsContext>
 				<processing>
-					<clientCallback prepareModal="true" dialogOpenForm="external_download">
-						<dialogOnOpen></dialogOnOpen>
-						<dialogOnComplete><![CDATA[
-							var dlFile = oForm.down('[name="url"]').getValue();
-							var crtDir = ajaxplorer.getContextNode().getPath();
-							var bgManager = ajaxplorer.actionBar.bgManager;
-							bgManager.queueAction("external_download", new Hash({file:dlFile, dir:crtDir}), MessageHash["httpdownloader.6"]+ " " +getBaseName(dlFile)+" " + MessageHash["httpdownloader.7"]);
-							for(var i=2;i<6;i++){
-								var file = oForm.down('[name="url'+i+'"]').getValue();
-								if(file){
-									bgManager.queueAction("external_download", new Hash({file:file, dir:crtDir}), MessageHash["httpdownloader.6"]+ " " +getBaseName(file)+" " + MessageHash["httpdownloader.7"]);
-								}
-							}
-							bgManager.next();
-							hideLightBox(true);
-						]]></dialogOnComplete>
-					</clientCallback>
-					<clientForm id="external_download"><![CDATA[
-					<div id="external_download" action="external_download" box_width="320">
-					<span class="dialoglegend">AJXP_MESSAGE[httpdownloader.4]</span>
-					<div style="padding:10px;">
-					AJXP_MESSAGE[httpdownloader.5] 1 : <input type="text" name="url" style="width:227px;" class="dialogFocus"><br/>
-					AJXP_MESSAGE[httpdownloader.5] 2 : <input type="text" name="url2" style="width:227px;margin-top:5px;"><br/>
-					AJXP_MESSAGE[httpdownloader.5] 3 : <input type="text" name="url3" style="width:227px;margin-top:5px;"><br/>
-					AJXP_MESSAGE[httpdownloader.5] 4 : <input type="text" name="url4" style="width:227px;margin-top:5px;"><br/>
-					AJXP_MESSAGE[httpdownloader.5] 5 : <input type="text" name="url5" style="width:227px;margin-top:5px;">
-					</div>
-					</div>
-					]]></clientForm>
 					<serverCallback methodName="switchAction"></serverCallback>
 				</processing>
 			</action>
-			<action name="external_download_file">
+            <action name="external_download_file">
 				<gui text="httpdownloader.1" title="httpdownloader.2" src="httpdownloader_images/ICON_SIZE/kget_list.png" accessKey="httpdownloader.3" hasAccessKey="false">
 					<context selection="true" dir="true" recycle="hidden"
 						actionBar="true" contextMenu="true" infoPanel="false"
@@ -111,12 +84,12 @@
 					<clientCallback prepareModal="true" dialogOpenForm="dynamic_bookmarklet">
 						<dialogOnOpen><![CDATA[
 						    var rm =new ResourcesManager();
-						    rm.loadCSSResource('plugins/downloader.http/resources/downloader.css');
+						    rm.loadCSSResource('plugins/uploader.http/resources/downloader.css');
 							var root = document.location.href;
 							root = root.substring(0,root.lastIndexOf("/") + 1);
 							var repository = ajaxplorer.user.getActiveRepository();
 							var folder = ajaxplorer.getContextNode().getPath();
-							var bmletValue = "javascript:(function(){window.ajxp_bm_target='"+root+"',window.ajxp_bm_repository_id='"+repository+"', window.ajxp_bm_folder='"+folder+"'; var d=document,s=d.createElement('scr'+'ipt'),b=d.body,l=d.location;s.setAttribute('src','"+root+"plugins/downloader.http/bookmarklet/ajxp.js?t='+(new Date().getTime()));b.appendChild(s)})();";
+							var bmletValue = "javascript:(function(){window.ajxp_bm_target='"+root+"',window.ajxp_bm_repository_id='"+repository+"', window.ajxp_bm_folder='"+folder+"'; var d=document,s=d.createElement('scr'+'ipt'),b=d.body,l=d.location;s.setAttribute('src','"+root+"plugins/uploader.http/bookmarklet/ajxp.js?t='+(new Date().getTime()));b.appendChild(s)})();";
 							$('bookmarklet_link').setAttribute("href", bmletValue);
 							var basename = getBaseName(folder);
 							if(basename == ""){
@@ -185,4 +158,40 @@
 		<!-- Stream Wrapper Access -->
 		<activePlugin pluginName="access.AJXP_STREAM_PROVIDER"/>
 	</dependencies>
-</ajxp_plugin>
+    <processing>
+        <clientForm id="external_download"><![CDATA[
+            <div id="external_download" action="external_download" box_width="500" box_padding="0">
+                <div style="padding:10px;">
+                    <span class="dialoglegend">AJXP_MESSAGE[httpdownloader.4]</span>
+                    <div>
+                        AJXP_MESSAGE[httpdownloader.5] 1 : <input type="text" name="url" style="width:407px;" class="dialogFocus"><br/>
+                        AJXP_MESSAGE[httpdownloader.5] 2 : <input type="text" name="url2" style="width:407px;margin-top:5px;"><br/>
+                        AJXP_MESSAGE[httpdownloader.5] 3 : <input type="text" name="url3" style="width:407px;margin-top:5px;"><br/>
+                        AJXP_MESSAGE[httpdownloader.5] 4 : <input type="text" name="url4" style="width:407px;margin-top:5px;"><br/>
+                        AJXP_MESSAGE[httpdownloader.5] 5 : <input type="text" name="url5" style="width:407px;margin-top:5px;">
+                    </div>
+                </div>
+            </div>
+        ]]></clientForm>
+        <dialogOnOpen><![CDATA[
+             modal.addSubmitCancel(modal.getForm());
+             modal.getForm().down('input[name="ok"]').observe("click", function(e){
+                Event.stop(e);
+                oForm = modal.getForm();
+                var dlFile = oForm.down('[name="url"]').getValue();
+                var crtDir = ajaxplorer.getContextNode().getPath();
+                var bgManager = ajaxplorer.actionBar.bgManager;
+                bgManager.queueAction("external_download", new Hash({file:dlFile, dir:crtDir}), MessageHash["httpdownloader.6"]+ " " +getBaseName(dlFile)+" " + MessageHash["httpdownloader.7"]);
+                for(var i=2;i<6;i++){
+                    var file = oForm.down('[name="url'+i+'"]').getValue();
+                    if(file){
+                        bgManager.queueAction("external_download", new Hash({file:file, dir:crtDir}), MessageHash["httpdownloader.6"]+ " " +getBaseName(file)+" " + MessageHash["httpdownloader.7"]);
+                    }
+                }
+                bgManager.next();
+                hideLightBox(true);
+             });
+        ]]></dialogOnOpen>
+        <serverCallback methodName="switchAction"></serverCallback>
+    </processing>
+</uploader>
diff --git a/core/src/plugins/downloader.http/plugin_doc.html b/core/src/plugins/uploader.http/plugin_doc.html
similarity index 100%
rename from core/src/plugins/downloader.http/plugin_doc.html
rename to core/src/plugins/uploader.http/plugin_doc.html
diff --git a/core/src/plugins/downloader.http/resources/downloader.css b/core/src/plugins/uploader.http/resources/downloader.css
similarity index 95%
rename from core/src/plugins/downloader.http/resources/downloader.css
rename to core/src/plugins/uploader.http/resources/downloader.css
index 968826d987..db44fba2a5 100644
--- a/core/src/plugins/downloader.http/resources/downloader.css
+++ b/core/src/plugins/uploader.http/resources/downloader.css
@@ -1,14 +1,14 @@
-#dynamic_bookmarklet a{
-   display: block;
-background-image: url('images/16/bookmarklet.png');
-background-repeat: no-repeat;
-padding-left: 21px;
-border: 1px solid #CCC;
-width: 150px;
-margin: 5px;
-padding: 5px;
-padding-left: 26px;
-background-position: 4px;
-border-radius: 4px;
-float: left;
+#dynamic_bookmarklet a{
+   display: block;
+background-image: url('images/16/bookmarklet.png');
+background-repeat: no-repeat;
+padding-left: 21px;
+border: 1px solid #CCC;
+width: 150px;
+margin: 5px;
+padding: 5px;
+padding-left: 26px;
+background-position: 4px;
+border-radius: 4px;
+float: left;
 }
\ No newline at end of file
diff --git a/core/src/plugins/downloader.http/resources/i18n/ca.php b/core/src/plugins/uploader.http/resources/i18n/ca.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/ca.php
rename to core/src/plugins/uploader.http/resources/i18n/ca.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/cs.php b/core/src/plugins/uploader.http/resources/i18n/cs.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/cs.php
rename to core/src/plugins/uploader.http/resources/i18n/cs.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/de.php b/core/src/plugins/uploader.http/resources/i18n/de.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/de.php
rename to core/src/plugins/uploader.http/resources/i18n/de.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/en.php b/core/src/plugins/uploader.http/resources/i18n/en.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/en.php
rename to core/src/plugins/uploader.http/resources/i18n/en.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/es.php b/core/src/plugins/uploader.http/resources/i18n/es.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/es.php
rename to core/src/plugins/uploader.http/resources/i18n/es.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/et.php b/core/src/plugins/uploader.http/resources/i18n/et.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/et.php
rename to core/src/plugins/uploader.http/resources/i18n/et.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/fr.php b/core/src/plugins/uploader.http/resources/i18n/fr.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/fr.php
rename to core/src/plugins/uploader.http/resources/i18n/fr.php
diff --git a/core/src/plugins/downloader.http/resources/i18n/pt.php b/core/src/plugins/uploader.http/resources/i18n/pt.php
similarity index 100%
rename from core/src/plugins/downloader.http/resources/i18n/pt.php
rename to core/src/plugins/uploader.http/resources/i18n/pt.php
diff --git a/core/src/plugins/downloader.http/resources/images/16/add_bookmarklet.png b/core/src/plugins/uploader.http/resources/images/16/add_bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/add_bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/16/add_bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/16/bookmarklet.png b/core/src/plugins/uploader.http/resources/images/16/bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/16/bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/16/computer_upload.png b/core/src/plugins/uploader.http/resources/images/16/computer_upload.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/computer_upload.png
rename to core/src/plugins/uploader.http/resources/images/16/computer_upload.png
diff --git a/core/src/plugins/downloader.http/resources/images/16/external_download.png b/core/src/plugins/uploader.http/resources/images/16/external_download.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/external_download.png
rename to core/src/plugins/uploader.http/resources/images/16/external_download.png
diff --git a/core/src/plugins/downloader.http/resources/images/16/kget_list.png b/core/src/plugins/uploader.http/resources/images/16/kget_list.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/kget_list.png
rename to core/src/plugins/uploader.http/resources/images/16/kget_list.png
diff --git a/core/src/plugins/downloader.http/resources/images/16/make.png b/core/src/plugins/uploader.http/resources/images/16/make.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/16/make.png
rename to core/src/plugins/uploader.http/resources/images/16/make.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/add_bookmarklet.png b/core/src/plugins/uploader.http/resources/images/22/add_bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/add_bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/22/add_bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/bookmarklet.png b/core/src/plugins/uploader.http/resources/images/22/bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/22/bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/computer_upload.png b/core/src/plugins/uploader.http/resources/images/22/computer_upload.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/computer_upload.png
rename to core/src/plugins/uploader.http/resources/images/22/computer_upload.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/external_download.png b/core/src/plugins/uploader.http/resources/images/22/external_download.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/external_download.png
rename to core/src/plugins/uploader.http/resources/images/22/external_download.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/kget_list.png b/core/src/plugins/uploader.http/resources/images/22/kget_list.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/kget_list.png
rename to core/src/plugins/uploader.http/resources/images/22/kget_list.png
diff --git a/core/src/plugins/downloader.http/resources/images/22/make.png b/core/src/plugins/uploader.http/resources/images/22/make.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/22/make.png
rename to core/src/plugins/uploader.http/resources/images/22/make.png
diff --git a/core/src/plugins/downloader.http/resources/images/32/add_bookmarklet.png b/core/src/plugins/uploader.http/resources/images/32/add_bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/32/add_bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/32/add_bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/32/bookmarklet.png b/core/src/plugins/uploader.http/resources/images/32/bookmarklet.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/32/bookmarklet.png
rename to core/src/plugins/uploader.http/resources/images/32/bookmarklet.png
diff --git a/core/src/plugins/downloader.http/resources/images/32/kget_list.png b/core/src/plugins/uploader.http/resources/images/32/kget_list.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/32/kget_list.png
rename to core/src/plugins/uploader.http/resources/images/32/kget_list.png
diff --git a/core/src/plugins/downloader.http/resources/images/32/make.png b/core/src/plugins/uploader.http/resources/images/32/make.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/32/make.png
rename to core/src/plugins/uploader.http/resources/images/32/make.png
diff --git a/core/src/plugins/downloader.http/resources/images/64/kget_list.png b/core/src/plugins/uploader.http/resources/images/64/kget_list.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/64/kget_list.png
rename to core/src/plugins/uploader.http/resources/images/64/kget_list.png
diff --git a/core/src/plugins/downloader.http/resources/images/64/make.png b/core/src/plugins/uploader.http/resources/images/64/make.png
similarity index 100%
rename from core/src/plugins/downloader.http/resources/images/64/make.png
rename to core/src/plugins/uploader.http/resources/images/64/make.png