diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-03-19 11:09:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-25 12:39:52 +0000 |
commit | fb7160e4228d49a765006d9ba0b810be9f083989 (patch) | |
tree | 47169c98dee3d379bd853fc4843fd7f5dc466133 /bitbake/lib/toaster | |
parent | e1a5d8150032b884bd85fcb20de14cd14cfd2b92 (diff) | |
download | poky-fb7160e4228d49a765006d9ba0b810be9f083989.tar.gz |
bitbake: 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]
(Bitbake rev: cbf3d652dcbfc1db527eb13cd796fa57d8ff3748)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/targets.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 0f538b9ffb..65c0919bc9 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
@@ -299,7 +299,7 @@ vim: expandtab tabstop=2 | |||
299 | <a href="{% url 'importlayer' %}">Import layer</a></p> | 299 | <a href="{% url 'importlayer' %}">Import layer</a></p> |
300 | <ul class="unstyled configuration-list"> | 300 | <ul class="unstyled configuration-list"> |
301 | <li ng-repeat="l in layers track by l.id" class="animate-repeat"> | 301 | <li ng-repeat="l in layers track by l.id" class="animate-repeat"> |
302 | <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a> | 302 | <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip-placement="right" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a> |
303 | <i class="icon-trash" ng-click="layerDel(l.id)" tooltip="Delete"></i> | 303 | <i class="icon-trash" ng-click="layerDel(l.id)" tooltip="Delete"></i> |
304 | </li> | 304 | </li> |
305 | </ul> | 305 | </ul> |
@@ -434,7 +434,7 @@ angular.element(document).ready(function() { | |||
434 | scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}"; | 434 | scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}"; |
435 | scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}"; | 435 | scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}"; |
436 | scope.urls.layers = "{% url 'layers' %}"; | 436 | scope.urls.layers = "{% url 'layers' %}"; |
437 | scope.urls.targets = "{% url 'targets' %}"; | 437 | scope.urls.targets = "{% url 'all-targets' %}"; |
438 | scope.urls.importlayer = "{% url 'importlayer'%}"; | 438 | scope.urls.importlayer = "{% url 'importlayer'%}"; |
439 | scope.urls.layer = "{% url 'base_layerdetails' %}"; | 439 | scope.urls.layer = "{% url 'base_layerdetails' %}"; |
440 | scope.project = {{prj|json}}; | 440 | scope.project = {{prj|json}}; |
diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html index f918d6cff2..27ff2be928 100644 --- a/bitbake/lib/toaster/toastergui/templates/targets.html +++ b/bitbake/lib/toaster/toastergui/templates/targets.html | |||
@@ -38,7 +38,7 @@ | |||
38 | {% else %} | 38 | {% else %} |
39 | <div class="alert alert-info"> | 39 | <div class="alert alert-info"> |
40 | <p class="lead"> | 40 | <p class="lead"> |
41 | Toaster has not target information. To generate target information you can:<br/> | 41 | Toaster has no target information. To generate target information you can:<br/> |
42 | <ul class="lead"> | 42 | <ul class="lead"> |
43 | <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> | 43 | <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> |
44 | <li style="margin-top: 10px"> <a href="{% url 'importlayer' %}">Import a layer</a></li> | 44 | <li style="margin-top: 10px"> <a href="{% url 'importlayer' %}">Import a layer</a></li> |