summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-03-19 11:09:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-24 22:54:36 +0000
commitcbf3d652dcbfc1db527eb13cd796fa57d8ff3748 (patch)
treec6addae5ce7366daf15f6d71df4a5a4ef5b5f1ed
parentef6e854a50ea6894b0e320025280431a6fc8a9a5 (diff)
downloadbitbake-cbf3d652dcbfc1db527eb13cd796fa57d8ff3748.tar.gz
toaster: Project page fix targets url and tooltip placement
Make sure we point to the all targets page for the notification links. Also fix the tooltip placements and a minor typo on the targets page. [YOCTO #7480] Signed-off-by: Michael Wood <michael.g.wood@intel.com>
-rw-r--r--lib/toaster/toastergui/templates/project.html4
-rw-r--r--lib/toaster/toastergui/templates/targets.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/toaster/toastergui/templates/project.html b/lib/toaster/toastergui/templates/project.html
index 0f538b9ff..65c0919bc 100644
--- a/lib/toaster/toastergui/templates/project.html
+++ b/lib/toaster/toastergui/templates/project.html
@@ -299,7 +299,7 @@ vim: expandtab tabstop=2
<a href="{% url 'importlayer' %}">Import layer</a></p>
<ul class="unstyled configuration-list">
<li ng-repeat="l in layers track by l.id" class="animate-repeat">
- <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a>
+ <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip-placement="right" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a>
<i class="icon-trash" ng-click="layerDel(l.id)" tooltip="Delete"></i>
</li>
</ul>
@@ -434,7 +434,7 @@ angular.element(document).ready(function() {
scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}";
scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}";
scope.urls.layers = "{% url 'layers' %}";
- scope.urls.targets = "{% url 'targets' %}";
+ scope.urls.targets = "{% url 'all-targets' %}";
scope.urls.importlayer = "{% url 'importlayer'%}";
scope.urls.layer = "{% url 'base_layerdetails' %}";
scope.project = {{prj|json}};
diff --git a/lib/toaster/toastergui/templates/targets.html b/lib/toaster/toastergui/templates/targets.html
index f918d6cff..27ff2be92 100644
--- a/lib/toaster/toastergui/templates/targets.html
+++ b/lib/toaster/toastergui/templates/targets.html
@@ -38,7 +38,7 @@
{% else %}
<div class="alert alert-info">
<p class="lead">
- Toaster has not target information. To generate target information you can:<br/>
+ Toaster has no target information. To generate target information you can:<br/>
<ul class="lead">
<li style="margin-top: 10px"> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a></li>
<li style="margin-top: 10px"> <a href="{% url 'importlayer' %}">Import a layer</a></li>