Mercurial > kallithea
changeset 494:b4d9680cd164 celery
some code fixes templates+helpers new rfc date without tz, added timerproxy formatting
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 22 Sep 2010 04:31:21 +0200 |
| parents | 2256c78afe53 |
| children | 15f837c62fa5 |
| files | pylons_app/lib/helpers.py pylons_app/lib/timerproxy.py pylons_app/templates/shortlog/shortlog_data.html |
| diffstat | 3 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/lib/helpers.py Wed Sep 22 04:30:36 2010 +0200 +++ b/pylons_app/lib/helpers.py Wed Sep 22 04:31:21 2010 +0200 @@ -325,6 +325,7 @@ isodatesec = lambda x: util.datestr(x, '%Y-%m-%d %H:%M:%S %1%2') localdate = lambda x: (x[0], util.makedate()[1]) rfc822date = lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S %1%2") +rfc822date_notz = lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S") rfc3339date = lambda x: util.datestr(x, "%Y-%m-%dT%H:%M:%S%1:%2") time_ago = lambda x: util.datestr(_age(x), "%a, %d %b %Y %H:%M:%S %1%2")
--- a/pylons_app/lib/timerproxy.py Wed Sep 22 04:30:36 2010 +0200 +++ b/pylons_app/lib/timerproxy.py Wed Sep 22 04:31:21 2010 +0200 @@ -21,6 +21,7 @@ sql = sql.replace('\n', '') sql = one_space_trim(sql) sql = sql\ + .replace(',', ',\n\t')\ .replace('SELECT', '\n\tSELECT \n\t')\ .replace('UPDATE', '\n\tUPDATE \n\t')\ .replace('DELETE', '\n\tDELETE \n\t')\
--- a/pylons_app/templates/shortlog/shortlog_data.html Wed Sep 22 04:30:36 2010 +0200 +++ b/pylons_app/templates/shortlog/shortlog_data.html Wed Sep 22 04:31:21 2010 +0200 @@ -13,7 +13,7 @@ </tr> %for cnt,cs in enumerate(c.repo_changesets): <tr class="parity${cnt%2}"> - <td>${h.age(cs._ctx.date())}</td> + <td>${h.age(cs._ctx.date())} - ${h.rfc822date_notz(cs._ctx.date())} </td> <td title="${cs.author}">${h.person(cs.author)}</td> <td>r${cs.revision}:${cs.raw_id}</td> <td>