summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2016-03-07 12:03:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 17:23:03 +0000
commit5b8b3993e4a070c850ff31d5c150fca3f2681de9 (patch)
tree5598c43d21974c1f6e5d5d124285d32b98e2117e /bitbake/lib/toaster
parent07ead9869a9a7f9a006bf1ab135a3f6d5ba52a2d (diff)
downloadpoky-5b8b3993e4a070c850ff31d5c150fca3f2681de9.tar.gz
bitbake: toaster: change 'revision' to 'Git revision'
I've received some feedback on the 'Revision' label we use in the import layer page. It is not quite communicating that what's required is a Git revision. Changing it to 'Git revision' to make it a bit more specific. The change applies not only to the import layer page, but to all pages showing revision information in the project configuration section. For more on the feedback received, check https://bugzilla.yoctoproject.org/show_bug.cgi?id=8429#c3 (Bitbake rev: 09392f36a4f115c2432302125e8cac48a9aa304f) Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/base.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/importlayer.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layerdetails.html2
4 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 71892e2f33..67a659222f 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -158,7 +158,7 @@ class LayersTable(ToasterTable):
158 {% endwith %} 158 {% endwith %}
159 ''' 159 '''
160 160
161 self.add_column(title="Revision", 161 self.add_column(title="Git revision",
162 help_text="The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", 162 help_text="The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project",
163 static_data_name="revision", 163 static_data_name="revision",
164 static_data_template=revision_template) 164 static_data_template=revision_template)
@@ -269,7 +269,7 @@ class MachinesTable(ToasterTable):
269 static_data_template=layer_link_template, 269 static_data_template=layer_link_template,
270 orderable=True) 270 orderable=True)
271 271
272 self.add_column(title="Revision", 272 self.add_column(title="Git revision",
273 help_text="The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", 273 help_text="The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project",
274 hidden=True, 274 hidden=True,
275 field_name="layer_version__get_vcs_reference") 275 field_name="layer_version__get_vcs_reference")
@@ -428,7 +428,7 @@ class RecipesTable(ToasterTable):
428 orderable=True, 428 orderable=True,
429 field_name="license") 429 field_name="license")
430 430
431 self.add_column(title="Revision", 431 self.add_column(title="Git revision",
432 hidden=True, 432 hidden=True,
433 field_name="layer_version__get_vcs_reference") 433 field_name="layer_version__get_vcs_reference")
434 434
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 6994bcc9ad..121a75c49a 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -77,7 +77,7 @@
77 <span class="brand"> 77 <span class="brand">
78 <a href="/">Toaster</a> 78 <a href="/">Toaster</a>
79 {% if DEBUG %} 79 {% if DEBUG %}
80 <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i> 80 <i class="icon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Git branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Git revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i>
81 {% endif %} 81 {% endif %}
82 </span> 82 </span>
83 {% if request.resolver_match.url_name != 'landing' and request.resolver_match.url_name != 'newproject' %} 83 {% if request.resolver_match.url_name != 'landing' and request.resolver_match.url_name != 'newproject' %}
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index 033f0aedeb..1848f410e6 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html
@@ -89,7 +89,7 @@
89 <input type="text" id="layer-subdir"> 89 <input type="text" id="layer-subdir">
90 90
91 <div class="control-group" id="layer-revision-ctrl"> 91 <div class="control-group" id="layer-revision-ctrl">
92 <label class="control-label project-form" for="layer-git-ref">Revision 92 <label class="control-label project-form" for="layer-git-ref">Git revision
93 <span class="icon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span> 93 <span class="icon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
94 </label> 94 </label>
95 <div class="controls"> 95 <div class="controls">
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index f9600612d5..82be3703b6 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -154,7 +154,7 @@
154 </dd> 154 </dd>
155 <dt> 155 <dt>
156 <i class="icon-question-sign get-help" title="The Git branch, tag or commit"></i> 156 <i class="icon-question-sign get-help" title="The Git branch, tag or commit"></i>
157 Revision 157 Git revision
158 </dt> 158 </dt>
159 <dd> 159 <dd>
160 <span class="current-value">{{layerversion.get_vcs_reference}}</span> 160 <span class="current-value">{{layerversion.get_vcs_reference}}</span>