summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/importlayer.js6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/importlayer.html2
2 files changed, 4 insertions, 4 deletions
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) {
169 169
170 var errorMsg = $("#import-error").fadeIn(); 170 var errorMsg = $("#import-error").fadeIn();
171 var errorType = error.error; 171 var errorType = error.error;
172 var body = errorMsg.children("span"); 172 var body = errorMsg.children("p");
173 var title = errorMsg.children("h3"); 173 var title = errorMsg.children("h3");
174 var optionsList = errorMsg.children("ul"); 174 var optionsList = errorMsg.children("ul");
175 var invalidLayerRevision = $("#invalid-layer-revision-hint"); 175 var invalidLayerRevision = $("#invalid-layer-revision-hint");
@@ -198,7 +198,7 @@ function importLayerPageInit (ctx) {
198 198
199 case 'hint-layer-exists-with-different-url': 199 case 'hint-layer-exists-with-different-url':
200 title.text("This layer already exists"); 200 title.text("This layer already exists");
201 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:"); 201 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>");
202 optionsList.append("<li>Import the layer under a different name</li>"); 202 optionsList.append("<li>Import the layer under a different name</li>");
203 optionsList.append("<li>or <a href=\""+ctx.layerDetailsUrl+error.current_id+"/\" >change the Git repository URL of the existing layer</a></li>"); 203 optionsList.append("<li>or <a href=\""+ctx.layerDetailsUrl+error.current_id+"/\" >change the Git repository URL of the existing layer</a></li>");
204 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."); 204 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) {
208 208
209 case 'hint-layer-exists': 209 case 'hint-layer-exists':
210 title.text("This layer already exists"); 210 title.text("This layer already exists");
211 body.html("A layer <strong>"+layerData.name+"</strong> already exists: You Can:"); 211 body.html("A layer <strong>"+layerData.name+"</strong> already exists. You can:");
212 optionsList.append("<li>Import the layer under a different name</li>"); 212 optionsList.append("<li>Import the layer under a different name</li>");
213 break; 213 break;
214 default: 214 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 @@
43 <div class="alert alert-error" id="import-error" style="display:none"> 43 <div class="alert alert-error" id="import-error" style="display:none">
44 <button type="button" class="close" data-dismiss="alert">&times;</button> 44 <button type="button" class="close" data-dismiss="alert">&times;</button>
45 <h3></h3> 45 <h3></h3>
46 <span></span> 46 <p></p>
47 <ul></ul> 47 <ul></ul>
48 </div> 48 </div>
49 49