Simplify use of full-width class.

8 files changed, 21 insertions, 32 deletions

diff --git a/templates/web/base/my/_problem-list.html b/templates/web/base/my/_problem-list.html
index e74dd25ec..8b9f51dad 100644
--- a/templates/web/base/my/_problem-list.html
+++ b/templates/web/base/my/_problem-list.html
@@ -1,4 +1,4 @@
-<ul class='item-list item-list--reports full-width'>
+<ul class='item-list item-list--reports'>
     [% IF problems.size %]
         [% FOREACH problem = problems %]
             [% INCLUDE 'reports/_list-entry.html' no_fixed = 1 %]
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index 4d5fed1cd..b93a837ad 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -34,23 +34,21 @@
     [% INCLUDE '_hart_hants_note.html' %]
 [% END %]
 
-[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %]
-
-[% INCLUDE 'pagination.html',
-    pager = problems_pager,
-    param = 'p'
-%]
-
+<section class="full-width">
+[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %]
+[% INCLUDE 'pagination.html', pager = problems_pager, param = 'p' %]
 [% INCLUDE 'my/_problem-list.html' %]
+</section>
 
 [% FOREACH u IN updates %]
     [% IF loop.first %]
         <h2>[% loc('Your updates') %]</h2>
+        <section class="full-width">
         [% INCLUDE 'pagination.html',
             pager = updates_pager,
             param = 'u'
         %]
-        <ul class="item-list item-list--updates full-width">
+        <ul class="item-list item-list--updates">
     [% END %]
 
     <li class="item-list__item item-list__item--updates">
@@ -69,7 +67,7 @@
             </div>
         </div>
     </li>
-    [% "</ul>" IF loop.last %]
+    [% "</ul></section>" IF loop.last %]
 [% END %]
 
         </div>
diff --git a/templates/web/base/pagination.html b/templates/web/base/pagination.html
index 63180b600..f0c51bb10 100644
--- a/templates/web/base/pagination.html
+++ b/templates/web/base/pagination.html
@@ -1,7 +1,4 @@
 [% IF pager.last_page > 1 %]
-[% IF NOT admin %]
-<section class="full-width">
-[% END %]
     <p class="pagination">
         [% IF pager.previous_page %]
             <a class="prev" href="[% c.req.uri_with({ $param => pager.previous_page }) %][% '#' _ hash IF hash %]">[% loc('Previous') %]</a>
@@ -13,7 +10,4 @@
             <a class="next" href="[% c.req.uri_with({ $param => pager.next_page }) %][% '#' _ hash IF hash %]">[% loc('Next') %]</a>
         [% END %]
     </p>
-[% IF NOT admin %]
-</section>
-[% END %]
 [% END %]
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 4dd270dc6..04f80ff50 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -18,8 +18,7 @@
     </select>
 [% END %]
 
-[% IF use_section_wrapper %]
-<section class="full-width">
+[% IF use_form_wrapper %]
     <form method="get" action="">
 [% END %]
 
@@ -28,7 +27,6 @@
             <input type="submit" value="[% loc('Go') %]">
         </p>
 
-[% IF use_section_wrapper %]
+[% IF use_form_wrapper %]
     </form>
-</section>
 [% END %]
diff --git a/templates/web/base/reports/_problem-list.html b/templates/web/base/reports/_problem-list.html
index 4da9e1bb6..5712c79da 100644
--- a/templates/web/base/reports/_problem-list.html
+++ b/templates/web/base/reports/_problem-list.html
@@ -1,8 +1,6 @@
-<section class="full-width">
-    [% INCLUDE column
-        problems = problems.${body.id}
-    %]
-</section>
+[% INCLUDE column
+    problems = problems.${body.id}
+%]
 
 [% BLOCK column %]
     <ul class="item-list item-list--reports">
diff --git a/templates/web/base/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html
index ed341d389..8160668d7 100755
--- a/templates/web/base/reports/_ward-list.html
+++ b/templates/web/base/reports/_ward-list.html
@@ -2,13 +2,15 @@
 <section id="council_wards" class="hidden-js">
 <h2>[% ward_text %]</h2>
     <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
-    <ul class="item-list item-list--wards full-width">
+    <section class="full-width">
+    <ul class="item-list item-list--wards">
       [% FOR child IN children.values.sort('name') %]
         <li class="item-list__item item-list--wards__item">
             <a href="[% child.url %]">[% child.name %]</a>
         </li>
       [% END %]
     </ul>
+    </section>
 </section>
 [% END %]
 
diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html
index 55f9a0881..d0961d2f6 100755
--- a/templates/web/base/reports/body.html
+++ b/templates/web/base/reports/body.html
@@ -59,13 +59,12 @@
 </p>
 [% END %]
 
-[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %]
-
+<section class="full-width">
+[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %]
 [% INCLUDE 'pagination.html', param = 'p' %]
-
 [% INCLUDE 'reports/_problem-list.html' %]
-
 [% INCLUDE 'pagination.html', param = 'p' %]
+</section>
 
     </div>
 </div>
diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html
index 5f7613a1c..f7383dfee 100755
--- a/templates/web/zurich/reports/index.html
+++ b/templates/web/zurich/reports/index.html
@@ -12,9 +12,9 @@
 
         <h1>[% loc('All Reports') %]</h1>
 
+        <section class="full-width">
         [% INCLUDE 'pagination.html', param = 'p' %]
 
-        <section class="full-width">
           [% IF problems.0 %]
             <ul class="item-list item-list--reports">
               [% FOREACH problem IN problems.0 %]
@@ -22,9 +22,9 @@
               [% END %]
             </ul>
           [% END %]
-        </section>
 
         [% INCLUDE 'pagination.html', param = 'p' %]
+        </section>
 
     </div>
 </div>