5 files changed, 37 insertions, 3 deletions
diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html
new file mode 100644
index 000000000..0dbd2828d
--- /dev/null
+++ b/templates/web/default/questionnaire/completed.html
@@ -0,0 +1,28 @@
+[% advert_outcome = 1 %]
+
+[% IF been_fixed == 'Unknown' %]
+
+[% loc('<p>Thank you very much for filling in our questionnaire; if you
+get some more information about the status of your problem, please come back to the
+site and leave an update.</p>') %]
+
+[% ELSIF new_state == 'confirmed' OR (!new_state AND problem.state == 'confirmed') %]
+
+[% tprintf( loc('<p style="font-size:150%%">We're sorry to hear that. We have two suggestions: why not try
+<a href="%s">writing direct to your councillor(s)</a>
+or, if it's a problem that could be fixed by local people working together,
+why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>?
+</p>'), c.cobrand.writetothem_url || http://www.writetothem.com %]
+
+[% advert_outcome = 0 %]
+
+[% ELSE %]
+
+[% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it's been fixed.</p>') %]
+
+[% END %]
+
+[% IF advert_outcome %]
+    [% display_crosssell_advert( problem.user.email, problem.name, { council = problem.council } ) %]
+[% END %]
+
diff --git a/templates/web/default/questionnaire/index.html b/templates/web/default/questionnaire/index.html
index f0e65de4d..6d102bac9 100644
--- a/templates/web/default/questionnaire/index.html
+++ b/templates/web/default/questionnaire/index.html
@@ -21,6 +21,8 @@
 
 <input type="hidden" name="token" value="[% token | html %]">
 
+[% c.cobrand.form_elements('questionnaireForm') %]
+
 [% IF c.cobrand.moniker == 'emptyhomes' %]
 [% IF num_questionnaires == 1 %]
     _(<<EOF);
@@ -90,6 +92,10 @@ your experience of getting the problem fixed?') %]</p>
 
 [% IF c.cobrand.allow_photo_upload %]
 <div id="fileupload_normalUI">
+    [% IF upload_fileid %]
+        <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p>
+        <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
+    [% END %]
     <label for="form_photo">[% loc('Photo:') %]</label>
     <input type="file" name="photo" id="form_photo">
 </div>
diff --git a/templates/web/default/tokens/confirm_alert.html b/templates/web/default/tokens/confirm_alert.html
index 07694cbb6..d23a658ec 100644
--- a/templates/web/default/tokens/confirm_alert.html
+++ b/templates/web/default/tokens/confirm_alert.html
@@ -12,6 +12,6 @@
 [% END %]
 </p>
 
-[% display_crossell_advert( alert.user.email, alert.user.name ) %]
+[% display_crosssell_advert( alert.user.email, alert.user.name ) %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html
index cc3fb6400..756958380 100644
--- a/templates/web/default/tokens/confirm_problem.html
+++ b/templates/web/default/tokens/confirm_problem.html
@@ -17,6 +17,6 @@
 %]
 </p>
 
-[% display_crossell_advert( problem.user.email, problem.name ) %]
+[% display_crosssell_advert( problem.user.email, problem.name ) %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/tokens/confirm_update.html b/templates/web/default/tokens/confirm_update.html
index cae702073..25a1235f6 100644
--- a/templates/web/default/tokens/confirm_update.html
+++ b/templates/web/default/tokens/confirm_update.html
@@ -15,6 +15,6 @@
 [% END %]
 </p>
 
-[% display_crossell_advert( update.user.email, update.name ) %]
+[% display_crosssell_advert( update.user.email, update.name ) %]
 
 [% INCLUDE 'footer.html' %]