soutade/iwla
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'dev' of soutade.fr:iwla into dev

Browse Source
This commit is contained in:
Gregory Soutade 2015-04-08 14:06:18 +02:00
commit 8e86e6946b
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.py
View File

@ -17,7 +17,7 @@ display_hooks = ['track_users', 'top_visitors', 'all_visits', 'referers', 'top_p
reverse_dns_timeout = 0.2 reverse_dns_timeout = 0.2
# Count this addresses as hit # Count this addresses as hit
page_to_hit_conf = [r'^.+/logo[/]?$'] page_to_hit_conf = [r'^.+/logo[/]?$', r'^.+/search[/]?.*$']
# Count this addresses as page # Count this addresses as page
hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/.+$'] hit_to_page_conf = [r'^.+/category/.+$', r'^.+/tag/.+$', r'^.+/archive/.+$', r'^.+/ljdc[/]?$', r'^.+/source/tree/.*$', r'^.+/source/file/.*$', r'^.+/search/.+$']

4
plugins/display/browsers.py
View File

@ -102,7 +102,7 @@ class IWLADisplayBrowsers(IPlugin):
display.addPage(page) display.addPage(page)
title = 'Top Browsers' title = self.iwla._(u'Top Browsers')
if self.create_browsers: if self.create_browsers:
link = '<a href=\'%s\'>%s</a>' % (filename, self.iwla._(u'All Browsers')) link = '<a href=\'%s\'>%s</a>' % (filename, self.iwla._(u'All Browsers'))
title = '%s - %s' % (title, link) title = '%s - %s' % (title, link)
@ -120,7 +120,7 @@ class IWLADisplayBrowsers(IPlugin):
icon = '<img src="/%s/browser/unknown.png"/>' % (self.icon_path) icon = '<img src="/%s/browser/unknown.png"/>' % (self.icon_path)
else: else:
icon = '<img src="/%s/browser/unknown.png"/>' % (self.icon_path) icon = '<img src="/%s/browser/unknown.png"/>' % (self.icon_path)
browser = 'Unknown' browser = self.iwla._(u'Unknown')
table.appendRow([icon, browser, entrance]) table.appendRow([icon, browser, entrance])
total_browsers[2] -= entrance total_browsers[2] -= entrance
if total_browsers[2]: if total_browsers[2]:

9
plugins/display/istats_diff.py
View File

@ -73,7 +73,9 @@ class IWLADisplayStatsDiff(IPlugin):
path = self.iwla.getCurDisplayPath(self.filename) path = self.iwla.getCurDisplayPath(self.filename)
page = display.getPage(path) page = display.getPage(path)
if not page: return if not page:
self.logger.error('No page for %s' % (path))
return
title = self.iwla._(self.block_name) title = self.iwla._(self.block_name)
block = page.getBlock(title) block = page.getBlock(title)
if not block: if not block:
@ -94,5 +96,6 @@ class IWLADisplayStatsDiff(IPlugin):
stats_diff[k] = 'iwla_new' stats_diff[k] = 'iwla_new'
for (idx, row) in enumerate(block.rows): for (idx, row) in enumerate(block.rows):
if row[0] in stats_diff.keys(): for k in stats_diff.keys():
block.setCellCSSClass(idx, 0, stats_diff[row[0]]) if k in row[0]:
block.setCellCSSClass(idx, 0, stats_diff[k])