[bitbake-devel] [PATCH 16/18] toaster: Formatting changes to error messages
Alex DAMIAN
alexandru.damian at intel.com
Fri Dec 12 11:45:15 UTC 2014
From: Belen Barros Pena <belen.barros.pena at intel.com>
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.
Signed-off-by: Belen Barros Pena <belen.barros.pena at intel.com>
---
lib/toaster/toastergui/static/js/importlayer.js | 6 +++---
lib/toaster/toastergui/templates/importlayer.html | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/toaster/toastergui/static/js/importlayer.js b/lib/toaster/toastergui/static/js/importlayer.js
index 5748efd..d6e140f 100644
--- a/lib/toaster/toastergui/static/js/importlayer.js
+++ b/lib/toaster/toastergui/static/js/importlayer.js
@@ -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:
diff --git a/lib/toaster/toastergui/templates/importlayer.html b/lib/toaster/toastergui/templates/importlayer.html
index c59247f..c92e552 100644
--- a/lib/toaster/toastergui/templates/importlayer.html
+++ b/lib/toaster/toastergui/templates/importlayer.html
@@ -43,7 +43,7 @@
<div class="alert alert-error" id="import-error" style="display:none">
<button type="button" class="close" data-dismiss="alert">×</button>
<h3></h3>
- <span></span>
+ <p></p>
<ul></ul>
</div>
--
1.9.1
More information about the bitbake-devel
mailing list