Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Upload action now ask for the uploader type. Downloader.http moved as…
Browse files Browse the repository at this point in the history 
… an uploader. Add some color in orbit theme.
  • Loading branch information
@cdujeu
cdujeu committed Jul 1, 2014
1 parent f2e6ce3 commit 84cb12a
Show file tree
Hide file tree
Showing 36 changed files with 438 additions and 356 deletions.
30 changes: 28 additions & 2 deletions core/src/plugins/access.fs/fsActions.xml
View file
Expand Up @@ -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();
Expand All @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/manifest.xml
View file
Expand Up @@ -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>
Expand Down
63 changes: 54 additions & 9 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
View file
Expand Up @@ -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
Expand Down Expand Up @@ -450,7 +450,7 @@ div.shadow_class
.dialogContent select:focus
{
background: white;
border: 1px solid #5599ff;
border: 1px solid #77b8e2;
}

.dialogContent input:disabled,
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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{
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -2587,7 +2632,7 @@ span.toggleHeader{
}

span.toggleHeader.toggleInactive{
background-color: #f7f7f7;
background-color: #e5e5e5;
cursor: pointer;
border: 1px solid #f7f7f7;
}
Expand Down Expand Up @@ -3177,7 +3222,7 @@ td.infoPanelLabel {

.panelContent div.panelHeader{

color: #555;
color: #77b8e2;
font-weight: bold;
font-size: 12px;
padding: 6px 7px;
Expand Down
34 changes: 18 additions & 16 deletions core/src/plugins/uploader.html/manifest.xml
View file
Expand Up @@ -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>
Expand Down

0 comments on commit 84cb12a

Please sign in to comment.