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

Commit

Permalink
Re-enable Folders upload for Chrome / Mac (utf8 issues are now fixed)…
Browse files Browse the repository at this point in the history 
…. Rework UI when folders upload is enabled.
  • Loading branch information
@cdujeu
cdujeu committed Mar 22, 2016
1 parent 44393b0 commit 29bc936
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 45 deletions.
57 changes: 45 additions & 12 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
View file
Expand Up @@ -75,16 +75,20 @@ div#upload_files_list, div#multiple_download_container
}

div#uploader_options_pane {
position: absolute;
right: 10px;
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.16), 0 1px 6px rgba(0, 0, 0, 0.23);
background-color: white;
font-size: 11px;
height: 59px;
overflow: hidden;
padding: 0 10px 7px;
padding: 12px 20px 20px;
text-align: right;
display: none;
margin-bottom: 11px;
margin-top: -2px;
margin-right: 2px;
border-right: 2px solid @uploaders_react_like_tab_tint;
z-index: 2;
}
div#total_files_list{
display:none !important;
Expand Down Expand Up @@ -122,7 +126,7 @@ div#upload_files_list{
}

span.item_relative_path{
color: #ccc;
color: #5f5f5f;
margin-left: 15px;
font-size: 0.8em;
}
Expand Down Expand Up @@ -151,7 +155,21 @@ div#upload_files_list{
display:none;
}

