summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-08-04 16:07:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-06 16:04:42 -0500
commit0378aadd58f8fddb655c29eb6a664d2e061397e5 (patch)
tree17dedb8bfa541dd2c158852ccac423f61feeaace
parent69c6f1fd1304d15a9f56f55d4b8fe588027a029f (diff)
downloadpoky-0378aadd58f8fddb655c29eb6a664d2e061397e5.tar.gz
bitbake: toastergui: remove project name from layer change notification
The project name is always a link to the basic configuration page, which looks quite silly when you change layers from that page. Since I guess the idea is reusing those notifications everywhere, I've replaced the project name with a generic 'to your project' / 'from your project', so that they read right no matter where you see them. (Bitbake rev: 59bcafa712b9a16b647bd26b3bd738ae6fc21eaa) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/libtoaster.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
index 22377f08f4..7edd0190f3 100644
--- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
@@ -280,7 +280,7 @@ var libtoaster = (function (){
280 var alertMsg; 280 var alertMsg;
281 281
282 if (layerDepsList.length > 0 && add === true) { 282 if (layerDepsList.length > 0 && add === true) {
283 alertMsg = $("<span>You have added <strong>"+(layerDepsList.length+1)+"</strong> layers to <a id=\"project-affected-name\"></a>: <a id=\"layer-affected-name\"></a> and its dependencies </span>"); 283 alertMsg = $("<span>You have added <strong>"+(layerDepsList.length+1)+"</strong> layers to your project: <a id=\"layer-affected-name\"></a> and its dependencies </span>");
284 284
285 /* Build the layer deps list */ 285 /* Build the layer deps list */
286 layerDepsList.map(function(layer, i){ 286 layerDepsList.map(function(layer, i){
@@ -296,15 +296,13 @@ var libtoaster = (function (){
296 alertMsg.append(link); 296 alertMsg.append(link);
297 }); 297 });
298 } else if (layerDepsList.length === 0 && add === true) { 298 } else if (layerDepsList.length === 0 && add === true) {
299 alertMsg = $("<span>You have added <strong>1</strong> layer to <a id=\"project-affected-name\"></a>: <a id=\"layer-affected-name\"></a></span></span>"); 299 alertMsg = $("<span>You have added <strong>1</strong> layer to your project: <a id=\"layer-affected-name\"></a></span></span>");
300 } else if (add === false) { 300 } else if (add === false) {
301 alertMsg = $("<span>You have deleted <strong>1</strong> layer from <a id=\"project-affected-name\"></a>: <a id=\"layer-affected-name\"></a></span>"); 301 alertMsg = $("<span>You have deleted <strong>1</strong> layer from your project: <a id=\"layer-affected-name\"></a></span>");
302 } 302 }
303 303
304 alertMsg.children("#layer-affected-name").text(layer.name); 304 alertMsg.children("#layer-affected-name").text(layer.name);
305 alertMsg.children("#layer-affected-name").attr("href", layer.layerdetailurl); 305 alertMsg.children("#layer-affected-name").attr("href", layer.layerdetailurl);
306 alertMsg.children("#project-affected-name").text(libtoaster.ctx.projectName);
307 alertMsg.children("#project-affected-name").attr("href", libtoaster.ctx.projectPageUrl);
308 306
309 return alertMsg.html(); 307 return alertMsg.html();
310 } 308 }