summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-01-13 17:03:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-27 21:01:03 +0000
commit3e1dbed33822dd949336022bc155cc5435719b38 (patch)
treefe6c560e4f166ec7c2451c5cae9f0897ae415e5d /bitbake/lib
parent43a3f471893f5b5cbb3c15e67031a6c17f40a3b6 (diff)
downloadpoky-3e1dbed33822dd949336022bc155cc5435719b38.tar.gz
bitbake: toaster: update Simple UI references to avoid conflict
Since the Toaster GUI was cloned from the Simple UI, we need to update the URL pattern names in Simple UI to prevent conflict when determining the reverse URL path. (Bitbake rev: 6ed1a28eb0e52a6de83a37664ff6f4418ce84ee4) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_base.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html8
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_build.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_layer.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_package.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/simple_task.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/urls.py16
8 files changed, 21 insertions, 21 deletions
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_base.html b/bitbake/lib/toaster/bldviewer/templates/simple_base.html
index d58cbeaed5..2d63dcdd10 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_base.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_base.html
@@ -14,8 +14,8 @@
14<div style="width:100%; height: 100%; position:absolute"> 14<div style="width:100%; height: 100%; position:absolute">
15<div style="width: 100%; height: 3em" class="nav"> 15<div style="width: 100%; height: 3em" class="nav">
16 <ul class="nav nav-tabs"> 16 <ul class="nav nav-tabs">
17 <li><a href="{% url "all-builds" %}">All Builds</a></li> 17 <li><a href="{% url "simple-all-builds" %}">All Builds</a></li>
18 <li><a href="{% url "all-layers" %}">All Layers</a></li> 18 <li><a href="{% url "simple-all-layers" %}">All Layers</a></li>
19 </ul> 19 </ul>
20</div> 20</div>
21 21
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html
index 8d64e2deb6..6cdc31d198 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html
@@ -3,14 +3,14 @@
3{% block pagename %} 3{% block pagename %}
4<ul class="nav nav-tabs" style="display: inline-block"> 4<ul class="nav nav-tabs" style="display: inline-block">
5 <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li> 5 <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li>
6 <li><a href="{% url "task" build.id %}"> Tasks </a></li> 6 <li><a href="{% url "simple-task" build.id %}"> Tasks </a></li>
7 <li><a href="{% url "bpackage" build.id %}"> Build Packages </a></li> 7 <li><a href="{% url "simple-bpackage" build.id %}"> Build Packages </a></li>
8 {% for t in build.target_set.all %} 8 {% for t in build.target_set.all %}
9 {% if t.is_image %} 9 {% if t.is_image %}
10 <li><a href="{% url "tpackage" build.id t.pk %}"> Packages for {{t.target}} </a> </li> 10 <li><a href="{% url "simple-tpackage" build.id t.pk %}"> Packages for {{t.target}} </a> </li>
11 {% endif %} 11 {% endif %}
12 {% endfor %} 12 {% endfor %}
13 <li><a href="{% url "configuration" build.id %}"> Configuration </a> </li> 13 <li><a href="{% url "simple-configuration" build.id %}"> Configuration </a> </li>
14</ul> 14</ul>
15 <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1> 15 <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1>
16{% endblock %} 16{% endblock %}
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html
index 37ceb62315..b7892f860a 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html
@@ -21,9 +21,9 @@
21 {% for package in objects %} 21 {% for package in objects %}
22 22
23 <tr class="data"> 23 <tr class="data">
24 <td><a name="#{{package.name}}" href="{% url "bfile" build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td> 24 <td><a name="#{{package.name}}" href="{% url "simple-bfile" build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td>
25 <td>{{package.version}}-{{package.revision}}</td> 25 <td>{{package.version}}-{{package.revision}}</td>
26 <td>{%if package.recipe%}<a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td> 26 <td>{%if package.recipe%}<a href="{% url "simple-layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
27 27
28 <td>{{package.summary}}</td> 28 <td>{{package.summary}}</td>
29 <td>{{package.section}}</td> 29 <td>{{package.section}}</td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_build.html b/bitbake/lib/toaster/bldviewer/templates/simple_build.html
index 985bcfdf8b..ecd19df94c 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_build.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_build.html
@@ -23,10 +23,10 @@
23 </tr> 23 </tr>
24 {% for build in objects %} 24 {% for build in objects %}
25 <tr class="data"> 25 <tr class="data">
26 <td><a href="{% url "configuration" build.id %}">{{build.get_outcome_display}}</a></td> 26 <td><a href="{% url "simple-configuration" build.id %}">{{build.get_outcome_display}}</a></td>
27 <td>{{build.started_on}}</td> 27 <td>{{build.started_on}}</td>
28 <td>{{build.completed_on}}</td> 28 <td>{{build.completed_on}}</td>
29 <td>{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "tpackage" build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> 29 <td>{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "simple-tpackage" build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td>
30 <td>{{build.machine}}</td> 30 <td>{{build.machine}}</td>
31 <td>{% time_difference build.started_on build.completed_on %}</td> 31 <td>{% time_difference build.started_on build.completed_on %}</td>
32 <td>{{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}<p>{{error.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td> 32 <td>{{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}<p>{{error.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
index 35dd99e284..ae7172d9a0 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html
@@ -23,7 +23,7 @@
23 <td><table> 23 <td><table>
24 {% for lv in layer.versions %} 24 {% for lv in layer.versions %}
25 <tr><td> 25 <tr><td>
26 <a href="{% url "layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a> 26 <a href="{% url "simple-layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
27 </td></tr> 27 </td></tr>
28 {% endfor %} 28 {% endfor %}
29 </table></td> 29 </table></td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_package.html b/bitbake/lib/toaster/bldviewer/templates/simple_package.html
index 29df0ca9a1..2ac5d6616c 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_package.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_package.html
@@ -20,7 +20,7 @@
20 <td>{{package.version}}</td> 20 <td>{{package.version}}</td>
21 <td>{{package.size}}</td> 21 <td>{{package.size}}</td>
22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}"> 22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
23 <a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td> 23 <a href="{% url "simple-layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
24 <td> 24 <td>
25 <div style="height: 4em; overflow:auto"> 25 <div style="height: 4em; overflow:auto">
26 {% for d in package.package_dependencies_source.all %} 26 {% for d in package.package_dependencies_source.all %}
diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_task.html b/bitbake/lib/toaster/bldviewer/templates/simple_task.html
index 3247ea94f5..cb6f309fef 100644
--- a/bitbake/lib/toaster/bldviewer/templates/simple_task.html
+++ b/bitbake/lib/toaster/bldviewer/templates/simple_task.html
@@ -27,7 +27,7 @@
27 <tr class="data"> 27 <tr class="data">
28 <td>{{task.order}}</td> 28 <td>{{task.order}}</td>
29 <td><a name="{{task.recipe.name}}.{{task.task_name}}"> 29 <td><a name="{{task.recipe.name}}.{{task.task_name}}">
30 <a href="{% url "layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td> 30 <a href="{% url "simple-layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
31 <td>{{task.recipe.version}}</td> 31 <td>{{task.recipe.version}}</td>
32 32
33 {% if task.task_executed %} 33 {% if task.task_executed %}
diff --git a/bitbake/lib/toaster/bldviewer/urls.py b/bitbake/lib/toaster/bldviewer/urls.py
index b84c95f08b..354b729655 100644
--- a/bitbake/lib/toaster/bldviewer/urls.py
+++ b/bitbake/lib/toaster/bldviewer/urls.py
@@ -20,13 +20,13 @@ from django.conf.urls import patterns, include, url
20from django.views.generic import RedirectView 20from django.views.generic import RedirectView
21 21
22urlpatterns = patterns('bldviewer.views', 22urlpatterns = patterns('bldviewer.views',
23 url(r'^builds/$', 'build', name='all-builds'), 23 url(r'^builds/$', 'build', name='simple-all-builds'),
24 url(r'^build/(?P<build_id>\d+)/task/$', 'task', name='task'), 24 url(r'^build/(?P<build_id>\d+)/task/$', 'task', name='simple-task'),
25 url(r'^build/(?P<build_id>\d+)/packages/$', 'bpackage', name='bpackage'), 25 url(r'^build/(?P<build_id>\d+)/packages/$', 'bpackage', name='simple-bpackage'),
26 url(r'^build/(?P<build_id>\d+)/package/(?P<package_id>\d+)/files/$', 'bfile', name='bfile'), 26 url(r'^build/(?P<build_id>\d+)/package/(?P<package_id>\d+)/files/$', 'bfile', name='simple-bfile'),
27 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages/$', 'tpackage', name='tpackage'), 27 url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages/$', 'tpackage', name='simple-tpackage'),
28 url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='configuration'), 28 url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='simple-configuration'),
29 url(r'^layers/$', 'layer', name='all-layers'), 29 url(r'^layers/$', 'layer', name='simple-all-layers'),
30 url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), 30 url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='simple-layer_versions_recipes'),
31 url(r'^$', RedirectView.as_view( url= 'builds/')), 31 url(r'^$', RedirectView.as_view( url= 'builds/')),
32) 32)