diff options
Diffstat (limited to 'templates/web/zurich')
| -rw-r--r-- | templates/web/zurich/admin/body.html | 3 | ||||
| -rw-r--r-- | templates/web/zurich/admin/header.html | 16 | ||||
| -rw-r--r-- | templates/web/zurich/admin/reports.html | 12 | ||||
| -rw-r--r-- | templates/web/zurich/auth/sign_out.html | 8 | ||||
| -rw-r--r-- | templates/web/zurich/footer.html | 9 |
5 files changed, 29 insertions, 19 deletions
diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html index 143e61f83..dd1b0b844 100644 --- a/templates/web/zurich/admin/body.html +++ b/templates/web/zurich/admin/body.html @@ -1,4 +1,5 @@ [% INCLUDE 'admin/header.html' title=tprintf(loc('Council contacts for %s'), body.name) -%] +[% PROCESS 'admin/report_blocks.html' %] [% IF updated %] <p> @@ -21,7 +22,7 @@ <td>[% contact.email | html %]</td> <td>[% contact.editor %]</td> <td>[% contact.note | html %]</td> - <td>[% contact.whenedited.ymd _ ' ' _ contact.whenedited.hms %]</td> + <td>[% PROCESS format_date this_date=contact.whenedited %]</td> </tr> [% END %] </table> diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 7e2337e6d..d0c399a83 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -22,18 +22,24 @@ select { width: auto; } <div class="admin-nav"> <ul> [% pagename = c.req.uri.path %] - [% pagename = pagename.replace('/admin/?(\w*)', '$1') %] + [% pagename = pagename.replace('/admin/?(\w*).*', '$1') %] <li [% IF pagename == 'summary' OR pagename == '' %]class="current"[% END %]> <a href="/admin/summary">[% loc('Summary') %]</a> </li> + <li [% IF pagename == 'reports' OR pagename == 'report_edit' %]class="current"[% END %]> + <a href="/admin/reports">[% loc('Reports') %]</a> + </li> [% IF admin_type == 'dm' OR admin_type == 'super' %] - <li [% IF pagename == 'bodies' %]class="current"[% END %]> + <li [% IF pagename == 'bodies' OR pagename == 'body' %]class="current"[% END %]> <a href="/admin/bodies">[% loc('Bodies') %]</a> </li> - <li [% IF pagename == 'reports' %]class="current"[% END %]> - <a href="/admin/reports">[% loc('Reports') %]</a> + [% END %] + [% IF admin_type == 'super' %] + <li [% IF pagename == 'users' OR pagename == 'user_edit' %]class="current"[% END %]> + <a href="/admin/users">[% loc('Users') %]</a> </li> + [% END %] <li class="search-box"> <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="text" name="search" size="20" id="search" placeholder="[% loc('Search reports') %]"> @@ -43,9 +49,7 @@ select { width: auto; } </div> <!-- | <a href="timeline">Timeline</a> --> <!-- | <a href="questionnaire">Survey</a> --> - <!-- | <a href="/admin/users">[% loc('Users') %]</a> --> <!-- | <a href="flagged">Flagged</a> --> <!-- | <a href="stats">Stats</a> --> -[% END %] <h1 style="clear:both;">[% title %]</h1> diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html index 0a3b5d568..f8c022630 100644 --- a/templates/web/zurich/admin/reports.html +++ b/templates/web/zurich/admin/reports.html @@ -1,14 +1,20 @@ [% PROCESS 'admin/header.html' title=loc('Search Reports') %] [% PROCESS 'admin/report_blocks.html' %] +<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> + <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search" value="[% searched | html %]"> +</form> + + [% IF searched %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('ID') %]</th> - <th>[% loc('Title') %]</th> - <th>[% loc('State') %]</th> + <th>[% loc('Description') %]</th> <th>[% loc('Category') %]</th> - <th>[% loc('Created') %]</th> + <th>[% loc('Submitted') %]</th> + <th>[% loc('Updated') %]</th> + <th>[% loc('Status') %]</th> <th>*</th> </tr> [% INCLUDE 'admin/problem_row.html', page = 'search' %] diff --git a/templates/web/zurich/auth/sign_out.html b/templates/web/zurich/auth/sign_out.html new file mode 100644 index 000000000..fa2f6fd69 --- /dev/null +++ b/templates/web/zurich/auth/sign_out.html @@ -0,0 +1,8 @@ +[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] + +<h1>[% loc('You have been signed out') %]</h1> + +<p>Please feel free to <a href="[% c.uri_for('/admin') %]">sign in again</a>, or +go back to the <a href="/">front page</a>.</p> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index f01e6671d..6b8ad004d 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -11,15 +11,6 @@ [% 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>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<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> |