From: samhenri <samuel.guimaraes@eldorado.org.br> Signed-off-by: samhenri <samuel.guimaraes@eldorado.org.br> --- src/wok/plugins/kimchi/ui/js/src/kimchi.template_add_main.js | 10 +++++----- src/wok/plugins/kimchi/ui/pages/template-add.html.tmpl | 3 ++- ui/css/src/modules/_network.scss | 2 +- ui/css/src/modules/_storage.scss | 2 +- ui/css/src/modules/_templates.scss | 2 +- ui/css/src/modules/_wok-grid.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 9 ++++++++- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.template_add_main.js b/src/wok/plugins/kimchi/ui/js/src/kimchi.template_add_main.js index 78a5441..702f9d2 100644 --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.template_add_main.js +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.template_add_main.js @@ -65,7 +65,7 @@ kimchi.template_add_main = function() { $(button).show(); } }, function(err) { - wok.message.error(err.responseJSON.reason); + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); $(button + '-loading').hide(); $(button).show(); }); @@ -168,7 +168,7 @@ kimchi.template_add_main = function() { $('#iso-search').show(); } }, function(err) { - wok.message.error(err.responseJSON.reason); + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); }); $('#template-add-window .modal-body .template-pager').animate({ height: "689px" @@ -208,7 +208,7 @@ kimchi.template_add_main = function() { $('#iso-search').show(); } }, function(err) { - wok.message.error(err.responseJSON.reason); + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); }); } }); @@ -549,7 +549,7 @@ kimchi.template_add_main = function() { wok.topic('templateCreated').publish(); }, function(err) { if(callback) callback(); - wok.message.error(err.responseJSON.reason); + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); }); }; @@ -574,7 +574,7 @@ kimchi.template_add_main = function() { wok.window.close(); } }, function(err) { - wok.message.error(err.responseJSON.reason); + wok.message.error(err.responseJSON.reason,'#alert-modal-container'); }); }; if (formData.iso instanceof Array) { diff --git a/src/wok/plugins/kimchi/ui/pages/template-add.html.tmpl b/src/wok/plugins/kimchi/ui/pages/template-add.html.tmpl index e441a99..ad4ada6 100644 --- a/src/wok/plugins/kimchi/ui/pages/template-add.html.tmpl +++ b/src/wok/plugins/kimchi/ui/pages/template-add.html.tmpl @@ -28,7 +28,8 @@ <div class="modal-header"> <h4 class="modal-title">$_("Add Template")</h4> </div> - <div class="modal-body"> + <div class="modal-body"> + <span id="alert-modal-container"></span> <div class="template-modal-container"> <div> <h5>$_("Where is the source media for this template? ")</h5> diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index f041981..0a30b09 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -69,7 +69,7 @@ } .up .fa { - color: #a8d46f; + color: $fa-green; } .loading > .fa, diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index c06d38d..bbc0d38 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -51,7 +51,7 @@ cursor: pointer; } .fa-power-off { - color: #a8d46f; + color: $fa-green; } } .inactive { diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss index 0756f8e..bc5b3be 100644 --- a/ui/css/src/modules/_templates.scss +++ b/ui/css/src/modules/_templates.scss @@ -294,7 +294,7 @@ background-image: url('#{$wok-icon-path}/icon-fedora.png'); } &.icon-opensuse { - background-image: url('#{$wok-icon-path}/images/icon-opensuse.png'); + background-image: url('#{$wok-icon-path}/icon-opensuse.png'); } &.icon-ubuntu { background-image: url('#{$wok-icon-path}/icon-ubuntu.png'); diff --git a/ui/css/src/modules/_wok-grid.scss b/ui/css/src/modules/_wok-grid.scss index d340794..ec870b7 100644 --- a/ui/css/src/modules/_wok-grid.scss +++ b/ui/css/src/modules/_wok-grid.scss @@ -80,7 +80,7 @@ .wok-repository-status .fa { font-size: 23px; - color: #a8d46f; + color: $fa-green; } .wok-list-name, .wok-list-description { diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss index c2f6ccb..0f15d2d 100644 --- a/ui/css/src/modules/_wok-variables.scss +++ b/ui/css/src/modules/_wok-variables.scss @@ -43,7 +43,14 @@ $brand-warning: #f0ad4e !default; $brand-danger: #d9534f !default; $kimchi-dropdown: #4d4c4e !default; $storages-low: #8BC53E !default; +$fa-green: #a8d46f !default; +$vnc-blue: #5ab3d4; +$guestCharts: ( + lightGray: #e6e7e8, + mediumGray: #bbbdbf, + darkGray: #929497 +); //## Kimchi default colors - TODO remove these references and link do Sass Maps below @@ -978,7 +985,7 @@ $hr-border: $gray-lighter !default; $color-red-error: rgb(185, 74, 72); $color-blue-hover: rgb(100, 177, 216); -$color-grey-arrow: rgb(204, 204, 204); +$color-gray-arrow: rgb(204, 204, 204); $width-default: 220px; -- 1.9.3