wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated and optimized Mobile Layout as well.

Browse source
This commit is contained in:
luckydonald 2014-08-11 02:37:01 +02:00
parent 19efa259e9
commit 7fc574cc53
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/files/css/mobile.css
View file

@ -79,7 +79,15 @@ table td.filename .nametext .innernametext {
}
/* shorten elements for mobile */
#uploadprogressbar {
#uploadprogressbar, #uploadprogressbar .label.inner {
width: 50px;
}
/* hide desktop-only parts */
#uploadprogressbar .desktop {
display: none !important;
}
#uploadprogressbar .mobile {
display: block !important;
}
}

6
apps/files/css/upload.css
View file

@ -93,6 +93,12 @@
position: relative;
top: 7px;
}
#uploadprogressbar .desktop {
display: block;
}
#uploadprogressbar .mobile {
display: none;
}
#uploadprogressbar + stop {
font-size: 13px;

5
apps/files/js/file-upload.js
View file

@ -458,7 +458,7 @@ OC.Upload = {
$('#uploadprogresswrapper .speed').show();
$('#uploadprogresswrapper .label').show();
$('#uploadprogressbar').progressbar({value: 0});
$('#uploadprogressbar .ui-progressbar-value').html('<em class="label inner">' + t('files', 'Uploading...') + '</em>');
$('#uploadprogressbar .ui-progressbar-value').html('<em class="label inner"><span class="desktop">' + t('files', 'Uploading...') + '</span><span class="mobile">' + t('files', '...') + '</span></em>');
OC.Upload._showProgressBar();
});
fileupload.on('fileuploadprogress', function(e, data) {
@ -468,7 +468,8 @@ OC.Upload = {
fileupload.on('fileuploadprogressall', function(e, data) {
OC.Upload.log('progress handle fileuploadprogressall', e, data);
var progress = (data.loaded / data.total) * 100;
$('#uploadprogressbar .label').text(t('files', '{loadedSize} of {totalSize}', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total)}));
$('#uploadprogressbar .label .mobile').text(t('files', '{loadedSize}', {loadedSize: humanFileSize(data.loaded)}));
$('#uploadprogressbar .label .desktop').text(t('files', '{loadedSize} of {totalSize}', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total)}));
$('#uploadprogresswrapper .speed').text(t('files', '{bitrate}/s', {bitrate: humanFileSize(data.bitrate)}));
$('#uploadprogressbar').progressbar('value', progress);
});

2
apps/files/templates/list.php
View file

@ -38,7 +38,7 @@
</div>
<div id="uploadprogresswrapper">
<div id="uploadprogressbar">
<em class="label outer" style="display:none"><?php p($l->t('Uploading...'));?></em>
<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
</div>
<div style="display:none" class="speed"></div>
<input type="button" class="stop icon-close" style="display:none" value="" />