Make sure the machines table displays properly with Bootstrap 3.
Signed-off-by: Belen Barros Pena <[email protected]>
---
bitbake/lib/toaster/toastergui/tables.py | 4 ++--
bitbake/lib/toaster/toastergui/templates/machine_btn.html | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bitbake/lib/toaster/toastergui/tables.py
b/bitbake/lib/toaster/toastergui/tables.py
index 1825124..337a335 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -196,7 +196,7 @@ class MachinesTable(ToasterTable):
def __init__(self, *args, **kwargs):
super(MachinesTable, self).__init__(*args, **kwargs)
- self.empty_state = "No machines maybe you need to do a build?"
+ self.empty_state = "Toaster has no machine information for this
project. Sadly, machine information cannot be
obtained from builds, so this page will remain
empty."
self.title = "Compatible machines"
self.default_orderby = "name"
@@ -264,7 +264,7 @@ class MachinesTable(ToasterTable):
field_name="layer_version__get_vcs_reference")
machine_file_template = '''<code>conf/machine/{{data.name}}.conf</code>
- <a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><i
class="icon-share get-info"></i></a>'''
+ <a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><span
class="glyphicon glyphicon-new-window"></i></a>'''
self.add_column(title="Machine file",
hidden=True,
diff --git a/bitbake/lib/toaster/toastergui/templates/machine_btn.html
b/bitbake/lib/toaster/toastergui/templates/machine_btn.html
index 7093a29..5d93d7a 100644
--- a/bitbake/lib/toaster/toastergui/templates/machine_btn.html
+++ b/bitbake/lib/toaster/toastergui/templates/machine_btn.html
@@ -1,16 +1,16 @@
-<a href="{% url 'project' extra.pid %}?setMachine={{data.name}}" class="btn
btn-block layer-exists-{{data.layer_version.id}}"
+<a href="{% url 'project' extra.pid %}?setMachine={{data.name}}" class="btn
btn-default btn-block layer-exists-{{data.layer_version.id}}"
{% if data.layer_version.pk not in extra.current_layers %}
style="display:none;"
{% endif %}
>
Select machine</a>
-<button class="btn btn-block layerbtn layer-add-{{data.layer_version.id}}"
data-layer='{ "id": {{data.layer_version.id}}, "name":
"{{data.layer_version.layer.name}}", "layerdetailurl": "{%url 'layerdetails'
extra.pid data.layer_version.id %}"}' data-directive="add"
+<a class="btn btn-default btn-block layerbtn
layer-add-{{data.layer_version.id}}" data-layer='{ "id":
{{data.layer_version.id}}, "name": "{{data.layer_version.layer.name}}",
"layerdetailurl": "{%url 'layerdetails' extra.pid data.layer_version.id %}"}'
data-directive="add"
{% if data.layer_version.pk in extra.current_layers %}
style="display:none;"
{% endif %}
>
- <i class="glyphicon glyphicon-plus"></i>
+ <span class="glyphicon glyphicon-plus"></span>
Add layer
- <i title="" class="icon-question-sign get-help" data-original-title="To
enable this machine, you must first add the {{data.layer_version.layer.name}}
layer to your project"></i>
-</button>
+ <span class="glyphicon glyphicon-question-sign get-help" title="To select
this machine, you must first add the {{data.layer_version.layer.name}} layer to
your project"></i>
+</a>
--
1.9.1
--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
