templates: Keep only whole templates in the top-level

Again, this should make this a little more understandable as it ensures
a rough mapping exists between views and template names.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index 2042cb9618e18c4e51ae930b0d0c0bc602c865f0..b5c9f90a4afdb24e66f4ad9952e6fdc444bc3bf3 100644 (file)
--- a/patchwork/templates/patchwork/bundle.html
+++ b/patchwork/templates/patchwork/bundle.html
@@ -40,6 +40,6 @@ project.</p>
 <div style="clear: both; padding: 1em;"></div>
 {% endif %}
 
-{% include "patchwork/patch-list.html" %}
+{% include "patchwork/partials/patch-list.html" %}
 
 {% endblock %}

diff --git a/patchwork/templates/patchwork/list.html b/patchwork/templates/patchwork/list.html
index 180c56078b971373c6cefca8e25b0054428a03ba..5d3d82aa198e1d8cb0170af5b9307eb1bfbb4fae 100644 (file)
--- a/patchwork/templates/patchwork/list.html
+++ b/patchwork/templates/patchwork/list.html
@@ -18,6 +18,6 @@ while updating patches:</p>
 </ul>
 {% endif %}
 
-{% include "patchwork/patch-list.html" %}
+{% include "patchwork/partials/patch-list.html" %}
 
 {% endblock %}

diff --git a/patchwork/templates/patchwork/download-buttons.html b/patchwork/templates/patchwork/partials/download-buttons.html
similarity index 100%
rename from patchwork/templates/patchwork/download-buttons.html
rename to patchwork/templates/patchwork/partials/download-buttons.html

diff --git a/patchwork/templates/patchwork/filters.html b/patchwork/templates/patchwork/partials/filters.html
similarity index 100%
rename from patchwork/templates/patchwork/filters.html
rename to patchwork/templates/patchwork/partials/filters.html

diff --git a/patchwork/templates/patchwork/pagination.html b/patchwork/templates/patchwork/partials/pagination.html
similarity index 100%
rename from patchwork/templates/patchwork/pagination.html
rename to patchwork/templates/patchwork/partials/pagination.html

diff --git a/patchwork/templates/patchwork/patch-list.html b/patchwork/templates/patchwork/partials/patch-list.html
similarity index 98%
rename from patchwork/templates/patchwork/patch-list.html
rename to patchwork/templates/patchwork/partials/patch-list.html
index 71c1ba927d1b4cdd72c4a23b2e8448bf9ba93ac6..53d577de306032954b1fc02730d96d9a2dafc47c 100644 (file)
--- a/patchwork/templates/patchwork/patch-list.html
+++ b/patchwork/templates/patchwork/partials/patch-list.html
@@ -4,9 +4,9 @@
 {% load project %}
 {% load static %}
 
-{% include "patchwork/filters.html" %}
+{% include "patchwork/partials/filters.html" %}
 
-{% include "patchwork/pagination.html" %}
+{% include "patchwork/partials/pagination.html" %}
 
 {% if order.editable %}
 <table class="patchlist">
@@ -218,7 +218,7 @@ $(document).ready(function() {
 </table>
 
 {% if page.paginator.count %}
-{% include "patchwork/pagination.html" %}
+{% include "patchwork/partials/pagination.html" %}
 
 <div class="patchforms" id="patchforms">
 

diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html
index 6e189b27359ac67a6feec8d839da28d9a57b98c5..eb5e3583823dab4bd52bd75d7ec80e2ef0da0dc1 100644 (file)
--- a/patchwork/templates/patchwork/submission.html
+++ b/patchwork/templates/patchwork/submission.html
@@ -28,7 +28,7 @@ function toggle_div(link_id, headers_id)
 </script>
 
 <h1>{{ submission.name }}
-{% include "patchwork/download-buttons.html" %}
+{% include "patchwork/partials/download-buttons.html" %}
 </h1>
 
 <table class="patchmeta">
@@ -285,7 +285,7 @@ function toggle_div(link_id, headers_id)
 {% if submission.diff %}
 <h2>
  Patch
- {% include "patchwork/download-buttons.html" %}
+ {% include "patchwork/partials/download-buttons.html" %}
 </h2>
 
 <div id="patch" class="patch">

diff --git a/patchwork/templates/patchwork/todo-list.html b/patchwork/templates/patchwork/todo-list.html
index 444baa01a365487d683f924fd904f736f58179f6..1ec2713d7c0b56f2cd002229499bb63c755f6732 100644 (file)
--- a/patchwork/templates/patchwork/todo-list.html
+++ b/patchwork/templates/patchwork/todo-list.html
@@ -12,6 +12,6 @@ are in an "action required" state
 ({% for state in action_required_states %}{% if forloop.last and not forloop.first %} or {% endif %}{{ state }}{% if not forloop.last and not forloop.first %}, {%endif %}{% endfor %}), and are not archived.
 </p>
 
-{% include "patchwork/patch-list.html" %}
+{% include "patchwork/partials/patch-list.html" %}
 
 {% endblock %}