diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/email/default/questionnaire.txt | 2 | ||||
| -rwxr-xr-x | templates/web/default/faq/faq-en-gb.html | 19 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 52 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details.html | 10 |
4 files changed, 41 insertions, 42 deletions
diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt index 4be8eeaa4..7ff184c41 100644 --- a/templates/email/default/questionnaire.txt +++ b/templates/email/default/questionnaire.txt @@ -1,4 +1,4 @@ -Subject: Questionnaire about your problem on FixMyStreet +Subject: FixMyStreet questionnaire about '<?=$values['title']?>' Hi <?=$values['name']?>, diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 2da32fc19..0907d6275 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -169,18 +169,23 @@ non-technical. Please see our <a href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> <dd> -<p>The software behind this site is open source, and available +The software behind this site is open source, and available to you mainly under the GNU Affero GPL software license. You can <a href="http://github.com/mysociety/fixmystreet">download the source code</a> and help us develop it. You’re welcome to use it in your own projects, although you must also -make available the source code to any such projects.</p> -<p>Some Canadians at VisibleGovernment.ca wrote their own code for <a -href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a> which is +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> +<dt>I’d prefer code in a different language?</dt> +<dd> +VisibleGovernment.ca wrote their own code for +<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a> -– it might well be more suitable for adapting than our code, and -definitely has better installation instructions at present. +href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. +Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in +Drupal. </p> </dd> <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index a05d721d3..38c3014fa 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -77,31 +77,12 @@ <input type="hidden" name="submit_update" value="1"> <input type="hidden" name="id" value="[% problem.id | html %]"> - <div> - <label for="form_name">[% loc( 'Name:') %]</label> - <input type="text" name="name" id="form_name" value="[% form_name | html %]" size="20"> [% loc( '(optional)' ) %] - </div> - - <div class="checkbox"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% may_show_name %]> - <label for="form_may_show_name">[% loc('Can we show your name publicly?') %]</label> - <small>[% loc('(we never show your email address or phone number)') %]</small> - </div> - - [% IF field_errors.email %] - <div class='form-error'>[% field_errors.email %]</div> - [% END %] - <div class="form-field"> - <label for="form_rznvy">[% loc('Email' ) %]</label> - <input type="text" name="rznvy" id="form_rznvy" value="[% email | html %]" size="20"> - </div> - [% IF field_errors.update %] <div class='form-error'>[% field_errors.update %]</div> [% END %] <div class="form-field"> <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea name="update" id="form_update" rows="7" cols="30">[% update_text | html %]</textarea> + <textarea name="update" id="form_update" rows="7" cols="30">[% update.text | html %]</textarea> </div> [% IF c.user && c.user.from_authority %] @@ -114,7 +95,6 @@ <option [% 'selected ' IF state.0 == problem.state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> - </div> [% ELSE %] [% IF !problem.is_fixed %] <div class="checkbox"> @@ -124,7 +104,6 @@ [% END %] [% END %] - [% IF c.cobrand.allow_photo_upload %] [% IF photo_error %] <div class='form-error'>[% photo_error %]</div> @@ -135,25 +114,44 @@ <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"> + <input type="file" name="photo" id="form_photo" style="width:20em"> </div> [% END %] + <div> + <label for="form_name">[% loc( 'Name:') %]</label> + <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" size="20"> + </div> <div class="checkbox"> - <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% add_alert_checked %]> - <label for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> + <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> + <small>[% loc('(we never show your email)') %]</small> </div> +[% IF NOT c.user %] + + [% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> + [% END %] + <div class="form-field"> + <label for="form_rznvy">[% loc('Email' ) %]</label> + <input type="text" name="rznvy" id="form_rznvy" value="[% update.user.email || c.user.email | html %]" size="20"> + </div> + +[% END %] <div class="checkbox"> - <input type="submit" id="update_post" value="[% loc('Post') %]"> + <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> + <label for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> </div> + <div class="checkbox"> + <input type="submit" id="update_post" value="[% loc('Post') %]"> + </div> [% cobrand_update_fields %] - </form> </div> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index 26f092c8e..48407bb45 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -137,11 +137,7 @@ [%# if there is nothing in the name field then set check box as default on form %] <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous || !report.name %]> - [% IF c.cobrand.moniker == 'emptyhomes' %] - <label for="form_may_show_name">[% loc('Can we show your name on the site?') %]</label> - [% ELSE %] - <label for="form_may_show_name">[% loc('Can we show your name publicly?') %]</label> - [% END %] + <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> <small>[% loc('(we never show your email address or phone number)') %]</small> </div> @@ -151,12 +147,12 @@ <div class="form-field"> <label for="form_email">[% loc('Email:') %]</label> - <input type="text" value="[% report_user.email | html %]" name="email" id="form_email" size="25"> + <input type="text" value="[% report.user.email | html %]" name="email" id="form_email" size="25"> </div> <div> <label for="form_phone">[% loc('Phone:') %]</label> - <input type="text" value="[% report_user.phone | html %]" name="phone" id="form_phone" size="15"> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> <small>[% loc('(optional)') %]</small> </div> |