Alert and status panel displays per section, not globally

on-prem · Nov 2, 2017 · d72e163 · d72e163
1 parent c957b0d
commit d72e163
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.18.2 (2017-11-02)
+
+  ### Regression fixes
+
+  * [dashboard] Alert and status panel displays per section, not globally
+
 ## 1.18.1 (2017-11-01)
 
   ### Minor fixes

diff --git a/docs/API.md b/docs/API.md
@@ -1652,4 +1652,4 @@ Content-Type: application/json
 
 ----
 
-Powered by Jidoteki.com - v1.18.1 - [Copyright notices](/docs/NOTICE.TXT)
+Powered by Jidoteki.com - v1.18.2 - [Copyright notices](/docs/NOTICE.TXT)
diff --git a/docs/ui.js b/docs/ui.js
@@ -1026,7 +1026,7 @@
       formData.append('settings', blob, 'settings.json');
       if (formData) {
         return putFile('storage', '/api/v1/admin/storage', formData, function(err, result) {
-          $('.jido-panel').show();
+          $('.jido-page-content-storage .jido-panel').show();
           if (!err) {
             successUpload('storage');
             $(".storage-alert").html("Please Restart to apply storage settings.");
@@ -1054,7 +1054,7 @@
       if (formData) {
         return putFile('backup', '/api/v1/admin/backup', formData, function(err, result) {
           $(".backup-alert").html("The backup will complete shortly.");
-          $('.jido-panel').show();
+          $('.jido-page-content-backup .jido-panel').show();
           if (err) {
             $('.jido-data-backup-status').html('failed');
             $('.jido-data-backup-status').removeClass('label-danger');
@@ -1077,7 +1077,7 @@
       formData.append('action', "STOP");
       if (formData) {
         return putFile('backup', '/api/v1/admin/backup', formData, function(err, result) {
-          $('.jido-panel').show();
+          $('.jido-page-content-backup .jido-panel').show();
           if (err) {
             $('.jido-data-backup-status').html('failed');
             $('.jido-data-backup-status').removeClass('label-danger');
@@ -1109,7 +1109,7 @@
       formData.append('archive', $('#backup-restore-input[type=file]')[0].files[0]);
       if (formData) {
         return putFile('backup', "/api/v1/admin/backup/restore", formData, function(err, result) {
-          $('.jido-panel').show();
+          $('.jido-page-content-backup .jido-panel').show();
           if (err) {
             $('.jido-data-backup-status').html('failed');
             $('.jido-data-backup-status').removeClass('label-danger');

diff --git a/docs/ui.min.js b/docs/ui.min.js
diff --git a/index.html b/index.html
@@ -765,7 +765,7 @@ <h1><i style="font-size:2em;" class="fa icon-attention text-warning"></i>
     <script src="docs/jsrrdgraph/strftime.js"></script>
     <script src="docs/jsrrdgraph/draw.js"></script>
     <script src="docs/ui.min.js"></script>
-    <div style="margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;" class="well text-right text-muted jido-smalltext">Powered by Jidoteki.com - v1.18.1 - <a href="/docs/NOTICE.TXT">Copyright notices</a></div>
+    <div style="margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;" class="well text-right text-muted jido-smalltext">Powered by Jidoteki.com - v1.18.2 - <a href="/docs/NOTICE.TXT">Copyright notices</a></div>
     <!-- This Source Code Form is subject to the terms of the Mozilla Public-->
     <!-- License, v. 2.0. If a copy of the MPL was not distributed with this-->
     <!-- file, You can obtain one at http://mozilla.org/MPL/2.0/.-->

diff --git a/module.l b/module.l
@@ -1,6 +1,6 @@
 [de MODULE_INFO
   ("name"       "jidoteki-admin-api")
-  ("version"    "1.18.1")
+  ("version"    "1.18.2")
   ("summary"    "Jidoteki Admin API")
   ("source"     "https://jidoteki.com")
   ("author"     "Alexander Williams")

diff --git a/ui/footer.jade b/ui/footer.jade
@@ -26,5 +26,5 @@ script(src='docs/jsrrdgraph/draw.js')
 script(src='docs/ui.min.js')
 
 .well.text-right.text-muted.jido-smalltext(style='margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;')
-  | Powered by Jidoteki.com - v1.18.1 - 
+  | Powered by Jidoteki.com - v1.18.2 - 
   a(href='/docs/NOTICE.TXT') Copyright notices
diff --git a/ui/ui.coffee b/ui/ui.coffee
@@ -490,7 +490,7 @@ storageButtonListener = ->
 
     if formData
       putFile 'storage', '/api/v1/admin/storage', formData, (err, result) ->
-        $('.jido-panel').show()
+        $('.jido-page-content-storage .jido-panel').show()
         unless err
           successUpload 'storage'
 
@@ -511,7 +511,7 @@ backupButtonListener = () ->
     if formData
       putFile 'backup', '/api/v1/admin/backup', formData, (err, result) ->
         $(".backup-alert").html "The backup will complete shortly."
-        $('.jido-panel').show()
+        $('.jido-page-content-backup .jido-panel').show()
         if err
           $('.jido-data-backup-status').html 'failed'
           $('.jido-data-backup-status').removeClass 'label-danger'
@@ -532,7 +532,7 @@ backupButtonListener = () ->
 
     if formData
       putFile 'backup', '/api/v1/admin/backup', formData, (err, result) ->
-        $('.jido-panel').show()
+        $('.jido-page-content-backup .jido-panel').show()
         if err
           $('.jido-data-backup-status').html 'failed'
           $('.jido-data-backup-status').removeClass 'label-danger'
@@ -561,7 +561,7 @@ backupButtonListener = () ->
 
     if formData
       putFile 'backup', "/api/v1/admin/backup/restore", formData, (err, result) ->
-        $('.jido-panel').show()
+        $('.jido-page-content-backup .jido-panel').show()
         if err
           $('.jido-data-backup-status').html 'failed'
           $('.jido-data-backup-status').removeClass 'label-danger'