diff options
| -rw-r--r-- | notes/catalyst-master-merge-todos.txt | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/.gitignore | 1 | ||||
| -rw-r--r-- | templates/web/.gitignore | 1 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details.html | 33 |
5 files changed, 25 insertions, 17 deletions
diff --git a/notes/catalyst-master-merge-todos.txt b/notes/catalyst-master-merge-todos.txt index ea0ec98cd..f536a9d86 100644 --- a/notes/catalyst-master-merge-todos.txt +++ b/notes/catalyst-master-merge-todos.txt @@ -1 +1,4 @@ should we ditch flickr import? (does not seem to be getting huge usage and those using it would probably report using another method: http://www.flickr.com/search/?w=all&q=fixmystreet&m=tags) + +move all FAQ over to TT2 + diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 71650c0e4..c32508cc5 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -841,12 +841,14 @@ sub process_report : Private { $report->latitude( $c->stash->{latitude} ); $report->longitude( $c->stash->{longitude} ); + # Capture wether the may was used + $report->used_map( $params{skipped} ? 0 : 1 ); + # Short circuit unless the form has been submitted return 1 unless $params{submit_problem}; # set some simple bool values (note they get inverted) $report->anonymous( $params{may_show_name} ? 0 : 1 ); - $report->used_map( $params{skipped} ? 0 : 1 ); # clean up text before setting $report->title( _cleanup_text( $params{title} ) ); diff --git a/perllib/FixMyStreet/Cobrand/.gitignore b/perllib/FixMyStreet/Cobrand/.gitignore new file mode 100644 index 000000000..6247c81bc --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/.gitignore @@ -0,0 +1 @@ +Cities.pm diff --git a/templates/web/.gitignore b/templates/web/.gitignore new file mode 100644 index 000000000..7ebcec4c1 --- /dev/null +++ b/templates/web/.gitignore @@ -0,0 +1 @@ +cities diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index 7cf24f619..a56cbbd6e 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -78,26 +78,27 @@ <textarea name="detail" id="form_detail" rows="7" cols="26">[% report.detail | html %]</textarea> </div> -[% IF field_errors.photo %] - <div class='form-error'>[% field_errors.photo %]</div> -[% END %] - -<div class='form-field'> -[% IF upload_fileid || report.photo %] - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - [% IF upload_fileid %] - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> +[% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> [% END %] - [% IF report.photo %] - <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + + <div class='form-field'> + [% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + [% IF report.photo %] + <img align="right" src="/photo?id=[% report.id %]" hspace="5"> + [% END %] [% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" > + </div> [% END %] - <label for="form_photo">[% loc('Photo:') %]</label> - <input type="file" name="photo" id="form_photo" > -</div> - - [% IF field_errors.name %] <div class='form-error'>[% field_errors.name %]</div> [% END %] |