From f1da30cc1e39318261fff39ed05b3a571e0a5699 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 8 Jun 2017 16:42:43 +0200 Subject: [PATCH 01/11] Add quota to the files view Signed-off-by: Joas Schilling --- apps/files/css/files.scss | 13 +++++++++++++ apps/files/js/app.js | 4 ++++ apps/files/lib/Controller/ViewController.php | 11 +++++++++++ apps/files/templates/appnavigation.php | 13 +++++++++++++ 4 files changed, 41 insertions(+) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 579cf36e15..9fcc10caf4 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -747,3 +747,16 @@ table.dragshadow td.size { #filestable tbody tr.canDrop { background-color: rgba(255, 255, 140, 1); } + + +#quota { + margin: 0 !important; + border: none; + div { + border-radius: 0; + } +} + +#quotatext { + padding: 3px; +} diff --git a/apps/files/js/app.js b/apps/files/js/app.js index d46a0b8f9d..5f1bf1a7b1 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -108,6 +108,10 @@ // trigger URL change event handlers this._onPopState(urlParams); + $('#quota.has-tooltip').tooltip({ + placement: 'bottom' + }); + this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200); }, diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index f7a4318e59..fc59622af8 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -174,6 +174,17 @@ class ViewController extends Controller { }); $nav->assign('navigationItems', $navItems); + + $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used'])); + if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) { + $totalSpace = $this->l10n->t('Unlimited'); + } else { + $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']); + } + $nav->assign('total_space', $totalSpace); + $nav->assign('quota', $storageInfo['quota']); + $nav->assign('usage_relative', $storageInfo['relative']); + $contentItems = []; // render the container content for every navigation item diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 9c79f80671..28019ba803 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -1,4 +1,17 @@
+
+
80): ?>class="quota-warning"> +

t('%s of %s in use', [$_['usage'], $_['total_space']])); ?>

