diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:37:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:37:55 +0200 |
| commit | 01cc38018a81ae5ab72566b255d77b6d08ae6206 (patch) | |
| tree | 00d7ef022357abdbfb6ed3fbfd25fa16ecabd3de /apps | |
| parent | 24011d8597f23244583aa6e7e9e280fc7633f008 (diff) | |
| parent | ecb10db0391c98ffe7c4c0abfaeda93d066cfc02 (diff) | |
| download | nextcloud-server-01cc38018a81ae5ab72566b255d77b6d08ae6206.tar.gz nextcloud-server-01cc38018a81ae5ab72566b255d77b6d08ae6206.zip | |
Merge pull request #19733 from owncloud/remove-controls-whennotneeded
Remove controls for file lists that don't need it
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.css | 6 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 6 | ||||
| -rw-r--r-- | apps/files/templates/simplelist.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/templates/list.php | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index d0a2cce1a86..4afd7193d5e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -35,13 +35,15 @@ } /* FILE TABLE */ - #filestable { position: relative; - top: 44px; width: 100%; } +#filestable.has-controls { + top: 44px; +} + /* make sure there's enough room for the file actions */ #body-user #filestable { min-width: 688px; /* 768 (mobile break) - 80 (nav width) */ diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 6cf82391baf..246c5bd6290 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -226,7 +226,11 @@ } this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions); - this.$el.find('#controls').prepend(this.breadcrumb.$el); + var $controls = this.$el.find('#controls'); + if ($controls.length > 0) { + $controls.prepend(this.breadcrumb.$el); + this.$table.addClass('has-controls'); + } this._renderNewButton(); diff --git a/apps/files/templates/simplelist.php b/apps/files/templates/simplelist.php index 6b6c018024f..ca26d9b5d5b 100644 --- a/apps/files/templates/simplelist.php +++ b/apps/files/templates/simplelist.php @@ -1,6 +1,3 @@ -<div id="controls"> - <div id="file_action_panel"></div> -</div> <div id='notification'></div> <div id="emptycontent" class="hidden"> diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php index 55ad55a0a4f..fa0365c749c 100644 --- a/apps/files_sharing/templates/list.php +++ b/apps/files_sharing/templates/list.php @@ -1,7 +1,4 @@ <?php /** @var $l OC_L10N */ ?> -<div id="controls"> - <div id="file_action_panel"></div> -</div> <div id='notification'></div> <div id="emptycontent" class="hidden"></div> |