9 files changed, 8 insertions, 85 deletions
diff --git a/templates/web/oxfordshire/around/around_map_list_items.html b/templates/web/oxfordshire/around/around_map_list_items.html
deleted file mode 100644
index e69de29bb..000000000
--- a/templates/web/oxfordshire/around/around_map_list_items.html
+++ /dev/null
diff --git a/templates/web/oxfordshire/around/on_map_list_items.html b/templates/web/oxfordshire/around/on_map_list_items.html
deleted file mode 100644
index 893f5c698..000000000
--- a/templates/web/oxfordshire/around/on_map_list_items.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[% all_reports = on_map.merge(around_map) %]
-[% IF all_reports.size %]
-    [% FOREACH problem IN all_reports %]
-        [% UNLESS problem.title; problem = problem.problem; END %]
-        [% INCLUDE "reports/_list-entry.html" %]
-    [% END %]
-[% ELSE %]
-    <li class="empty">
-        <p>[% loc('There are no reports to show.') %]</p>
-    </li>
-[% END %]
diff --git a/templates/web/oxfordshire/around/tabbed_lists.html b/templates/web/oxfordshire/around/tabbed_lists.html
deleted file mode 100644
index 0d7dfddfc..000000000
--- a/templates/web/oxfordshire/around/tabbed_lists.html
+++ /dev/null
@@ -1,5 +0,0 @@
-[% INCLUDE "reports/_list-filters.html" %]
-
-<ul class="report-list" id="current">
-    [% INCLUDE "around/on_map_list_items.html" %]
-</ul>
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index ed84c0ad6..3153125fd 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -10,11 +10,11 @@
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
                 <div id="main-nav" role="navigation">
-                    <ul id="mysoc-menu">
+                    <ul class="nav-menu nav-menu--mysoc">
                         <li><a id="mysoc-logo" href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
 
-                    <ul id="main-menu">
+                    <ul class="nav-menu nav-menu--main">
                         <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
                             >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
diff --git a/templates/web/oxfordshire/front/_list-entry.html b/templates/web/oxfordshire/front/_list-entry.html
new file mode 100755
index 000000000..046c3b97f
--- /dev/null
+++ b/templates/web/oxfordshire/front/_list-entry.html
@@ -0,0 +1 @@
+[% INCLUDE 'report/_item.html' no_fixed = 1 item_extra_class = 'item-list__item--with-pin' %]
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index bc52a0720..b4244a51b 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -1,8 +1,8 @@
 <!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]>   <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]>   <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]>   <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]>   <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
 <!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/oxfordshire/my/_problem-list.html b/templates/web/oxfordshire/my/_problem-list.html
deleted file mode 100644
index 1ff69f9fb..000000000
--- a/templates/web/oxfordshire/my/_problem-list.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<ul class='issue-list-a full-width'>
-    [% IF problems.all %]
-        [% FOREACH p = problems.all %]
-            [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %]
-        [% END %]
-    [% ELSE %]
-        <li class="empty">
-            <p>[% loc('There are no reports to show.') %]</p>
-        </li>
-    [% END %]
-</ul>
-
-[% IF ! problems.size %]
-<!-- Preserve behaviour of map filters despite map not being shown -->
-<script type="text/javascript">
-    (function($) {
-        $(function() {
-            $(".report-list-filters [type=submit]").hide();
-            $(".report-list-filters select").change(function() {
-                $(this).closest("form").submit();
-            });
-        })
-    })(window.jQuery);
-</script>
-[% END %]
diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html
index cd70410d3..b24ef2260 100644
--- a/templates/web/oxfordshire/reports/_list-entry.html
+++ b/templates/web/oxfordshire/reports/_list-entry.html
@@ -1,6 +1 @@
-<li class="[% c.cobrand.pin_colour(problem) %]">
-    <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]">
-        <h3>[% problem.title | html %]</h3>
-        <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p>
-    </a>
-</li>
+[% INCLUDE 'report/_item-with-pin.html' %]
diff --git a/templates/web/oxfordshire/reports/_list-filters.html b/templates/web/oxfordshire/reports/_list-filters.html
deleted file mode 100644
index 5d610261b..000000000
--- a/templates/web/oxfordshire/reports/_list-filters.html
+++ /dev/null
@@ -1,32 +0,0 @@
-[% IF use_section_wrapper %]
-<section class="full-width">
-    <form method="get" action="">
-[% END %]
-
-        <p class="report-list-filters">
-            <label>
-                Show
-                <select name="status" id="statuses">
-                    <option value="all"[% ' selected' IF filter_status == 'all' %]>all reports</option>
-                    <option value="open"[% ' selected' IF filter_status == 'open' %]>unfixed reports</option>
-                    <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>fixed reports</option>
-                </select>
-            </label>
-            <label>
-                about
-                <select name="filter_category" id="filter_categories">
-                    <option value="">Everything</option>
-                    [% FOR category IN filter_categories %]
-                        <option value="[% category | html %]"[% ' selected' IF filter_category == category %]>
-                            [% category | html %]
-                        </option>
-                    [% END %]
-                </select>
-            </label>
-            <input type=submit value="Go" />
-        </p>
-
-[% IF use_section_wrapper %]
-    </form>
-</section>
-[% END %]