span.icon-remove-sign {
span.icon-folder-close{
margin-right: 2px;
}

span.icon-file-alt{
display: inline-block;
margin:0 6px 0 2px;
}

span.item-indent{
display: inline-block;
margin-right:3px;
}

span.icon-remove-sign, span.icon-ok {
color: rgba(0,0,0,0.53);
display: block;
position: absolute;
Expand All @@ -178,18 +196,27 @@ div#multiple_download_container div{
}

#fileInputContainer {
@upload_button_width:270px;
@upload_button_width:250px;
@upload_button_outer_height:30px;

position: relative;
#fileInputContainerDiv { /* to fit 1px border */
margin: 0;
padding: 0;
position: relative;
display: inline-block;
overflow: hidden;
vertical-align: top;
height: 47px;
width: @upload_button_width + 22px;
cursor: pointer;
&.folder_upload_button{
.fakeUploadButton{
background-color: #fefefe;
width: 130px;
color: rgba(0,0,0,0.76);
}
}
}
input {
opacity: 0;
Expand All @@ -199,14 +226,15 @@ div#multiple_download_container div{
top: 0;
left: 0;
z-index: 10000;
height: 56px;
height: @upload_button_outer_height;
cursor: pointer !important;
filter:alpha(opacity=0);
width: @upload_button_width;
}
#fileInputPos {
text-align: left;
height: 60px;
width: 180px;
height: @upload_button_outer_height;
width: @upload_button_width;
position: absolute;
top: 0;
overflow: hidden;
Expand All @@ -222,10 +250,10 @@ div#multiple_download_container div{
vertical-align: middle;
font-size: 14px;
cursor: pointer;
font-weight: normal;
font-weight: 500;
background-color: lighten(@applicationPrimaryColor, 60);
color:@applicationPrimaryColor;
box-shadow: @reactBoxShadowDepthHalf;
color:darken(@applicationPrimaryColor, 6);
box-shadow: @reactBoxShadowDepthMini;
position: absolute;
text-transform: uppercase;
white-space: nowrap;
Expand All @@ -234,12 +262,16 @@ div#multiple_download_container div{
top: 0;
left: 0;
margin:0;
span.icon-desktop {
span.icon-desktop, span.icon-folder-open-alt{
font-size: 20px;
display: block;
float: left;
padding: 2px 10px 0 6px;
}
span.icon-folder-open-alt{
font-size: 18px;
padding: 3px 10px 0 6px;
}

.disabled{
-moz-opacity: 0.5;
Expand All @@ -261,6 +293,7 @@ div#multiple_download_container div{
bottom: 6px;
right: 8px;
color: rgb(203, 204, 206);
font-size: 12px;
}

#uploaderTextActions span{
Expand Down
55 changes: 42 additions & 13 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
View file
Expand Up @@ -1843,16 +1843,20 @@ div#multiple_download_container {
border-bottom: 3px solid #ff5722;
}
div#uploader_options_pane {
position: absolute;
right: 10px;
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.16), 0 1px 6px rgba(0, 0, 0, 0.23);
background-color: white;
font-size: 11px;
height: 59px;
overflow: hidden;
padding: 0 10px 7px;
padding: 12px 20px 20px;
text-align: right;
display: none;
margin-bottom: 11px;
margin-top: -2px;
margin-right: 2px;
border-right: 2px solid #ff5722;
z-index: 2;
}
div#total_files_list {
display: none !important;
Expand Down Expand Up @@ -1898,7 +1902,7 @@ div#upload_files_list div rect {
fill: #ffffff;
}
div#upload_files_list span.item_relative_path {
color: #ccc;
color: #5f5f5f;
margin-left: 15px;
font-size: 0.8em;
}
Expand All @@ -1923,7 +1927,19 @@ div#upload_files_list span.statusText.new,
div#upload_files_list #upload_files_list span.statusText.loaded {
display: none;
}
div#upload_files_list span.icon-remove-sign {
div#upload_files_list span.icon-folder-close {
margin-right: 2px;
}
div#upload_files_list span.icon-file-alt {
display: inline-block;
margin: 0 6px 0 2px;
}
div#upload_files_list span.item-indent {
display: inline-block;
margin-right: 3px;
}
div#upload_files_list span.icon-remove-sign,
div#upload_files_list span.icon-ok {
color: rgba(0, 0, 0, 0.53);
display: block;
position: absolute;
Expand Down Expand Up @@ -1967,12 +1983,18 @@ div#multiple_download_container div div a:hover {
margin: 0;
padding: 0;
position: relative;
display: inline-block;
overflow: hidden;
vertical-align: top;
height: 47px;
width: 292px;
width: 272px;
cursor: pointer;
}
#fileInputContainer #fileInputContainerDiv.folder_upload_button .fakeUploadButton {
background-color: #fefefe;
width: 130px;
color: rgba(0, 0, 0, 0.76);
}
#fileInputContainer input {
opacity: 0;
-moz-opacity: 0;
Expand All @@ -1982,14 +2004,15 @@ div#multiple_download_container div div a:hover {
top: 0;
left: 0;
z-index: 10000;
height: 56px;
height: 30px;
cursor: pointer !important;
filter: alpha(opacity=0);
width: 250px;
}
#fileInputContainer #fileInputPos {
text-align: left;
height: 60px;
width: 180px;
height: 30px;
width: 250px;
position: absolute;
top: 0;
overflow: hidden;
Expand All @@ -1998,16 +2021,16 @@ div#multiple_download_container div div a:hover {
cursor: pointer;
}
#fileInputContainer .fakeUploadButton {
width: 270px;
width: 250px;
padding: 6px;
text-align: left;
vertical-align: middle;
font-size: 14px;
cursor: pointer;
font-weight: normal;
font-weight: 500;
background-color: #c9fffa;
color: #009688;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16), 0 2px 3px rgba(0, 0, 0, 0.43);
color: #00776c;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.33);
position: absolute;
text-transform: uppercase;
white-space: nowrap;
Expand All @@ -2017,12 +2040,17 @@ div#multiple_download_container div div a:hover {
left: 0;
margin: 0;
}
#fileInputContainer .fakeUploadButton span.icon-desktop {
#fileInputContainer .fakeUploadButton span.icon-desktop,
#fileInputContainer .fakeUploadButton span.icon-folder-open-alt {
font-size: 20px;
display: block;
float: left;
padding: 2px 10px 0 6px;
}
#fileInputContainer .fakeUploadButton span.icon-folder-open-alt {
font-size: 18px;
padding: 3px 10px 0 6px;
}
#fileInputContainer .fakeUploadButton .disabled {
-moz-opacity: 0.5;
opacity: 0.5;
Expand All @@ -2037,6 +2065,7 @@ div#multiple_download_container div div a:hover {
bottom: 6px;
right: 8px;
color: #cbccce;
font-size: 12px;
}
#uploaderTextActions span {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/uploader.html/class.SimpleUploadProcessor.php
View file
Expand Up @@ -93,7 +93,7 @@ public function postProcess($action, $httpVars, $postProcessData)
$s = '<tree>';
$s .= AJXP_XMLWriter::writeNodesDiff(array((isSet($result["UPDATED_NODE"])?"UPDATE":"ADD")=> array($result[(isSet($result["UPDATED_NODE"])?"UPDATED":"CREATED")."_NODE"])), false);
$s.= '</tree>';
print("\n var resultString = '".$s."'; var resultXML = parent.parseXml(resultString);");
print("\n var resultString = '".str_replace("'", "\'", $s)."'; var resultXML = parent.parseXml(resultString);");
print("\n parent.PydioApi.getClient().parseXmlMessage(resultXML);");
}
}
Expand Down

0 comments on commit 29bc936

Please sign in to comment.