Browse Source

Format protection level nicely.

master
Ben Kurtovic 8 years ago
parent
commit
ff0481a062
3 changed files with 20 additions and 6 deletions
  1. +8
    -2
      static/style.css
  2. +7
    -3
      templates/index.mako
  3. +5
    -1
      tif/calc.py

+ 8
- 2
static/style.css View File

@@ -8,6 +8,12 @@ footer {}


#result {} #result {}


#result-page {}

#result-cache {} #result-cache {}

.result-page {}

.prot-level {}

.prot-expiry {}

.prot-none {}

+ 7
- 3
templates/index.mako View File

@@ -20,7 +20,7 @@


% if "tif" in result: % if "tif" in result:
<div id="result"> <div id="result">
<div id="result-page"><a href="${result['page'].url}">${result["page"].title | h}</a></div>
<div class="result-page"><a href="${result['page'].url}">${result["page"].title | h}</a></div>
<table> <table>
<tr> <tr>
<td>TIF</td> <td>TIF</td>
@@ -32,10 +32,14 @@
</tr> </tr>
<tr> <tr>
<td>Protection</td> <td>Protection</td>
<td>${result["protection"]}</td>
% if result["protection"]:
<td><span class="prot-level prot-${result['protection']['level']}">${result["protection"]["level"]}</span> until <span class="prot-expiry">${result["protection"]["expiry"]}</span></td>
% else:
<td><span class="prot-none">None</span></td>
% endif
</tr> </tr>
</table> </table>
% if "cache" in result and result["cache"]:
% if "cache_time" in result:
<div id="result-cache">Pageview data is cached from up to <abbr title="${result['cache_time']}">${result["cache_age"]} ago</abbr>.</div> <div id="result-cache">Pageview data is cached from up to <abbr title="${result['cache_time']}">${result["cache_age"]} ago</abbr>.</div>
% endif % endif
</div> </div>


+ 5
- 1
tif/calc.py View File

@@ -109,6 +109,10 @@ def _format_time(cache_time):
return formatter(diff.seconds / 60, "minute") return formatter(diff.seconds / 60, "minute")
return formatter(diff.seconds, "second") return formatter(diff.seconds, "second")


def _get_protection(page):
edit = [prot for prot in page.protection if prot["type"] == "edit"]
return edit or None

def calculate_tif(title): def calculate_tif(title):
bot = Bot(".earwigbot") bot = Bot(".earwigbot")
db = _get_db(bot) db = _get_db(bot)
@@ -124,7 +128,7 @@ def calculate_tif(title):


result["tif"] = tif result["tif"] = tif
result["transclusions"] = transclusions result["transclusions"] = transclusions
result["protection"] = page.protection
result["protection"] = _get_protection(page)
if cache_time: if cache_time:
result["cache_time"] = cache_time.strftime("%b %d, %Y %H:%M:%S UTC") result["cache_time"] = cache_time.strftime("%b %d, %Y %H:%M:%S UTC")
result["cache_ago"] = _format_time(cache_time) result["cache_ago"] = _format_time(cache_time)


Loading…
Cancel
Save