diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-21 11:41:23 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-21 11:41:23 +0100 |
| commit | d941a8c26e943c941f8e37ecbd9a9982dd41cb70 (patch) | |
| tree | 75ea20fb18e984912ba60e4e499114c83cf431fe /templates/web/default/admin | |
| parent | 9da2d7b0e806407e3ed5e5418a53fca64757a39a (diff) | |
| parent | 77f31e8c96c727ea5ab9cf217cfd924074e8f3ed (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/report/display.html
Diffstat (limited to 'templates/web/default/admin')
| -rw-r--r-- | templates/web/default/admin/index.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/stats.html | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index d1ed09114..b1eddaa3a 100644 --- a/templates/web/default/admin/index.html +++ b/templates/web/default/admin/index.html @@ -21,7 +21,7 @@ [% IF c.cobrand.admin_show_creation_graph -%] <p> - <a href="">[% loc('Graph of problem creation by status over time') %]</a> + <a href="[% c.config.BASE_URL %]/bci-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a> </p> [% 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> |