From 6f3f05936c67dd24e04b356a46903720cadeb446 Mon Sep 17 00:00:00 2001
From: Belen Barros Pena <belen.barros.pena@intel.com>
Date: Fri, 5 Dec 2014 11:26:29 +0000
Subject: 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>
---
 bitbake/lib/toaster/toastergui/static/js/importlayer.js   | 6 +++---
 bitbake/lib/toaster/toastergui/templates/importlayer.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'bitbake/lib/toaster')

diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index 5748efd8ce..d6e140ffdc 100644
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/bitbake/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/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index c59247f8a3..c92e55257b 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/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">&times;</button>
                         <h3></h3>
-                        <span></span>
+                        <p></p>
                         <ul></ul>
                       </div>
 
-- 
cgit v1.2.3-54-g00ecf