From e3c23c0c7090dde876d803e8744df3f9599da2f6 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Wed, 22 Apr 2020 10:03:19 +0300
Subject: [PATCH] Updated UI and header

---
 app/init.php                                  |  2 +-
 app/views/console/comps/header.phtml          | 36 ++++++++++++-------
 app/views/console/database/document.phtml     |  2 +-
 .../console/database/rules/document.phtml     |  2 +-
 app/views/console/home/index.phtml            |  2 +-
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/app/init.php b/app/init.php
index c56ea5c6d..7e2bb4071 100644
--- a/app/init.php
+++ b/app/init.php
@@ -32,7 +32,7 @@ const APP_EMAIL_SECURITY = 'security@localhost.test'; // Default security email
 const APP_USERAGENT = APP_NAME.'-Server v%s. Please report abuse at %s';
 const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 15;
-const APP_CACHE_BUSTER = 89;
+const APP_CACHE_BUSTER = 93;
 const APP_VERSION_STABLE = '0.5.3';
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_CACHE = '/storage/cache';
diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml
index 740b4984f..e0e4544b3 100644
--- a/app/views/console/comps/header.phtml
+++ b/app/views/console/comps/header.phtml
@@ -37,20 +37,32 @@
             <a href="/console">Back to Console &nbsp;<i class="icon-right-open"></i></a>
         </div>
 
-        <a href="/console/account" class="account pull-end clear">
+        <div class="account link pull-end clear">
             <img src="" data-ls-attrs="src={{account|gravatar}}" alt="User Avatar" class="avatar margin-start pull-end" />
             <span class="name pull-end desktops-only" data-ls-bind="{{account.name}}"></span>
-        </a>
-    </div>
-    
-    <div class="pull-end margin-end switch-theme desktops-only">
-        <button data-general-theme
-            data-analytics-event="click"
-            data-analytics-category="console/header"
-            data-analytics-label="Switch Theme">
-            <i class="icon-sun-inv force-light"></i>
-            <i class="icon-moon-inv force-dark"></i>
-        </button>
+        </div>
+
+        <div class="drop-list bottom end" data-ls-ui-open="" data-button-text="" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="account-button" data-blur="1" tabindex="1">
+            <ul class="margin-top-large arrow-end">
+                <li>
+                    <a href="/console/account"><i class="icon-user"></i> &nbsp; Your Account</a>
+                </li>
+                <li>
+                    <span class="link"><i class="icon-sun-inv force-dark pull-start"></i><i class="icon-moon-inv force-light pull-start"></i> &nbsp; Change Theme
+                        <div class="pull-end switch-theme desktops-only">
+                            <button data-general-theme
+                                data-analytics-event="click"
+                                data-analytics-category="console/header"
+                                data-analytics-label="Switch Theme">
+                                <i class="icon-sun-inv force-light"></i>
+                                <i class="icon-moon-inv force-dark"></i>
+                            </button>
+                        </div>    
+                    </span>
+                </li>
+            </ul>
+        </div>
+
     </div>
 
     <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-icon="icon-dot-3">
diff --git a/app/views/console/database/document.phtml b/app/views/console/database/document.phtml
index 93dd1d715..0a4cc3898 100644
--- a/app/views/console/database/document.phtml
+++ b/app/views/console/database/document.phtml
@@ -63,7 +63,7 @@
 
                                 <div class="box">
 
-                                    <div data-ls-template="/console/database/form?collectionId={{router.params.collection}}&project={{router.params.project}}&version={{env.VERSION}}"></div>
+                                    <div data-ls-template="/console/database/form?collectionId={{router.params.collection}}&project={{router.params.project}}&version={{env.VERSION}}&buster={{project-collection.dateUpdated}}"></div>
 
                                     <div class="toggle margin-bottom" data-ls-ui-open>
                                         <i class="icon-plus pull-end margin-top-tiny"></i>
diff --git a/app/views/console/database/rules/document.phtml b/app/views/console/database/rules/document.phtml
index 505505d6f..074c6e0f6 100644
--- a/app/views/console/database/rules/document.phtml
+++ b/app/views/console/database/rules/document.phtml
@@ -26,6 +26,6 @@ $list = ($array) ? $list : array_shift($list);
 
 <div class="info">
     <?php if(!empty($list)): ?>
-        <div data-ls-template="/console/database/form?collectionId=<?php echo $this->escape($list); ?>&namespace=<?php echo $this->escape($namespace); ?>&key=<?php echo $this->escape($key); ?>&parent=0&project={{router.params.project}}&version={{env.VERSION}}" class="margin-bottom-negative-small"></div>
+        <div data-ls-template="/console/database/form?collectionId=<?php echo $this->escape($list); ?>&namespace=<?php echo $this->escape($namespace); ?>&key=<?php echo $this->escape($key); ?>&parent=0&project={{router.params.project}}&version={{env.VERSION}}&buster={{project-collection.dateUpdated}}" class="margin-bottom-negative-small"></div>
     <?php endif; ?>
 </div>
\ No newline at end of file
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index a47c92b66..0996d7e7b 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -134,7 +134,7 @@ $graph = $this->getParam('graph', false);
     </div>
 
     <div class="pull-end desktops-only tablets-only">
-        <a data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your API Keys</a>
+        <a data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
     </div>
 
     <div class="drop-list pull-start" data-ls-ui-open="" data-button-text="Add Platform" data-button-class="button" data-blur="1" tabindex="1">