summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-07-30 12:14:09 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-07-30 12:14:09 +0200
commit48fb1e2dae3d6c91b5c9bded455b38eb7c4c4df0 (patch)
tree28dbd7988a49e685463b506ca3f992c0c97dfe67 /files
parentf9ddbc4925fe250ce678182375b26f018f2c525e (diff)
downloadnextcloud-server-48fb1e2dae3d6c91b5c9bded455b38eb7c4c4df0.tar.gz
nextcloud-server-48fb1e2dae3d6c91b5c9bded455b38eb7c4c4df0.zip
hide empty folder notification when a folder or file got uploaded
Diffstat (limited to 'files')
-rw-r--r--files/js/files.js4
-rw-r--r--files/templates/part.list.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/files/js/files.js b/files/js/files.js
index be7e48aeeeb..d3f91fe9a2f 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -69,6 +69,7 @@ $(document).ready(function() {
$('#file_newfolder_name').blur();
});}
});
+ $('#emptyfolder').remove();
});
$('#file_newfolder_name').click(function(){
@@ -181,6 +182,7 @@ $(document).ready(function() {
clone.insertBefore(form);
form.hide();
}
+ $('#emptyfolder').remove();
});
//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
@@ -433,4 +435,4 @@ function getMimeIcon(mime){
mime='file';
}
return OC.imagePath('core','mimetypes/'+mime+'.png');
-} \ No newline at end of file
+}
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 3713d483b00..40586664328 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,4 +1,4 @@
- <?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!</span><style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style>';
+ <?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!<style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style></span>';
foreach($_['files'] as $file):
$simple_file_size = simple_file_size($file['size']);
$simple_size_color = 200-intval($file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey