summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorBernhard Posselt <Raydiation@users.noreply.github.com>2013-09-01 17:47:55 -0700
committerBernhard Posselt <Raydiation@users.noreply.github.com>2013-09-01 17:47:55 -0700
commitf038cb9aea7c9a1513ab14d0df002773b17d5333 (patch)
tree4f9f42c4e887548f237cae606dc6b78d4ba02bfd /apps/files
parente68b5f8b0da93bf1e039bc700aec8c816cc9afa9 (diff)
parentb10a646bc8d7deec8d95206c33de1be76a870dda (diff)
downloadnextcloud-server-f038cb9aea7c9a1513ab14d0df002773b17d5333.tar.gz
nextcloud-server-f038cb9aea7c9a1513ab14d0df002773b17d5333.zip
Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/css/files.css6
-rw-r--r--apps/files/js/filelist.js4
-rw-r--r--apps/files/templates/index.php2
3 files changed, 3 insertions, 9 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 498e34d70d4..02a73ba83e5 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -68,12 +68,6 @@
/* FILE TABLE */
-#emptyfolder {
- position:absolute;
- margin:10em 0 0 10em;
- font-size:1.5em; font-weight:bold;
- color:#888; text-shadow:#fff 0 1px 0;
-}
#filestable { position: relative; top:37px; width:100%; }
tbody tr { background-color:#fff; height:2.5em; }
tbody tr:hover, tbody tr:active {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 05e31094502..29be5e0d362 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -147,7 +147,7 @@ var FileList={
$('tr').filterAttr('data-file',name).remove();
FileList.updateFileSummary();
if($('tr[data-file]').length==0){
- $('#emptyfolder').show();
+ $('#emptycontent').show();
}
},
insertElement:function(name,type,element){
@@ -177,7 +177,7 @@ var FileList={
}else{
$('#fileList').append(element);
}
- $('#emptyfolder').hide();
+ $('#emptycontent').hide();
FileList.updateFileSummary();
},
loadingDone:function(name, id){
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 2f7e0af4f28..24cb8c2fe58 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -56,7 +56,7 @@
</div>
<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
- <div id="emptyfolder"><?php p($l->t('Nothing in here. Upload something!'))?></div>
+ <div id="emptycontent"><?php p($l->t('Nothing in here. Upload something!'))?></div>
<?php endif; ?>
<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">