[PATCH 40/51] series: Move the series table into its own template file

Damien Lespiau damien.lespiau at intel.com
Sat Sep 12 01:55:13 AEST 2015


So it can be shared between the series list page and the TODO page.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 patchwork/templates/patchwork/series-list.html     | 33 +---------------------
 .../patchwork/series-list-table.html               | 18 +-----------
 2 files changed, 2 insertions(+), 49 deletions(-)
 copy patchwork/templates/patchwork/series-list.html => templates/patchwork/series-list-table.html (63%)

diff --git a/patchwork/templates/patchwork/series-list.html b/patchwork/templates/patchwork/series-list.html
index 7cf0ba9..ab83d11 100644
--- a/patchwork/templates/patchwork/series-list.html
+++ b/patchwork/templates/patchwork/series-list.html
@@ -16,37 +16,6 @@ $(function () {
 {% block body %}
 <h2>Incoming Series</h2>
 
-<nav class="navbar navbar-default">
-  <div class="container-fluid">
-    <ul class="nav navbar-nav navbar-right">
-     <li>
-      <div class="navbar-form pull-right">
-        <label>Show: </label>
-        <select id="dynatable-per-page-serieslist" class="form-control">
-        </select>
-      </div>
-     </li>
-    </ul>
-  </div>
-</nav>
-
-<div class='dynatable-pagination-links-serieslist'></div>
-
-<table class="table table-hover table-condensed pw-list" id="serieslist">
-<thead>
-  <tr>
-    <th>Series</th>
-    <th>Patches</th>
-    <th>Reviewer</th>
-    <th>Submitter</th>
-    <th>Submitted</th>
-    <th>Updated</th>
-  </tr>
-</thead>
-<tbody>
-</tbody>
-</table>
-
-<div class='dynatable-pagination-links-serieslist'></div>
+{% include "patchwork/series-list-table.html" %}
 
 {% endblock %}
diff --git a/patchwork/templates/patchwork/series-list.html b/templates/patchwork/series-list-table.html
similarity index 63%
copy from patchwork/templates/patchwork/series-list.html
copy to templates/patchwork/series-list-table.html
index 7cf0ba9..8ac77e4 100644
--- a/patchwork/templates/patchwork/series-list.html
+++ b/templates/patchwork/series-list-table.html
@@ -1,20 +1,4 @@
-{% extends "base.html" %}
 
-{% load person %}
-
-{% block title %}{{project.name}}{% endblock %}
-{% block heading %}{{project.name}}{% endblock %}
-{% block headers %}
-<script language="JavaScript" type="text/javascript">
-$(function () {
-    pw.setup_series_list('#serieslist');
-});
-</script>
-{% endblock %}
-{% block breadcrumb %}{{ project.name }} series{% endblock %}
-
-{% block body %}
-<h2>Incoming Series</h2>
 
 <nav class="navbar navbar-default">
   <div class="container-fluid">
@@ -49,4 +33,4 @@ $(function () {
 
 <div class='dynatable-pagination-links-serieslist'></div>
 
-{% endblock %}
+<div style="clear: both;"/>
-- 
2.1.0



More information about the Patchwork mailing list