Permalink
Browse files

Fix multi-downloader style

  • Loading branch information...
1 parent fadb959 commit fef670fad29a65550244a94fd61acbd68b94a822 @cdujeu cdujeu committed Sep 22, 2016
@@ -47,6 +47,7 @@
use Pydio\Core\Controller\Controller;
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\SessionService;
use Pydio\Core\Utils\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\PathUtils;
@@ -716,8 +717,7 @@ public function downloadAction(ServerRequestInterface &$request, ResponseInterfa
"total_size" => $totalSize,
"file_id" => $sessionKey
];
-
- $_SESSION[$sessionKey] = array_merge($chunkData, ["file"=>$realFile]);
+ SessionService::save($sessionKey, array_merge($chunkData, ["file" => $realFile]));
$response = $response->withHeader("Content-type", "application/json; charset=UTF-8");
$response->getBody()->write(json_encode($chunkData));
@@ -729,7 +729,7 @@ public function downloadAction(ServerRequestInterface &$request, ResponseInterfa
$chunkIndex = intval($httpVars["chunk_index"]);
$chunkKey = $httpVars["file_id"];
- $sessData = $_SESSION[$chunkKey];
+ $sessData = SessionService::fetch($chunkKey);
$realFile = $sessData["file"];
$chunkSize = $sessData["chunk_size"];
$offset = $chunkSize * $chunkIndex;
@@ -928,7 +928,7 @@
dObject.insert({before:'\
<div id="chunk_dl_form" style="height:36px;"> \
<span style="display:inline-block;float:left;margin-top: 11px;margin-left: 4px;margin-right: 4px;">'+MessageHash[400]+'</span> <input type="text" style="float:left;margin-top:5px; text-align:right; width:30px;height:24px;" name="chunk_count" id="chunk_count" value="4"> \
- <input type="image" style="float:left;" id="dl_form_submit" src="AJXP_THEME_FOLDER/images/actions/22/dialog_ok_apply.png" height="22" width="22" title="OK" class="dialogButton dialogFocus">\
+ <a id="dl_form_submit" class="dialogButton dialogFocus">OK</a>\
</div> \
'});
$("dl_form_submit").observe("click", function(e){
@@ -58,7 +58,7 @@
var new_row_button = new Element('a');
new_row_button.href= this.downloadUrl + fileName;
var display = he.escape(label?label:getBaseName(fileName));
- new_row_button.insert('<img src="'+ajxpResourcesFolder+'/images/actions/16/download_manager.png" height="16" width="16" align="absmiddle" border="0"> '+ display);
+ new_row_button.insert('<span class="mdi mdi-download"></span> '+ display);
new_row_button.multidownloader = this;
@@ -24,6 +24,36 @@ div#upload_files_list, div#multiple_download_container
border-radius: 1px;
}
+div#multi_download_form{
+ a#dl_form_submit{
+ border-radius: 2px;
+ display: inline-block;
+ margin-top: 4px;
+ margin-left: 5px;
+ padding: 5px 12px;
+ cursor: pointer;
+ font-weight: 500;
+ font-size: 15px;
+ color: #009688;
+ text-transform: uppercase;
+ &:hover{
+ background-color: #bffff9;
+ }
+ }
+}
+
+div#multiple_download_container{
+ width: 100%;
+ a{
+ font-size: 16px;
+ span.mdi-download{
+ font-size: 14px;
+ display: inline-block;
+ margin-right: 5px;
+ }
+ }
+}
+
.droparea {
background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
}
@@ -2030,6 +2030,32 @@ div#multiple_download_container {
text-align: left;
border-radius: 1px;
}
+div#multi_download_form a#dl_form_submit {
+ border-radius: 2px;
+ display: inline-block;
+ margin-top: 4px;
+ margin-left: 5px;
+ padding: 5px 12px;
+ cursor: pointer;
+ font-weight: 500;
+ font-size: 15px;
+ color: #009688;
+ text-transform: uppercase;
+}
+div#multi_download_form a#dl_form_submit:hover {
+ background-color: #bffff9;
+}
+div#multiple_download_container {
+ width: 100%;
+}
+div#multiple_download_container a {
+ font-size: 16px;
+}
+div#multiple_download_container a span.mdi-download {
+ font-size: 14px;
+ display: inline-block;
+ margin-right: 5px;
+}
.droparea {
background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
}

0 comments on commit fef670f

Please sign in to comment.