diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/layerdetails.js | 10 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 2 |
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 41cbf4ba93..2addecd357 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) { | |||
211 | addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>"); | 211 | addRmLayerBtn.prepend("<span class=\"icon-trash\"></span>"); |
212 | 212 | ||
213 | if (depsList) { | 213 | if (depsList) { |
214 | alertMsg.append("You have added <strong>"+(depsList.length+1)+"</strong> layers: <span id=\"layer-affected-name\"></span> and its dependencies "); | 214 | 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 "); |
215 | 215 | ||
216 | /* Build the layer deps list */ | 216 | /* Build the layer deps list */ |
217 | depsList.map(function(layer, i){ | 217 | depsList.map(function(layer, i){ |
@@ -227,7 +227,7 @@ function layerDetailsPageInit (ctx) { | |||
227 | alertMsg.append(link); | 227 | alertMsg.append(link); |
228 | }); | 228 | }); |
229 | } else { | 229 | } else { |
230 | alertMsg.append("You have added <strong>1</strong> layer: <span id=\"layer-affected-name\"></span>"); | 230 | alertMsg.append("You have added <strong>1</strong> layer to <a id=\"project-affected-name\"></a>: <span id=\"layer-affected-name\"></span>"); |
231 | } | 231 | } |
232 | } else { | 232 | } else { |
233 | /* disable and switch all the button states */ | 233 | /* disable and switch all the button states */ |
@@ -252,10 +252,12 @@ function layerDetailsPageInit (ctx) { | |||
252 | break; | 252 | break; |
253 | } | 253 | } |
254 | 254 | ||
255 | alertMsg.append("You have deleted <strong>1</strong> layer: <span id=\"layer-affected-name\"></span>"); | 255 | alertMsg.append("You have deleted <strong>1</strong> layer from <a id=\"project-affected-name\"></a>: <span id=\"layer-affected-name\"></span>"); |
256 | } | 256 | } |
257 | 257 | ||
258 | alertMsg.children("#layer-affected-name").text(ctx.layerVersion.name); | 258 | alertMsg.children("#layer-affected-name").html("<strong>" + ctx.layerVersion.name + "</strong>"); |
259 | alertMsg.children("#project-affected-name").text(ctx.projectName); | ||
260 | alertMsg.children("#project-affected-name").attr("href", ctx.projectPageUrl); | ||
259 | $("#alert-area").show(); | 261 | $("#alert-area").show(); |
260 | } | 262 | } |
261 | 263 | ||
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 207197bce6..a89ffb0312 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
@@ -23,6 +23,7 @@ | |||
23 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", | 23 | xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}", |
24 | xhrUpdateLayerUrl : "{% url 'xhr_updatelayer' %}", | 24 | xhrUpdateLayerUrl : "{% url 'xhr_updatelayer' %}", |
25 | projectId : {{project.id}}, | 25 | projectId : {{project.id}}, |
26 | projectName : "{{project.name}}", | ||
26 | numTargets : {{total_targets}}, | 27 | numTargets : {{total_targets}}, |
27 | numMachines: {{machines|length}}, | 28 | numMachines: {{machines|length}}, |
28 | layerVersion : { | 29 | layerVersion : { |
@@ -73,7 +74,6 @@ | |||
73 | <div class="alert alert-info lead" id="alert-area" style="display:none"> | 74 | <div class="alert alert-info lead" id="alert-area" style="display:none"> |
74 | <button type="button" class="close" id="dismiss-alert" data-dismiss="alert">×</button> | 75 | <button type="button" class="close" id="dismiss-alert" data-dismiss="alert">×</button> |
75 | <span id="alert-msg"></span> | 76 | <span id="alert-msg"></span> |
76 | <p style="margin-top:10px;"><a href="{% url 'project' project.id %}">Go to project configuration</a></p> | ||
77 | </div> | 77 | </div> |
78 | <ul class="nav nav-pills"> | 78 | <ul class="nav nav-pills"> |
79 | <li class="active"> | 79 | <li class="active"> |