+
+
+
  • From fe8450fcc9311a3c551c5d9791af42fec667af29 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 9 Jun 2017 15:41:06 +0200 Subject: [PATCH 02/11] Style quota entry in files view Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/files.scss | 22 +++++++++++++++---- apps/files/img/quota.svg | 4 ++++ apps/files/templates/appnavigation.php | 29 ++++++++++++++------------ 3 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 apps/files/img/quota.svg diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 9fcc10caf4..7a9381662f 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -108,6 +108,9 @@ .nav-icon-trashbin { background-image: url('../img/delete.svg?v=1'); } +.nav-icon-quota { + background-image: url('../img/quota.svg?v=1'); +} #app-navigation .nav-files a.nav-icon-files { width: auto; @@ -752,11 +755,22 @@ table.dragshadow td.size { #quota { margin: 0 !important; border: none; - div { - border-radius: 0; + background-color: transparent; + + .quota-container { + height: 5px; + border-radius: 3px; + + div { + height: 100%; + background-color: $color-primary; + } } } -#quotatext { - padding: 3px; +#quotatext, +#quotatext-additional { + padding: 0; + height: 30px; + line-height: 30px; } diff --git a/apps/files/img/quota.svg b/apps/files/img/quota.svg new file mode 100644 index 0000000000..8ed264e850 --- /dev/null +++ b/apps/files/img/quota.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 28019ba803..49bfaab3e1 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -1,18 +1,21 @@
    -
    -
    80): ?>class="quota-warning"> -

    t('%s of %s in use', [$_['usage'], $_['total_space']])); ?>

    -
    -
    -
      +
    • + +

      t('%s of %s used', [$_['usage'], $_['total_space']])); ?>

      +
      +
      80): ?>class="quota-warning"> +
      +
      +

      t('Do you need more space?')); ?>

      +       +
    • Date: Fri, 9 Jun 2017 17:24:10 +0200 Subject: [PATCH 03/11] Remove useless translation and make it better on unlimited Signed-off-by: Joas Schilling --- apps/files/templates/appnavigation.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 49bfaab3e1..0d08ac53c5 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -2,12 +2,15 @@
      • + ?>has-tooltip" title=""> -

        t('%s of %s used', [$_['usage'], $_['total_space']])); ?>

        +

        t('%s of %s used', [$_['usage'], $_['total_space']])); + } else { + p($l->t('%s used', [$_['usage']])); + } ?>

        80): ?>class="quota-warning"> From b1ddc57e08063f477a13685bd1254f205b722633 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 9 Jun 2017 18:05:10 +0200 Subject: [PATCH 04/11] Content will come from the external app Signed-off-by: Joas Schilling --- apps/files/templates/appnavigation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 0d08ac53c5..bbd78079d3 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -16,7 +16,6 @@ 80): ?>class="quota-warning">
        -

        t('Do you need more space?')); ?>
        • From 901eca84b026a9f13c2011992679c801534f8bad Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 9 Jun 2017 18:05:23 +0200 Subject: [PATCH 05/11] Only set the active item when there is one (not the case for quota) Signed-off-by: Joas Schilling --- apps/files/js/navigation.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js index 83cd556c89..d213d0467b 100644 --- a/apps/files/js/navigation.js +++ b/apps/files/js/navigation.js @@ -123,7 +123,9 @@ _onClickItem: function(ev) { var $target = $(ev.target); var itemId = $target.closest('li').attr('data-id'); - this.setActiveItem(itemId); + if (!_.isUndefined(itemId)) { + this.setActiveItem(itemId); + } ev.preventDefault(); } }; From c691b6d299493ff653e2f9e35feee6eaaa5d2a3e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Jun 2017 09:57:34 +0200 Subject: [PATCH 06/11] Add an event so apps can add hidden fields to the files page Signed-off-by: Joas Schilling --- apps/files/lib/Controller/ViewController.php | 5 ++++- apps/files/templates/index.php | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index fc59622af8..bfeb2cafcf 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -41,6 +41,7 @@ use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use OCP\Files\Folder; use OCP\App\IAppManager; +use Symfony\Component\EventDispatcher\GenericEvent; /** * Class ViewController @@ -199,7 +200,8 @@ class ViewController extends Controller { $contentItems[] = $contentItem; } - $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts'); + $event = new GenericEvent(null, ['hiddenFields' => []]); + $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts', $event); $params = []; $params['usedSpacePercent'] = (int)$storageInfo['relative']; @@ -215,6 +217,7 @@ class ViewController extends Controller { $params['fileNotFound'] = $fileNotFound ? 1 : 0; $params['appNavigation'] = $nav; $params['appContents'] = $contentItems; + $params['hiddenFields'] = $event->getArgument('hiddenFields'); $response = new TemplateResponse( $this->appName, diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 1670ccfd13..b49684643b 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -21,3 +21,7 @@ $value) {?> + + Date: Mon, 12 Jun 2017 10:25:09 +0200 Subject: [PATCH 07/11] Remove the colored corners Signed-off-by: Joas Schilling --- apps/files/css/files.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 7a9381662f..0263d79e79 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -755,6 +755,7 @@ table.dragshadow td.size { #quota { margin: 0 !important; border: none; + border-radius: 0; background-color: transparent; .quota-container { From 3ca3edd994e5c7b35ae7bb1fc2c3a0fb47b5a9cd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Jun 2017 10:32:25 +0200 Subject: [PATCH 08/11] Adjust the unit test Signed-off-by: Joas Schilling --- apps/files/tests/Controller/ViewControllerTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 2e497405a4..db86e0037e 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -107,6 +107,9 @@ class ViewControllerTest extends TestCase { ->expects($this->once()) ->method('getStorageInfo') ->will($this->returnValue([ + 'used' => 123, + 'quota' => 100, + 'total' => 100, 'relative' => 123, 'owner' => 'MyName', 'ownerDisplayName' => 'MyDisplayName', @@ -125,6 +128,10 @@ class ViewControllerTest extends TestCase { ->will($this->returnArgument(2)); $nav = new Template('files', 'appnavigation'); + $nav->assign('usage_relative', 123); + $nav->assign('usage', '123 B'); + $nav->assign('quota', 100); + $nav->assign('total_space', '100 B'); $nav->assign('navigationItems', [ [ 'id' => 'files', @@ -256,6 +263,7 @@ class ViewControllerTest extends TestCase { 'content' => null, ], ], + 'hiddenFields' => [], ] ); $policy = new Http\ContentSecurityPolicy(); From ef184c0b213524119683e2687f7484ac98f22948 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 12 Jun 2017 17:03:54 -0500 Subject: [PATCH 09/11] Put the quota bar to the bottom Signed-off-by: Morris Jobke --- apps/files/css/files.scss | 12 +++++++++++- apps/files/js/app.js | 2 +- apps/files_trashbin/css/trash.css | 9 +++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 0263d79e79..a064c160cf 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -756,7 +756,12 @@ table.dragshadow td.size { margin: 0 !important; border: none; border-radius: 0; - background-color: transparent; + position: fixed !important; + bottom: 44px; + width: inherit !important; + background-color: #fff; + border-right: 1px solid #eee; + z-index:1; .quota-container { height: 5px; @@ -769,6 +774,11 @@ table.dragshadow td.size { } } +/* increase the padding of the last item to not hide below the quota item */ +.app-files #app-navigation > ul li:nth-last-child(1) { + margin-bottom: 44px; +} + #quotatext, #quotatext-additional { padding: 0; diff --git a/apps/files/js/app.js b/apps/files/js/app.js index 5f1bf1a7b1..47011d23f4 100644 --- a/apps/files/js/app.js +++ b/apps/files/js/app.js @@ -109,7 +109,7 @@ this._onPopState(urlParams); $('#quota.has-tooltip').tooltip({ - placement: 'bottom' + placement: 'top' }); this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200); diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index f150e55723..f1096d5924 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -20,20 +20,17 @@ display: none; } -#app-navigation > ul { - padding-bottom: 44px; -} - /* move Deleted Files to bottom of sidebar */ .nav-trashbin { position: fixed !important; - bottom: 44px; + bottom: 88px; width: inherit !important; background-color: #fff; border-right: 1px solid #eee; + margin-bottom: 0px !important; } /* double padding to account for Deleted files entry, issue with Firefox */ .app-files #app-navigation > ul li:nth-last-child(2) { - margin-bottom: 44px; + margin-bottom: 88px; } From f6d0b92c5969d3d9c504a8de7dd6078cdd730bbe Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 13 Jun 2017 10:12:13 +0200 Subject: [PATCH 10/11] Remove unused element Signed-off-by: Joas Schilling --- apps/files/css/files.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index a064c160cf..de01b4ab56 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -779,8 +779,7 @@ table.dragshadow td.size { margin-bottom: 44px; } -#quotatext, -#quotatext-additional { +#quotatext { padding: 0; height: 30px; line-height: 30px; From 28f6104bc88dab2186a5793d9c09b4d75d0fd530 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 13 Jun 2017 10:28:49 -0500 Subject: [PATCH 11/11] Do not show icon for quota bar Signed-off-by: Morris Jobke --- apps/files/css/files.scss | 3 ++- apps/files/img/quota.svg | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 apps/files/img/quota.svg diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index de01b4ab56..5f32916650 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -108,8 +108,9 @@ .nav-icon-trashbin { background-image: url('../img/delete.svg?v=1'); } +/* no icon for the quota bar */ .nav-icon-quota { - background-image: url('../img/quota.svg?v=1'); + padding-left: 15px !important; } #app-navigation .nav-files a.nav-icon-files { diff --git a/apps/files/img/quota.svg b/apps/files/img/quota.svg deleted file mode 100644 index 8ed264e850..0000000000 --- a/apps/files/img/quota.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -