Refactor/stop double escape in report nav link.

6 files changed, 14 insertions, 43 deletions

diff --git a/templates/web/base/main_nav_items.html b/templates/web/base/main_nav_items.html
index e652f12f6..02999d492 100644
--- a/templates/web/base/main_nav_items.html
+++ b/templates/web/base/main_nav_items.html
@@ -1,12 +1,4 @@
-[%~ IF problem AND NOT problem.non_public ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF latitude AND longitude ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF homepage_template ~%]
-    [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSE ~%]
-    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ END ~%]
+[% INCLUDE 'navigation/_report.html' %]
 
 [%~ IF c.user_exists ~%]
     [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]
diff --git a/templates/web/base/navigation/_report.html b/templates/web/base/navigation/_report.html
new file mode 100644
index 000000000..c00c29585
--- /dev/null
+++ b/templates/web/base/navigation/_report.html
@@ -0,0 +1,9 @@
+[%~ IF problem AND NOT problem.non_public ~%]
+    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
+[%~ ELSIF latitude AND longitude ~%]
+    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
+[%~ ELSIF homepage_template ~%]
+    [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
+[%~ ELSE ~%]
+    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
+[%~ END ~%]
diff --git a/templates/web/bexley/main_nav_items.html b/templates/web/bexley/main_nav_items.html
index 9f85db522..1398f8640 100644
--- a/templates/web/bexley/main_nav_items.html
+++ b/templates/web/bexley/main_nav_items.html
@@ -1,12 +1,4 @@
-[%~ IF problem AND NOT problem.non_public ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF latitude AND longitude ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF homepage_template ~%]
-    [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSE ~%]
-    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ END ~%]
+[% INCLUDE 'navigation/_report.html' %]
 [%~ INCLUDE 'navigation/_all_reports.html' ~%]
 
 [%~
diff --git a/templates/web/highwaysengland/main_nav_items.html b/templates/web/highwaysengland/main_nav_items.html
index 61bc2c15e..82106bdb1 100644
--- a/templates/web/highwaysengland/main_nav_items.html
+++ b/templates/web/highwaysengland/main_nav_items.html
@@ -1,10 +1,4 @@
-[%~ IF problem AND NOT problem.non_public ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF latitude AND longitude ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSE ~%]
-    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ END ~%]
+[% INCLUDE 'navigation/_report.html' %]
 
 [%~ IF c.user_exists ~%]
     [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]
diff --git a/templates/web/hounslow/main_nav_items.html b/templates/web/hounslow/main_nav_items.html
index 6bb323abc..68c1d9000 100644
--- a/templates/web/hounslow/main_nav_items.html
+++ b/templates/web/hounslow/main_nav_items.html
@@ -1,12 +1,4 @@
-[%~ IF problem AND NOT problem.non_public ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF latitude AND longitude ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF homepage_template ~%]
-    [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSE ~%]
-    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ END ~%]
+[% INCLUDE 'navigation/_report.html' %]
 
 [%~ IF c.user_exists ~%]
     [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]
diff --git a/templates/web/isleofwight/main_nav_items.html b/templates/web/isleofwight/main_nav_items.html
index 81df6e599..396be469d 100644
--- a/templates/web/isleofwight/main_nav_items.html
+++ b/templates/web/isleofwight/main_nav_items.html
@@ -1,12 +1,4 @@
-[%~ IF problem ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ problem.longitude _ '&latitude=' _ problem.latitude label=loc('Report another problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF latitude AND longitude ~%]
-    [%~ INCLUDE navitem uri='/report/new?longitude=' _ longitude _ '&latitude=' _ latitude label=loc('Report a problem here') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSIF homepage_template ~%]
-    [%~ INCLUDE navitem uri='/report' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ ELSE ~%]
-    [%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-[%~ END ~%]
+[% INCLUDE 'navigation/_report.html' %]
 
 [%~ IF c.user_exists ~%]
     [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]