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.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>

diff --git a/lib/toaster/bldviewer/templates/simple_base.html b/lib/toaster/bldviewer/templates/simple_base.html
index d58cbeaed57fdce8fe8090c2255f65b75ccb695b..2d63dcdd10628383f367311c70a95850f7974d16 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_base.html
+++ b/lib/toaster/bldviewer/templates/simple_base.html
@@ -14,8 +14,8 @@
 <div style="width:100%; height: 100%; position:absolute">
 <div style="width: 100%; height: 3em" class="nav">
     <ul class="nav nav-tabs">
-        <li><a href="{% url "all-builds" %}">All Builds</a></li>
-        <li><a href="{% url "all-layers" %}">All Layers</a></li>
+        <li><a href="{% url "simple-all-builds" %}">All Builds</a></li>
+        <li><a href="{% url "simple-all-layers" %}">All Layers</a></li>
     </ul>
 </div>
 

diff --git a/lib/toaster/bldviewer/templates/simple_basebuildpage.html b/lib/toaster/bldviewer/templates/simple_basebuildpage.html
index 8d64e2deb61651d4c68fcf67e4fd7376a881e831..6cdc31d198436f95a44387fdf528e1c3d3c86988 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_basebuildpage.html
+++ b/lib/toaster/bldviewer/templates/simple_basebuildpage.html
@@ -3,14 +3,14 @@
 {% block pagename %}
 <ul class="nav nav-tabs" style="display: inline-block">
   <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li>
-  <li><a href="{% url "task" build.id %}"> Tasks </a></li>
-  <li><a href="{% url "bpackage" build.id %}"> Build Packages </a></li>
+  <li><a href="{% url "simple-task" build.id %}"> Tasks </a></li>
+  <li><a href="{% url "simple-bpackage" build.id %}"> Build Packages </a></li>
     {% for t in build.target_set.all %}
         {% if t.is_image %}
-  <li><a href="{% url "tpackage" build.id t.pk %}"> Packages for {{t.target}} </a> </li>
+  <li><a href="{% url "simple-tpackage" build.id t.pk %}"> Packages for {{t.target}} </a> </li>
         {% endif %}
     {% endfor %}
-  <li><a href="{% url "configuration" build.id %}"> Configuration </a> </li>
+  <li><a href="{% url "simple-configuration" build.id %}"> Configuration </a> </li>
 </ul>
      <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1>
 {% endblock %}

diff --git a/lib/toaster/bldviewer/templates/simple_bpackage.html b/lib/toaster/bldviewer/templates/simple_bpackage.html
index 37ceb623151e242af9e5fe5b441041d953b98c33..b7892f860a3965700ee81b4df25699c0238f38d5 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_bpackage.html
+++ b/lib/toaster/bldviewer/templates/simple_bpackage.html
@@ -21,9 +21,9 @@
             {% for package in objects %}
 
             <tr class="data">
-                <td><a name="#{{package.name}}" href="{% url "bfile" build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td>
+                <td><a name="#{{package.name}}" href="{% url "simple-bfile" build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td>
                 <td>{{package.version}}-{{package.revision}}</td>
-                <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>
+                <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>
 
             <td>{{package.summary}}</td>
             <td>{{package.section}}</td>

diff --git a/lib/toaster/bldviewer/templates/simple_build.html b/lib/toaster/bldviewer/templates/simple_build.html
index 985bcfdf8b37feeecdc682da4c86f5ac0742aecf..ecd19df94cef026e53ff4ce3b7e08437b5e662eb 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_build.html
+++ b/lib/toaster/bldviewer/templates/simple_build.html
@@ -23,10 +23,10 @@
         </tr>
         {% for build in objects %}
         <tr class="data">
-            <td><a href="{% url "configuration" build.id %}">{{build.get_outcome_display}}</a></td>
+            <td><a href="{% url "simple-configuration" build.id %}">{{build.get_outcome_display}}</a></td>
             <td>{{build.started_on}}</td>
             <td>{{build.completed_on}}</td>
