[oe-commits] [bitbake] 02/44: toaster: tweaks to recipe file downloads
git at git.openembedded.org
git at git.openembedded.org
Mon Jun 13 21:10:50 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit 5d4172bc005efe209de595f6a151ae9ed062d051
Author: Belen Barros Pena <belen.barros.pena at linux.intel.com>
AuthorDate: Thu Apr 28 13:45:17 2016 +0100
toaster: tweaks to recipe file downloads
* In the custom images table, show the recipe file and download icon
only when the recipe file exists and can be downloaded.
* Also in the custom images table, make sure the download icon tooltip
shows on hover.
* In the custom image details page, show the correct icon (download)
next to the recipe file in the right hand column.
* In the custom image details page, show the recipe file and download
icon in the right hand column only when the recipe file exists and can
be downloaded
* Also in the custom image details page, simplify the help text we show
when the 'download' button is disabled: it gave so much information about
what's actually happening under the hood that it was a bit hard to
follow.
Signed-off-by: Belen Barros Pena <belen.barros.pena at linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
---
lib/toaster/toastergui/tables.py | 7 ++-----
lib/toaster/toastergui/templates/customrecipe.html | 8 ++++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index caa2fba..2bbef63 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/lib/toaster/toastergui/tables.py
@@ -495,12 +495,9 @@ class CustomImagesTable(ToasterTable):
static_data_template=name_link_template)
recipe_file_template = '''
- <code>{{data.name}}_{{data.version}}.bb</code>
{% if data.get_base_recipe_file %}
- <a href="{% url 'customrecipedownload' extra.pid data.pk %}">
- <i class="icon-download-alt" data-original-title="Download recipe
- file"></i>
- </a>
+ <code>{{data.name}}_{{data.version}}.bb</code>
+ <a href="{% url 'customrecipedownload' extra.pid data.pk %}" class="icon-download-alt get-help" title="Download recipe file"></a>
{% endif %}'''
self.add_column(title="Recipe file",
diff --git a/lib/toaster/toastergui/templates/customrecipe.html b/lib/toaster/toastergui/templates/customrecipe.html
index aeb4466..4b1ef66 100644
--- a/lib/toaster/toastergui/templates/customrecipe.html
+++ b/lib/toaster/toastergui/templates/customrecipe.html
@@ -107,7 +107,7 @@
Download recipe file
{% if not base_recipe_file %}
<i class="icon-question-sign get-help"
- data-original-title="The {{recipe.name}} recipe cannot yet be downloaded as the Based on recipe '{{recipe.base_recipe.name}}' has not yet been fetched"></i>
+ data-original-title="The recipe file doesn't exist yet, so you cannot download it. You need to build your custom image first"></i>
{% endif %}
</a>
</div>
@@ -182,13 +182,13 @@
</dd>
{% endwith %}
{% endif %}
+ {% if base_recipe_file %}
<dt>Recipe file</dt>
<dd>
<code>{{recipe.name}}_{{recipe.version}}.bb</code>
- {% if base_recipe_path %}
- <a href="{% url 'customrecipedownload' project.pk recipe.pk %}"><i class="icon-share" title="" data-original-title="View recipe file"></i></a>
- {% endif %}
+ <a href="{% url 'customrecipedownload' project.pk recipe.pk %}"><i class="icon-download-alt" title="Download recipe file"></i></a>
</dd>
+ {% endif %}
<dt>Layer</dt>
<dd><a href="{% url 'layerdetails' project.id recipe.layer_version.pk %}">{{recipe.layer_version.layer.name}}</a></dd>
{% if recipe.summary %}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list