Updated and optimized Mobile Layout as well.

4 files changed, 19 insertions, 4 deletions

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 780b7ac8443..3c77bba3a88 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -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;
 }
+
+}
\ No newline at end of file
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index 71b8b580462..b6e158bf363 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -93,6 +93,12 @@
     position: relative;
     top: 7px;
 }
+#uploadprogressbar .desktop {
+	display: block;
+}
+#uploadprogressbar .mobile {
+	display: none;
+}
 
 #uploadprogressbar + stop {
 	font-size: 13px;
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 4dc7d0be30f..d3ee64bb50d 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -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);
 				});
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index af616d71c19..a70dee1a8df 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -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="" />