summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-01-26 15:11:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 22:11:34 +0000
commit088c19d6442653c6b39003057512d75b6c9508b7 (patch)
tree8086b1bf4d5b545d28c5eaea786bdf8bf5365ae6
parent571d551a2de0961c7cf3f9463b406b7d667ff444 (diff)
downloadast2050-yocto-poky-088c19d6442653c6b39003057512d75b6c9508b7.zip
ast2050-yocto-poky-088c19d6442653c6b39003057512d75b6c9508b7.tar.gz
bitbake: toastergui: consistent add / remove layer notifications
In my struggle to ensure consistency in the format and content of the notifications we show when you add and remove layers to a project, I've: * added the project name to the notifications in the layer details page * removed the 'Go to project configuration' link from the notifications in the layer details page This changes align the notifications we show in the layer details page with the ones we show in the 'all' pages. (Bitbake rev: 87deeb2016cbfdaff5531e1badb58761af6df848) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/layerdetails.js10
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layerdetails.html2
2 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
index 41cbf4b..2addecd 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
@@ -211,7 +211,7 @@ function layerDetailsPageInit (ctx) {
addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>");
if (depsList) {
- alertMsg.append("You have added <strong>"+(depsList.length+1)+"</strong> layers: <span id=\"layer-affected-name\"></span> and its dependencies ");
+ alertMsg.append("You have added <strong>"+(depsList.length+1)+"</strong> layers to <a id=\"project-affected-name\"></a>: <span id=\"layer-affected-name\"></span> and its dependencies ");
/* Build the layer deps list */
depsList.map(function(layer, i){
@@ -227,7 +227,7 @@ function layerDetailsPageInit (ctx) {
alertMsg.append(link);
});
} else {
- alertMsg.append("You have added <strong>1</strong> layer: <span id=\"layer-affected-name\"></span>");
+ alertMsg.append("You have added <strong>1</strong> layer to <a id=\"project-affected-name\"></a>: <span id=\"layer-affected-name\"></span>");
}
} else {
/* disable and switch all the button states */
@@ -252,10 +252,12 @@ function layerDetailsPageInit (ctx) {
break;
}
- alertMsg.append("You have deleted <strong>1</strong> layer: <span id=\"layer-affected-name\"></span>");
+ alertMsg.append("You have deleted <strong>1</strong> layer from <a id=\"project-affected-name\"></a>: <span id=\"layer-affected-name\"></span>");
}
- alertMsg.children("#layer-affected-name").text(ctx.layerVersion.name);
+ alertMsg.children("#layer-affected-name").html("<strong>" + ctx.layerVersion.name + "</strong>");
+ alertMsg.children("#project-affected-name").text(ctx.projectName);
+ alertMsg.children("#project-affected-name").attr("href", ctx.projectPageUrl);
$("#alert-area").show();
}
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 207197b..a89ffb0 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -23,6 +23,7 @@
xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}",
xhrUpdateLayerUrl : "{% url 'xhr_updatelayer' %}",
projectId : {{project.id}},
+ projectName : "{{project.name}}",
numTargets : {{total_targets}},
numMachines: {{machines|length}},
layerVersion : {
@@ -73,7 +74,6 @@
<div class="alert alert-info lead" id="alert-area" style="display:none">
<button type="button" class="close" id="dismiss-alert" data-dismiss="alert">&times;</button>
<span id="alert-msg"></span>
- <p style="margin-top:10px;"><a href="{% url 'project' project.id %}">Go to project configuration</a></p>
</div>
<ul class="nav nav-pills">
<li class="active">
OpenPOWER on IntegriCloud