diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/email/zurich/alert-update.txt | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | templates/email/zurich/submit-external.txt | 8 | ||||
| -rwxr-xr-x | templates/email/zurich/submit-feedback-pending.txt | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | templates/email/zurich/submit-in-progress.txt | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | templates/email/zurich/submit.txt | 8 | ||||
| -rwxr-xr-x | templates/web/zurich/faq/faq-de-ch.html (renamed from templates/web/zurich/faq/faq-de.html) | 0 | ||||
| -rw-r--r-- | templates/web/zurich/footer.html | 7 | ||||
| -rw-r--r-- | templates/web/zurich/header.html | 11 | ||||
| -rw-r--r-- | templates/web/zurich/report/updates.html | 8 |
9 files changed, 39 insertions, 30 deletions
diff --git a/templates/email/zurich/alert-update.txt b/templates/email/zurich/alert-update.txt new file mode 100644 index 000000000..3f8da5f66 --- /dev/null +++ b/templates/email/zurich/alert-update.txt @@ -0,0 +1,11 @@ +Subject: New update on report - '<?=$values['title']?>' + +The following update has been left on this report: + +<?=$values['data']?> + +To view this report on the site, please visit the following URL: + <?=$values['problem_url']?> + +<?=$values['signature']?> + diff --git a/templates/email/zurich/submit-external.txt b/templates/email/zurich/submit-external.txt index 0775f7728..c9a002952 100755..100644 --- a/templates/email/zurich/submit-external.txt +++ b/templates/email/zurich/submit-external.txt @@ -1,8 +1,8 @@ -Subject: FixMyZurich: New report #<?=$values['id']?> +Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> -Dear <?=$values['bodies_name']?>, +Guten Tag<?=$values['bodies_name']?>, -This report has been sent to you by Stadt Zurich to be dealt with. +Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. -Public URL: <?=$values['url']?> +Öffentliche URL: <?=$values['url']?> diff --git a/templates/email/zurich/submit-feedback-pending.txt b/templates/email/zurich/submit-feedback-pending.txt index ff2e8e8b1..fbf9cafb9 100755 --- a/templates/email/zurich/submit-feedback-pending.txt +++ b/templates/email/zurich/submit-feedback-pending.txt @@ -1,10 +1,10 @@ -Subject: FixMyZurich: report #<?=$values['id']?> pending feedback +Subject: FixMyZurich: Meldung #<?=$values['id']?> bereit für Feedback -Dear <?=$values['bodies_name']?>, +Guten Tag <?=$values['bodies_name']?>, -This report has been sent back to you by the subdivision for final response and closure. +Diese Meldung wurde vom Fachbereich abschliessend beantwortet und kann nun auf Fix My Zurich beantwortet und abgeschlossen werden. -Public URL: <?=$values['url']?> +Öffentliche URL: <?=$values['url']?> Admin URL: <?=$values['admin_url']?> diff --git a/templates/email/zurich/submit-in-progress.txt b/templates/email/zurich/submit-in-progress.txt index c8d259e09..809ba4653 100755..100644 --- a/templates/email/zurich/submit-in-progress.txt +++ b/templates/email/zurich/submit-in-progress.txt @@ -1,10 +1,10 @@ -Subject: FixMyZurich: New report #<?=$values['id']?> +Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> -Dear <?=$values['bodies_name']?>, +Guten Tag <?=$values['bodies_name']?>, -This report has been sent to you by your division to be dealt with. +Diese Meldung wurde Ihnen von Ihrer FMZ-Verantworltichen Stelle zugeteilt. -Public URL: <?=$values['url']?> +Öffentliche URL: <?=$values['url']?> Admin URL: <?=$values['admin_url']?> diff --git a/templates/email/zurich/submit.txt b/templates/email/zurich/submit.txt index 752d6c6b4..f55b66e18 100755..100644 --- a/templates/email/zurich/submit.txt +++ b/templates/email/zurich/submit.txt @@ -1,10 +1,10 @@ -Subject: FixMyZurich: New report #<?=$values['id']?> +Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> -Dear <?=$values['bodies_name']?>, +Guten Tag <?=$values['bodies_name']?>, -A new report has been submitted by a user. +Eine neue Meldung wurde erfasst: -Public URL: <?=$values['url']?> +Öffentliche URL: <?=$values['url']?> Admin URL: <?=$values['admin_url']?> diff --git a/templates/web/zurich/faq/faq-de.html b/templates/web/zurich/faq/faq-de-ch.html index a739f1b74..a739f1b74 100755 --- a/templates/web/zurich/faq/faq-de.html +++ b/templates/web/zurich/faq/faq-de-ch.html diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index 2e4717360..499923b1c 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -5,6 +5,12 @@ <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + </p><p><a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] <ul id="main-menu"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% @@ -13,6 +19,7 @@ %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> </ul> + [% END %] </div> </div> </div> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index fdc4f1800..d47a05a0d 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -43,17 +43,6 @@ </div> </header> - <div id="user-meta"> - [% IF c.user_exists %] - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> - [% END %] - </div> - [% pre_container_extra %] <div class="container"> diff --git a/templates/web/zurich/report/updates.html b/templates/web/zurich/report/updates.html index 34b65e998..0f9afbf68 100644 --- a/templates/web/zurich/report/updates.html +++ b/templates/web/zurich/report/updates.html @@ -1,15 +1,17 @@ -[% IF problem.state == 'fixed - council' %] -<section class="full-width"> +[% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] <h4 class="static-with-rule">[% loc('Updates') %]</h4> <ul class="issue-list"> <li> <div class="update-wrap"> <div class="update-text"> <p class="meta-2">[% prettify_epoch( problem.lastupdate_local.epoch ) %]</p> + [% IF problem.state == 'fixed - council' %] [% add_links( problem.extra.public_response ) | html_para %] + [% ELSIF problem.state == 'closed' AND problem.external_body %] + <p>[% tprintf( loc('Assigned to %s'), problem.body(c).name ) %]</p> + [% END %] </div> </div> </li> </ul> -</section> [% END %] |