Skip to content

Commit 4874f19

Browse files
Alert clear all button added and improved aesthetics (#160)
* Properly hide element * Alerts aesthetics changed and clear all added * Uniform buttons * Fix font size
1 parent 73958d8 commit 4874f19

File tree

3 files changed

+45
-13
lines changed

3 files changed

+45
-13
lines changed

src/main/resources/static/css/ui.css

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,37 @@ body {
9797
justify-content: flex-end;
9898
padding: 0;
9999
}
100+
.app-header .alert-menu .alert-list .alert-remove .fa {
101+
color: #6c757d;
102+
}
100103
.app-header .alert-menu .alert-list .alert-remove .fa:hover {
101-
color: #2f353a;
104+
color: #5a6268;
102105
}
103106
.app-header .alert-menu .alert-list .dropdown-item:hover {
107+
background-color: inherit;
108+
}
109+
.app-header .alert-menu .alert-list .dropdown-item:active {
110+
color: inherit;
111+
}
112+
.app-header .alert-menu .alert-list .dropdown-item .alert-message:hover {
104113
background-color: #f7f7f7;
105114
}
106-
.app-header .alert-menu .alert-list .dropdown-item:active .alert-remove .fa {
115+
.app-header .alert-menu .alert-list .dropdown-item .alert-message:active {
116+
background-color: #c1c1c1;
117+
color: #fff;
118+
}
119+
.app-header .alert-menu .alert-clear {
120+
display: flex;
121+
justify-content: center;
122+
border-top: 1px solid #c8ced3;
123+
padding: 5px 5px 5px 5px;
124+
background: #e4e7ea;
125+
font-size: 0.875rem;
126+
}
127+
.app-header .alert-menu .alert-clear .alert-clear-button {
128+
padding: 2px 0 0 5px;
129+
}
130+
.app-header .alert-menu .alert-clear .fa {
107131
color: #fff;
108132
}
109133
.app-header .user-menu {
@@ -153,13 +177,9 @@ body {
153177
.app-header .nav-item.dropdown .dropdown-item:not(:first-child) {
154178
border-top: 1px solid #c8ced3;
155179
}
156-
.app-header .nav-item.dropdown .dropdown-item:active {
157-
background-color: #c1c1c1 !important;
158-
}
159180
.app-header .nav-item.dropdown .dropdown-item .fa {
160181
display: flex;
161182
align-items: center;
162-
margin: 0 10px 0 10px;
163183
}
164184
.nav-item .fa {
165185
font-size: large !important;
@@ -444,12 +464,13 @@ body {
444464
.app-header .nav-item.dropdown .dropdown-menu .dropdown-header {
445465
border-radius: 0.25rem 0.25rem 0 0;
446466
}
447-
.app-header .nav-item.dropdown .dropdown-menu .dropdown-item:last-child {
448-
border-radius: 0 0 0.25rem 0.25rem;
449-
}
450-
.app-header .alert-menu .alert-list .dropdown-item {
467+
.app-header .nav-item.dropdown .dropdown-menu .dropdown-item {
451468
background-color: #fff;
452469
}
470+
.app-header .alert-menu .alert-clear {
471+
border-radius: 0 0 0.25rem 0.25rem;
472+
}
473+
453474
.app-header .alert-menu .alert-empty {
454475
border-radius: 0 0 0.25rem 0.25rem;
455476
background-color: #fff;

src/main/resources/static/js/errorMessages.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ function viewModel(data) {
2424
self.errorMessages.splice(realIndex, 1);
2525
self.mergeErrorMessages();
2626
}
27+
self.removeAllErrorMessages = function () {
28+
self.errorMessages([]);
29+
sessionStorage.setItem('ei.errorMessages', '[]');
30+
sessionStorage.setItem('ei.errorMessagesNew', '[]');
31+
}
2732
self.storeErrorMessage = function (data) {
2833
storedNew.push({ "message": data })
2934
sessionStorage.setItem('ei.errorMessagesNew', JSON.stringify(storedNew));

src/main/resources/templates/index.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,21 @@
4444
<div class="dropdown-header text-center">
4545
<strong>Messages</strong>
4646
</div>
47-
<div class="alert-empty text-center" data-bind="if: $root.errorMessages().length == 0">No messages</div>
47+
<div class="alert-empty text-center" data-bind="visible: $root.errorMessages().length == 0">No messages</div>
4848
<div class="alert-list" id="alerts" data-bind="foreach: errorMessages.slice(0).reverse()">
4949
<div class="dropdown-item">
50-
<div class="col-10 alert-message" data-bind="text: message, click: function(data, event) {$root.expandMessage(event)}"></div>
51-
<div class="col-2 alert-remove">
50+
<div class="col-11 alert-message" data-bind="text: message, click: function(data, event) {$root.expandMessage(event)}"></div>
51+
<div class="col-1 alert-remove">
5252
<i class="fa fa-fw fa-minus-circle cursor-pointer" data-bind="click: function(data, event) {$root.removeErrorMessage($index())}"></i>
5353
</div>
5454
</div>
5555
</div>
56+
<div class="alert-clear" data-bind="visible: $root.errorMessages().length != 0">
57+
<button class="alert-clear-button btn btn-sm btn-secondary" data-bind="click: function(data, event) {$root.removeAllErrorMessages()}">
58+
Clear All
59+
<i class="fa fa-fw fa-trash"></i>
60+
</button>
61+
</div>
5662
</div>
5763
</li>
5864
<li class="nav-item dropdown" id="userItem">

0 commit comments

Comments
 (0)