Skip to content

Commit d72e163

Browse files
committed
Alert and status panel displays per section, not globally
1 parent c957b0d commit d72e163

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 1.18.2 (2017-11-02)
4+
5+
### Regression fixes
6+
7+
* [dashboard] Alert and status panel displays per section, not globally
8+
39
## 1.18.1 (2017-11-01)
410

511
### Minor fixes

docs/API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,4 +1652,4 @@ Content-Type: application/json
16521652

16531653
----
16541654

1655-
Powered by Jidoteki.com - v1.18.1 - [Copyright notices](/docs/NOTICE.TXT)
1655+
Powered by Jidoteki.com - v1.18.2 - [Copyright notices](/docs/NOTICE.TXT)

docs/ui.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@
10261026
formData.append('settings', blob, 'settings.json');
10271027
if (formData) {
10281028
return putFile('storage', '/api/v1/admin/storage', formData, function(err, result) {
1029-
$('.jido-panel').show();
1029+
$('.jido-page-content-storage .jido-panel').show();
10301030
if (!err) {
10311031
successUpload('storage');
10321032
$(".storage-alert").html("Please Restart to apply storage settings.");
@@ -1054,7 +1054,7 @@
10541054
if (formData) {
10551055
return putFile('backup', '/api/v1/admin/backup', formData, function(err, result) {
10561056
$(".backup-alert").html("The backup will complete shortly.");
1057-
$('.jido-panel').show();
1057+
$('.jido-page-content-backup .jido-panel').show();
10581058
if (err) {
10591059
$('.jido-data-backup-status').html('failed');
10601060
$('.jido-data-backup-status').removeClass('label-danger');
@@ -1077,7 +1077,7 @@
10771077
formData.append('action', "STOP");
10781078
if (formData) {
10791079
return putFile('backup', '/api/v1/admin/backup', formData, function(err, result) {
1080-
$('.jido-panel').show();
1080+
$('.jido-page-content-backup .jido-panel').show();
10811081
if (err) {
10821082
$('.jido-data-backup-status').html('failed');
10831083
$('.jido-data-backup-status').removeClass('label-danger');
@@ -1109,7 +1109,7 @@
11091109
formData.append('archive', $('#backup-restore-input[type=file]')[0].files[0]);
11101110
if (formData) {
11111111
return putFile('backup', "/api/v1/admin/backup/restore", formData, function(err, result) {
1112-
$('.jido-panel').show();
1112+
$('.jido-page-content-backup .jido-panel').show();
11131113
if (err) {
11141114
$('.jido-data-backup-status').html('failed');
11151115
$('.jido-data-backup-status').removeClass('label-danger');

docs/ui.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ <h1><i style="font-size:2em;" class="fa icon-attention text-warning"></i>
765765
<script src="docs/jsrrdgraph/strftime.js"></script>
766766
<script src="docs/jsrrdgraph/draw.js"></script>
767767
<script src="docs/ui.min.js"></script>
768-
<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>
768+
<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>
769769
<!-- This Source Code Form is subject to the terms of the Mozilla Public-->
770770
<!-- License, v. 2.0. If a copy of the MPL was not distributed with this-->
771771
<!-- file, You can obtain one at http://mozilla.org/MPL/2.0/.-->

module.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[de MODULE_INFO
22
("name" "jidoteki-admin-api")
3-
("version" "1.18.1")
3+
("version" "1.18.2")
44
("summary" "Jidoteki Admin API")
55
("source" "https://jidoteki.com")
66
("author" "Alexander Williams")

ui/footer.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ script(src='docs/jsrrdgraph/draw.js')
2626
script(src='docs/ui.min.js')
2727

2828
.well.text-right.text-muted.jido-smalltext(style='margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;')
29-
| Powered by Jidoteki.com - v1.18.1 -
29+
| Powered by Jidoteki.com - v1.18.2 -
3030
a(href='/docs/NOTICE.TXT') Copyright notices

ui/ui.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ storageButtonListener = ->
490490

491491
if formData
492492
putFile 'storage', '/api/v1/admin/storage', formData, (err, result) ->
493-
$('.jido-panel').show()
493+
$('.jido-page-content-storage .jido-panel').show()
494494
unless err
495495
successUpload 'storage'
496496

@@ -511,7 +511,7 @@ backupButtonListener = () ->
511511
if formData
512512
putFile 'backup', '/api/v1/admin/backup', formData, (err, result) ->
513513
$(".backup-alert").html "The backup will complete shortly."
514-
$('.jido-panel').show()
514+
$('.jido-page-content-backup .jido-panel').show()
515515
if err
516516
$('.jido-data-backup-status').html 'failed'
517517
$('.jido-data-backup-status').removeClass 'label-danger'
@@ -532,7 +532,7 @@ backupButtonListener = () ->
532532

533533
if formData
534534
putFile 'backup', '/api/v1/admin/backup', formData, (err, result) ->
535-
$('.jido-panel').show()
535+
$('.jido-page-content-backup .jido-panel').show()
536536
if err
537537
$('.jido-data-backup-status').html 'failed'
538538
$('.jido-data-backup-status').removeClass 'label-danger'
@@ -561,7 +561,7 @@ backupButtonListener = () ->
561561

562562
if formData
563563
putFile 'backup', "/api/v1/admin/backup/restore", formData, (err, result) ->
564-
$('.jido-panel').show()
564+
$('.jido-page-content-backup .jido-panel').show()
565565
if err
566566
$('.jido-data-backup-status').html 'failed'
567567
$('.jido-data-backup-status').removeClass 'label-danger'

0 commit comments

Comments
 (0)