diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2016-10-05 17:08:53 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-06 11:41:48 +0100 |
| commit | 7f67977518d69dc84cbbcc4cf1ea859c51e57d18 (patch) | |
| tree | 69db092afd84dae2d7af07af4da24083eca01412 /bitbake/lib | |
| parent | 8df56061f63b63b77a0c7a7ddd75812e3b5a88c4 (diff) | |
| download | openembedded-core-contrib-7f67977518d69dc84cbbcc4cf1ea859c51e57d18.tar.gz | |
bitbake: toaster: Delete notification update front end implementation to design
Update the delete notifications to reflect feedback from design
review comments.
(Bitbake rev: e47a1cc160c0f1da060884a8585403b35375fb09)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
5 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index b01d4ba815..ae1f150770 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py @@ -224,7 +224,7 @@ class XhrLayer(View): return JsonResponse({ "error": "ok", - "gotoUrl": reverse('project', args=(kwargs['pid'],)) + "gotoUrl": reverse('projectlayers', args=(kwargs['pid'],)) }) diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 4c0d0426eb..9ead393cbf 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -392,6 +392,8 @@ function layerDetailsPageInit (ctx) { $("#layer-delete-confirmed").click(function(){ + $("#delete-layer-modal button[data-dismiss='modal']").hide(); + var message = $('<span>You have deleted <strong>1</strong> layer from your project: <strong id="deleted-layer-name"></strong>'); message.find("#deleted-layer-name").text(ctx.layerVersion.name); diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 0832ba40c3..86662b7a68 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -342,7 +342,7 @@ var libtoaster = (function () { } function _showChangeNotification(message){ - $(".alert").fadeOut().promise().done(function(){ + $(".alert-dismissible").fadeOut().promise().done(function(){ var alertMsg = $("#change-notification-msg"); alertMsg.html(message); diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index c1b1417a76..496dd6eab8 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -74,7 +74,7 @@ </div> <div id="change-notification" class="alert alert-info alert-dismissible change-notification" style="display:none"> - <button type="button" class="close" id="hide-alert" data-dismiss="alert">×</button> + <button type="button" class="close" id="hide-alert" data-toggle="alert">×</button> <span id="change-notification-msg"></span> </div> diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 0b6ef56380..f5eee96516 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html @@ -28,6 +28,8 @@ if (data.error !== "ok") { console.warn(data.error); } else { + libtoaster.setNotification("build-deleted", + $("#deleted-build-message").html()); window.location.replace(data.gotoUrl); } }, @@ -61,7 +63,9 @@ }); </script> - +<span style="display:none" id="deleted-build-message"> + You have deleted 1 build: <strong>{{build.get_sorted_target_list|field_values:"target"|join:", "}} {{build.machine}}</strong> completed on <strong>{{build.completed_on|date:"d/m/y H:i"}}</strong> +</span> <div class="modal fade" tabindex="-1" role="dialog" id="delete-build-modal" style="display: none;" data-backdrop="static" data-keyboard="false"> <div class="modal-dialog"> |