diff options
Diffstat (limited to 'templates/web/default/admin')
| -rw-r--r-- | templates/web/default/admin/problem_row.html | 9 | ||||
| -rw-r--r-- | templates/web/default/admin/search_users.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/stats.html | 36 | ||||
| -rw-r--r-- | templates/web/default/admin/user_edit.html | 1 |
4 files changed, 44 insertions, 4 deletions
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 664ff1b13..22825429a 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -1,6 +1,6 @@ [%- FOR problem IN problems %] <tr[% ' class="hidden"' IF problem.state == 'hidden' %]> - <td>[%- IF problem.state == 'confirmed' || problem.state == 'fixed' -%] + <td>[%- IF problem.is_visible -%] [%- cobrand_data = problem.cobrand_data %] [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %] <a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a> @@ -20,9 +20,10 @@ <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td> <td>[% PROCESS format_time time=problem.created %]</td> <td>[% problem.state %]<small> - [%- IF problem.state == 'fixed' || problem.state == 'confirmed' %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] - [%- IF problem.state == 'fixed' %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.state == 'confirmed' %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> + [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] + [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> </td> <td>[% PROCESS format_time time=problem.whensent %]</td> <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index 43fdebf2b..b4fa2c2da 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -12,6 +12,7 @@ <th>[% loc('Name') %]</th> <th>[% loc('Email') %]</th> <th>[% loc('Council') %]</th> + <th>[% loc('Flagged') %]</th> <th>*</th> </tr> [%- FOREACH user IN users %] @@ -19,6 +20,7 @@ <td>[% PROCESS value_or_nbsp value=user.name %]</td> <td>[% PROCESS value_or_nbsp value=user.email %]</td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> + <td>[% user.flagged ? loc('Yes') : ' ' %]</td> <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> </tr> [%- END -%] diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html index ccd41601a..3b9f4a264 100644 --- a/templates/web/default/admin/stats.html +++ b/templates/web/default/admin/stats.html @@ -4,6 +4,28 @@ <p> <strong>[% tprintf( loc( '%sreports between %s and %s' ), ( unconfirmed ? loc( 'All' ) _ ' ' : loc( 'Confirmed' ) _ ' ' ), start_date.ymd, end_date.ymd ) | html %]</strong> </p> +[% IF bymonth %] +<table> + <thead> + <td style="width: 8em"><strong>[% loc('Year') %]</strong></td> + <td style="width: 8em"><strong>[% loc('Month') %]</strong></td> + <td><strong>[% loc('Count') %]</strong></td> + </thead> + [% total = 0 %] + [% WHILE ( state = states.next ) %] + [% total = total + state.get_column( 'count' ) %] + <tr> + <td>[% state.get_column( 'c_year') | html %]</td> + <td>[% state.get_column( 'c_month') | html %]</td> + <td>[% state.get_column( 'count' ) %]</td> + </tr> + [% END %] + <tr> + <td colspan="2"><strong>[% loc( 'Total' ) %]</strong></td> + <td><strong>[% total %]</strong></td> + </tr> +</table> +[% ELSE %] <table> <thead> <td style="width: 8em"><strong>[% loc('Current state') %]</strong></td> @@ -22,6 +44,7 @@ <td><strong>[% total %]</strong></td> </tr> </table> +[% END %] [% IF unconfirmed %] <p> @@ -54,6 +77,19 @@ </p> <p> + <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label for="bymonth">[% loc('By Date') %]</label> + </p> + + <p> + [% loc('Council:') %] <select id='council' name='council'> + <option value=''>[% loc('No council') %]</option> + [% FOR council IN council_ids %] + <option value="[% council %]"[% ' selected' IF council == selected_council %]>[% council_details.$council.name %]</option> + [% END %] + </select> + </p> + + <p> <input type="submit" name="getcounts" size="30" id="getcounts" value="Get Count" /> </p> </form> diff --git a/templates/web/default/admin/user_edit.html b/templates/web/default/admin/user_edit.html index 7db8f5c63..a03a4b734 100644 --- a/templates/web/default/admin/user_edit.html +++ b/templates/web/default/admin/user_edit.html @@ -15,6 +15,7 @@ <option value="[% council %]"[% ' selected' IF council == user.from_council %]>[% council_details.$council.name %]</option> [% END %] </select> +<li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li> </ul> <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form> |