Side by Side Diff: sitescripts/stats/template/main.html
Issue 11481051:
Update stats processing (Closed)
Patch Set: String concatenation fix
Created Aug. 27, 2013, 12:41 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« sitescripts/stats/bin/logprocessor.py ('K')
|
« sitescripts/stats/template/fileStats.html ('k')
|
sitescripts/stats/test/__init__.py » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <!-- | 1 <!-- |
| 2 - This file is part of the Adblock Plus web scripts, | 2 - This file is part of the Adblock Plus web scripts, |
| 3 - Copyright (C) 2006-2013 Eyeo GmbH | 3 - Copyright (C) 2006-2013 Eyeo GmbH |
| 4 - | 4 - |
| 5 - Adblock Plus is free software: you can redistribute it and/or modify | 5 - Adblock Plus is free software: you can redistribute it and/or modify |
| 6 - it under the terms of the GNU General Public License version 3 as | 6 - it under the terms of the GNU General Public License version 3 as |
| 7 - published by the Free Software Foundation. | 7 - published by the Free Software Foundation. |
| 8 - | 8 - |
| 9 - Adblock Plus is distributed in the hope that it will be useful, | 9 - Adblock Plus is distributed in the hope that it will be useful, |
| 10 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 - GNU General Public License for more details. | 12 - GNU General Public License for more details. |
| 13 - | 13 - |
| 14 - You should have received a copy of the GNU General Public License | 14 - You should have received a copy of the GNU General Public License |
| 15 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 --> | 16 --> |
| 17 | 17 |
| 18 | 18 |
| 19 <!DOCTYPE html> | 19 <!DOCTYPE html> |
| 20 <html lang="en"> | 20 <html lang="en"> |
| 21 <head> | 21 <head> |
| 22 <meta name="robots" content="noindex,nofollow" /> | 22 <meta name="robots" content="noindex,nofollow" /> |
| 23 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 23 <meta charset="utf-8"> |
| 24 <link rel="stylesheet" type="text/css" href="static/subscriptions.css" /> | 24 <link rel="stylesheet" type="text/css" href="../static/stats.css" /> |
| 25 <title>Statistics for filter subscriptions ({{month|monthname}})</title> | 25 <title>Download statistics for {{url}} ({{month|monthname}})</title> |
| 26 </head> | 26 </head> |
| 27 | 27 |
| 28 <body style="margin-top: 0px"> | 28 <body style="margin-top: 0px"> |
| 29 <a name="top"> </a> | 29 <a name="top"> </a> |
| 30 <table class="block" width="100%"> | 30 <table class="block" width="100%"> |
| 31 <tr> | 31 <tr> |
| 32 <td class="title" width="250">Subscription statistics for:</td> | 32 <td class="title" width="250">Download statistics for:</td> |
| 33 | 33 |
| 34 <td>easylist-downloads.adblockplus.org</td> | 34 <td>{{url}}</td> |
| 35 </tr> | 35 </tr> |
| 36 <tr> | 36 <tr> |
| 37 <td class="title" width="250">Last update:</td> | 37 <td class="title" width="250">Last update:</td> |
| 38 <td>{{now|formattime}}</td> | 38 <td>{{now|formattime}}</td> |
| 39 </tr> | 39 </tr> |
| 40 <tr> | 40 <tr> |
| 41 <td class="title" width="250">Reported period:</td> | 41 <td class="title" width="250">Reported period:</td> |
| 42 <td>Month {{month|monthname}}</td> | 42 <td>Month {{month|monthname}}</td> |
| 43 </tr> | 43 </tr> |
| 44 </table> | 44 </table> |
| 45 <div class="block_title">Subscriptions</div> | 45 <div class="block_title">File</div> |
| 46 <div class="block"> | 46 <div class="block"> |
| 47 <table align="center"> | 47 <table align="center"> |
| 48 <tr> | 48 <tr> |
| 49 <th bgcolor="#ECECEC">Subscription</th> | 49 <th bgcolor="#ECECEC">File</th> |
| 50 <th bgcolor="#66DDEE">Hits</th> | 50 <th bgcolor="#66DDEE">Hits</th> |
| 51 <th bgcolor="#2EA495">Bandwidth</th> | 51 <th bgcolor="#2EA495">Bandwidth</th> |
| 52 <th> </th> | 52 <th> </th> |
| 53 </tr> | 53 </tr> |
| 54 {%- set maxHits = subscriptions|max(attribute='hits')|ensuremin(1) %} | 54 {%- set data = data|sortfield("hits") %} |
| 55 {%- set maxBandwidth = subscriptions|max(attribute='bandwidth')|ensuremin( 1) %} | 55 {%- set maxhits = data|maxhits %} |
| 56 {%- for subscription in subscriptions %} | 56 {%- set maxbandwidth = data|maxbandwidth %} |
| 57 {%- for name, value in data %} | |
| 57 <tr> | 58 <tr> |
| 58 <td><a href="{{subscription.url}}">{{subscription.fileName}}</a></td> | 59 <td><a href="{{value.url}}">{{name}}</a></td> |
| 59 <td align="right">{{subscription.hits}}</td> | 60 <td align="right">{{value.hits}}</td> |
| 60 <td align="right">{{subscription.bandwidth|bytes}}</td> | 61 <td align="right">{{value.bandwidth|bytes}}</td> |
| 61 <td class="chart"> | 62 <td class="chart"> |
| 62 <div class="hitsChart horizontal" style="width: {{(subscription.hits / maxHits * 100)|round(method='ceil')|int}}px;"></div><br /> | 63 <div class="hitsChart" style="width: {{(value.hits / maxhits * 100)|ro und(method='ceil')|int}}px;"></div><br /> |
| 63 <div class="bandwidthChart horizontal" style="width: {{(subscription.b andwidth / maxBandwidth * 100)|round(method='ceil')|int}}px;"></div> | 64 <div class="bandwidthChart" style="width: {{(value.bandwidth / maxband width * 100)|round(method='ceil')|int}}px;"></div> |
| 64 </td> | 65 </td> |
| 65 </tr> | 66 </tr> |
| 66 {%- endfor %} | 67 {%- endfor %} |
| 67 </table> | 68 </table> |
| 68 </div> | 69 </div> |
| 69 </body> | 70 </body> |
| 70 </html> | 71 </html> |
| OLD | NEW |
« sitescripts/stats/bin/logprocessor.py ('K')
|
« sitescripts/stats/template/fileStats.html ('k')
|
sitescripts/stats/test/__init__.py » ('j')
|
no next file with comments »
