sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: Formatting changes to error messages 

Just giving a bit of space to the content of the error
messages we show when you try to import a layer that
already exists.

(Bitbake rev: 19b8ff1949072691dade96038af529200175843a)

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 2014-12-05 11:26:29 +00:00 committed by Richard Purdie
parent c89fd79398
commit 6f3f05936c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/toaster/toastergui/static/js/importlayer.js
View File

@ -169,7 +169,7 @@ function importLayerPageInit (ctx) {
var errorMsg = $("#import-error").fadeIn();
var errorType = error.error;
var body = errorMsg.children("span");
var body = errorMsg.children("p");
var title = errorMsg.children("h3");
var optionsList = errorMsg.children("ul");
var invalidLayerRevision = $("#invalid-layer-revision-hint");
@ -198,7 +198,7 @@ function importLayerPageInit (ctx) {
case 'hint-layer-exists-with-different-url':
title.text("This layer already exists");
body.html("A layer <strong>"+layerData.name+"</strong> already exists with a different Git repository URL:<br /><br />"+error.current_url+"<br /><br />You Can:");
body.html("A layer <strong>"+layerData.name+"</strong> already exists with a different Git repository URL:<p style='margin-top:10px;'><strong>"+error.current_url+"</strong></p><p>You can:</p>");
optionsList.append("<li>Import the layer under a different name</li>");
optionsList.append("<li>or <a href=\""+ctx.layerDetailsUrl+error.current_id+"/\" >change the Git repository URL of the existing layer</a></li>");
duplicatedLayerName.html("A layer <strong>"+layerData.name+"</strong> already exists with a different Git repository URL.<br />To import this layer give it a different name.");
@ -208,7 +208,7 @@ function importLayerPageInit (ctx) {
case 'hint-layer-exists':
title.text("This layer already exists");
body.html("A layer <strong>"+layerData.name+"</strong> already exists: You Can:");
body.html("A layer <strong>"+layerData.name+"</strong> already exists. You can:");
optionsList.append("<li>Import the layer under a different name</li>");
break;
default:

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

@ -43,7 +43,7 @@
<div class="alert alert-error" id="import-error" style="display:none">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<h3></h3>
<span></span>
<p></p>
<ul></ul>
</div>