diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-18 01:10:13 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-18 01:10:13 +0100 |
commit | a581dcaadb90c6200baf42177fd14f2560fda533 (patch) | |
tree | 2d54b41c0e6a8806dd158c241cce2bc856ffcbb9 /apps | |
parent | 232d4385f4909a8877d96186fbd13d5e161cccf3 (diff) | |
parent | 0bda42b8e3a8e738c4fa1b7357ad8722fba68c14 (diff) | |
download | nextcloud-server-a581dcaadb90c6200baf42177fd14f2560fda533.tar.gz nextcloud-server-a581dcaadb90c6200baf42177fd14f2560fda533.zip |
Merge pull request #12924 from owncloud/improve-emptystates
Improve empty states
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/css/files.css | 6 | ||||
-rw-r--r-- | apps/files/templates/list.php | 6 | ||||
-rw-r--r-- | apps/files/templates/simplelist.php | 3 | ||||
-rw-r--r-- | apps/files_external/templates/list.php | 6 | ||||
-rw-r--r-- | apps/files_sharing/js/app.js | 12 | ||||
-rw-r--r-- | apps/files_trashbin/templates/index.php | 6 |
6 files changed, 26 insertions, 13 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index eb6fec4a97f..3829759a14e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -556,12 +556,6 @@ table tr.summary td { #scanning-message{ top:40%; left:40%; position:absolute; display:none; } -#emptycontent .icon-starred { - height: 30px; - width: 30px; - margin: 0 auto 10px; -} - table.dragshadow { width:auto; } diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index a0138967cd2..764b296819e 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -49,7 +49,11 @@ <input type="hidden" name="permissions" value="" id="permissions"> </div> -<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Upload something!'))?></div> +<div id="emptycontent" class="hidden"> + <div class="icon-folder"></div> + <h2><?php p($l->t('No files yet')); ?></h2> + <p><?php p($l->t('Upload some content or sync with your devices!')); ?></p> +</div> <table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36"> <thead> diff --git a/apps/files/templates/simplelist.php b/apps/files/templates/simplelist.php index 15949bf704e..d806a220ac0 100644 --- a/apps/files/templates/simplelist.php +++ b/apps/files/templates/simplelist.php @@ -5,7 +5,8 @@ <div id="emptycontent" class="hidden"> <div class="icon-starred"></div> - <?php p($l->t('Files and folders you mark as favorites will show up here')); ?> + <h2><?php p($l->t('No favorites')); ?></h2> + <p><?php p($l->t('Files and folders you mark as favorite will show up here')); ?></p> </div> <input type="hidden" name="dir" value="" id="dir"> diff --git a/apps/files_external/templates/list.php b/apps/files_external/templates/list.php index 4e06bc7024c..09923fe3879 100644 --- a/apps/files_external/templates/list.php +++ b/apps/files_external/templates/list.php @@ -4,7 +4,11 @@ </div> <div id='notification'></div> -<div id="emptycontent" class="hidden"><?php p($l->t( 'You don\'t have any external storages' )); ?></div> +<div id="emptycontent" class="hidden"> + <div class="icon-external"></div> + <h2><?php p($l->t('No external storages')); ?></h2> + <p><?php p($l->t('You can configure external storages in the personal settings')); ?></p> +</div> <input type="hidden" name="dir" value="" id="dir"> diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js index ff6997ab12f..3168e930829 100644 --- a/apps/files_sharing/js/app.js +++ b/apps/files_sharing/js/app.js @@ -39,7 +39,9 @@ OCA.Sharing.App = { this._extendFileList(this._inFileList); this._inFileList.appName = t('files_sharing', 'Shared with you'); - this._inFileList.$el.find('#emptycontent').text(t('files_sharing', 'No files have been shared with you yet.')); + this._inFileList.$el.find('#emptycontent').html('<div class="icon-share"></div>' + + '<h2>' + t('files_sharing', 'Nothing shared with you yet') + '</h2>' + + '<p>' + t('files_sharing', 'Files and folders others share with you will show up here') + '</p>'); return this._inFileList; }, @@ -59,7 +61,9 @@ OCA.Sharing.App = { this._extendFileList(this._outFileList); this._outFileList.appName = t('files_sharing', 'Shared with others'); - this._outFileList.$el.find('#emptycontent').text(t('files_sharing', 'You haven\'t shared any files yet.')); + this._outFileList.$el.find('#emptycontent').html('<div class="icon-share"></div>' + + '<h2>' + t('files_sharing', 'Nothing shared yet') + '</h2>' + + '<p>' + t('files_sharing', 'Files and folders you share will show up here') + '</p>'); return this._outFileList; }, @@ -79,7 +83,9 @@ OCA.Sharing.App = { this._extendFileList(this._linkFileList); this._linkFileList.appName = t('files_sharing', 'Shared by link'); - this._linkFileList.$el.find('#emptycontent').text(t('files_sharing', 'You haven\'t shared any files by link yet.')); + this._linkFileList.$el.find('#emptycontent').html('<div class="icon-public"></div>' + + '<h2>' + t('files_sharing', 'No shared links') + '</h2>' + + '<p>' + t('files_sharing', 'Files and folders you share by link will show up here') + '</p>'); return this._linkFileList; }, diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index fc18e88c41e..82bc360a9f5 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -4,7 +4,11 @@ </div> <div id='notification'></div> -<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div> +<div id="emptycontent" class="hidden"> + <div class="icon-delete"></div> + <h2><?php p($l->t('No deleted files')); ?></h2> + <p><?php p($l->t('You will be able to recover deleted files from here')); ?></p> +</div> <input type="hidden" name="dir" value="" id="dir"> |