-            <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>
+            <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>
             <td>{{build.machine}}</td>
             <td>{% time_difference build.started_on build.completed_on %}</td>
             <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/lib/toaster/bldviewer/templates/simple_layer.html b/lib/toaster/bldviewer/templates/simple_layer.html
index 35dd99e28489ad9e34fec3975ba1d698246f346d..ae7172d9a0abdedb1eb3f3aa52514875e109685b 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_layer.html
+++ b/lib/toaster/bldviewer/templates/simple_layer.html
@@ -23,7 +23,7 @@
             <td><table>
             {% for lv in layer.versions %}
                 <tr><td>
-        <a href="{% url "layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
+        <a href="{% url "simple-layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
                 </td></tr>
             {% endfor %}
             </table></td>

diff --git a/lib/toaster/bldviewer/templates/simple_package.html b/lib/toaster/bldviewer/templates/simple_package.html
index 29df0ca9a1b7632635394ef1f8cab08ef7bc4a81..2ac5d6616cf0b1f03e726b61edec27c191131b48 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_package.html
+++ b/lib/toaster/bldviewer/templates/simple_package.html
@@ -20,7 +20,7 @@
                 <td>{{package.version}}</td>
                 <td>{{package.size}}</td>
                 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
-                <a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
+                <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>
                 <td>
             <div style="height: 4em; overflow:auto">
                     {% for d in package.package_dependencies_source.all %}

diff --git a/lib/toaster/bldviewer/templates/simple_task.html b/lib/toaster/bldviewer/templates/simple_task.html
index 3247ea94f5014fbaea47696804b32a634d49cb5e..cb6f309fefa0bd834fd86c37687a30c8e6131d79 100644 (file)
--- a/lib/toaster/bldviewer/templates/simple_task.html
+++ b/lib/toaster/bldviewer/templates/simple_task.html
@@ -27,7 +27,7 @@
             <tr class="data">
                 <td>{{task.order}}</td>
                 <td><a name="{{task.recipe.name}}.{{task.task_name}}">
-                <a href="{% url "layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
+                <a href="{% url "simple-layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
                 <td>{{task.recipe.version}}</td>
 
                 {% if task.task_executed %}

diff --git a/lib/toaster/bldviewer/urls.py b/lib/toaster/bldviewer/urls.py
index b84c95f08bad74f1e99b7dbefa934bb6ba8669c2..354b729655652b3be5f0d40345d755bfcb7266ff 100644 (file)
--- a/lib/toaster/bldviewer/urls.py
+++ b/lib/toaster/bldviewer/urls.py
@@ -20,13 +20,13 @@ from django.conf.urls import patterns, include, url
 from django.views.generic import RedirectView
 
 urlpatterns = patterns('bldviewer.views',
-        url(r'^builds/$', 'build', name='all-builds'),
-        url(r'^build/(?P<build_id>\d+)/task/$', 'task', name='task'),
-        url(r'^build/(?P<build_id>\d+)/packages/$', 'bpackage', name='bpackage'),
-        url(r'^build/(?P<build_id>\d+)/package/(?P<package_id>\d+)/files/$', 'bfile', name='bfile'),
-        url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages/$', 'tpackage', name='tpackage'),
-        url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='configuration'),
-        url(r'^layers/$', 'layer', name='all-layers'),
-        url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'),
+        url(r'^builds/$', 'build', name='simple-all-builds'),
+        url(r'^build/(?P<build_id>\d+)/task/$', 'task', name='simple-task'),
+        url(r'^build/(?P<build_id>\d+)/packages/$', 'bpackage', name='simple-bpackage'),
+        url(r'^build/(?P<build_id>\d+)/package/(?P<package_id>\d+)/files/$', 'bfile', name='simple-bfile'),
+        url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages/$', 'tpackage', name='simple-tpackage'),
+        url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='simple-configuration'),
+        url(r'^layers/$', 'layer', name='simple-all-layers'),
+        url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='simple-layer_versions_recipes'),
         url(r'^$', RedirectView.as_view( url= 'builds/')),
 )