mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toastergui: consistent add / remove layer notifications

Browse Source 
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>
This commit is contained in:
Belen Barros Pena
2015-01-26 15:11:54 +00:00
committed by Richard Purdie
parent 571d551a2d
commit 088c19d644
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/toaster/toastergui/static/js/layerdetails.js
View File

@@ -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();
}

2
bitbake/lib/toaster/toastergui/templates/layerdetails.html
View File

@@ -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">