Add quota to the files view

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 579cf36e15b7bc652d768f167e7727d2d4fd9a27..9fcc10caf46fae3665b1cec05532d3024ffd790e 100644 (file)
--- 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 d46a0b8f9df6ef5b7fde36a2d96e7850aea6b3fa..5f1bf1a7b1e43333d848a6d4d97c8639726fe036 100644 (file)
--- 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 f7a4318e595495f671efc1618e60ea8e91aedbac..fc59622af895a943692fa48bd7239e4a8e27352e 100644 (file)
--- 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 9c79f8067131fc6643542b08d18dc37bb2b8d009..28019ba803d4faffc4585e41d09cbb9325546915 100644 (file)
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -1,4 +1,17 @@
 <div id="app-navigation">
+       <div id="quota" class="section has-tooltip" title="<?php
+       if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+               p($l->t('You are using %s of %s', [$_['usage'], $_['total_space']]));
+       } else {
+               p($l->t('You are using %s of %s (%s %%)', [$_['usage'], $_['total_space'],  $_['usage_relative']]));
+       }
+       ?>">
+               <div style="width:<?php p($_['usage_relative']);?>%"
+                        <?php if($_['usage_relative'] > 80): ?>class="quota-warning"<?php endif; ?>>
+                       <p id="quotatext"><?php p($l->t('%s of %s in use', [$_['usage'], $_['total_space']])); ?></p>
+               </div>
+       </div>
+
        <ul class="with-icon">
                <?php foreach ($_['navigationItems'] as $item) { ?>
                <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">