The branch, master has been updated via 0d71c13a9591d4a451ade6d1c7a62e79434a3cc9 (commit) via 011ec21abb11d0455e26dd9fb726782f56d17f62 (commit) via 7977d01347542919a71a44b88e49206263e29ca1 (commit) from d40c9bc0416247535228171e444a965cbe397ff1 (commit)

- Log ----------------------------------------------------------------- commit 0d71c13a9591d4a451ade6d1c7a62e79434a3cc9 Merge: 011ec21 d40c9bc Author: Michal Čihař michal@cihar.com Date: Fri Aug 26 09:02:15 2011 +0200

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website

commit 011ec21abb11d0455e26dd9fb726782f56d17f62 Author: Michal Čihař michal@cihar.com Date: Fri Aug 26 08:55:07 2011 +0200

Remove download counts from templates

commit 7977d01347542919a71a44b88e49206263e29ca1 Author: Michal Čihař michal@cihar.com Date: Fri Aug 26 08:54:19 2011 +0200

Handle not existing download count

-----------------------------------------------------------------------

Summary of changes: render.py | 5 ++++- templates/_release.tpl | 2 -- templates/themes.tpl | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/render.py b/render.py index 059d094..016502f 100755 --- a/render.py +++ b/render.py @@ -289,7 +289,10 @@ class SFGenerator: featured = (FILES_REGEXP.match(filename) is not None) if featured: helper.log.dbg('Release is featured!') - dlcount = item.getElementsByTagName('files:download-count')[0].childNodes[0].data + try: + dlcount = item.getElementsByTagName('files:download-count')[0].childNodes[0].data + except: + dlcount = None try: notes = item.getElementsByTagName('files:release-notes-url')[0].childNodes[0].data except: diff --git a/templates/_release.tpl b/templates/_release.tpl index 2dbea0e..721e851 100644 --- a/templates/_release.tpl +++ b/templates/_release.tpl @@ -10,7 +10,6 @@ <th>File</th> <th>Size</th> <th>MD5 checksum</th> - <th>Downloads</th> </tr> </thead> <tbody> @@ -18,7 +17,6 @@ <td><a href="${file.url}#!md5!${file.md5}" class="piwik_download">${file.name}</a></td> <td class="size">${file.humansize}</td> <td>${file.md5}</td> - <td class="count">${file.dlcount}</td> </tr> </tbody> </table> diff --git a/templates/themes.tpl b/templates/themes.tpl index 7888247..c1642f9 100644 --- a/templates/themes.tpl +++ b/templates/themes.tpl @@ -54,7 +54,7 @@ your theme for downloading here. <p py:if="theme.author">Author: ${theme.author}</p> <p>${Markup(theme.info)}</p> <ul class="dl"> - <li><a href="${theme.file.url}#!md5!${theme.file.md5}">${theme.file.name}</a> (${theme.file.humansize}, ${theme.file.dlcount} downloads, MD5: ${theme.file.md5})</li> + <li><a href="${theme.file.url}#!md5!${theme.file.md5}">${theme.file.name}</a> (${theme.file.humansize}, MD5: ${theme.file.md5})</li> </ul> </div> <div class="clearer"></div>

hooks/post-receive