diff --git a/display.py b/display.py index 2eaab86..35dc0b3 100644 --- a/display.py +++ b/display.py @@ -364,7 +364,7 @@ class DisplayHTMLPage(object): for block in self.blocks: block.build(f, filters=filters) if displayVersion: - f.write(u'Generated by IWLA %s' % + f.write(u'
Generated by IWLA %s
' % ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion())) f.write(u'') f.close() diff --git a/plugins/display/browsers.py b/plugins/display/browsers.py index cfe15a3..9052162 100644 --- a/plugins/display/browsers.py +++ b/plugins/display/browsers.py @@ -83,11 +83,12 @@ class IWLADisplayBrowsers(IPlugin): for (browser, entrance) in new_list: if browser != 'unknown': try: - icon = 'Browser icon' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + name = awstats_data.browsers_icons[self.icon_names[browser]] + icon = '%s icon' % (name, self.icon_path, name) except: - icon = 'Browser icon' % (self.icon_path) + icon = 'Unknown browser icon' % (self.icon_path) else: - icon = 'Browser icon' % (self.icon_path) + icon = 'Unknown browser icon' % (self.icon_path) browser = 'Unknown' table.appendRow([icon, browser, entrance]) total_browsers[2] += entrance @@ -115,11 +116,12 @@ class IWLADisplayBrowsers(IPlugin): for (browser, entrance) in browsers[:10]: if browser != 'unknown': try: - icon = 'Browser icon' % (self.icon_path, awstats_data.browsers_icons[self.icon_names[browser]]) + name = awstats_data.browsers_icons[self.icon_names[browser]] + icon = '%s icon' % (name, self.icon_path, name) except: - icon = 'Browser icon' % (self.icon_path) + icon = 'Unknown browser icon' % (self.icon_path) else: - icon = 'Browser icon' % (self.icon_path) + icon = 'Unknown browser icon' % (self.icon_path) browser = self.iwla._(u'Unknown') table.appendRow([icon, browser, entrance]) total_browsers[2] -= entrance diff --git a/plugins/display/ip_to_geo.py b/plugins/display/ip_to_geo.py index d104a64..8b01260 100644 --- a/plugins/display/ip_to_geo.py +++ b/plugins/display/ip_to_geo.py @@ -77,7 +77,7 @@ class IWLADisplayTopGeo(IPlugin): cc = visitor.get('country_code', None) break if not cc or cc == 'ip': return None - icon = 'Country flag' % (self.icon_path, cc) + icon = '%s flag' % (cc, self.icon_path, cc) return '%s %s' % (icon ,host) def hook(self): @@ -96,7 +96,7 @@ class IWLADisplayTopGeo(IPlugin): table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Countries'), ['', self.iwla._(u'Country'), self.iwla._(u'Visitors')]) table.setColsCSSClass(['', '', 'iwla_hit']) for (cc, visitors) in geo: - icon = 'Country flag' % (self.icon_path, cc) + icon = '%s flag' % (cc, self.icon_path, cc) table.appendRow([icon, cc, visitors]) table.computeRatio(2) page.appendBlock(table) @@ -114,7 +114,7 @@ class IWLADisplayTopGeo(IPlugin): table = display.createBlock(DisplayHTMLBlockTable, title, ['', self.iwla._(u'Countries'), self.iwla._(u'Visitors')]) table.setColsCSSClass(['', '', 'iwla_hit']) for (cc, visitors) in geo[:10]: - icon = 'Country flag' % (self.icon_path, cc) + icon = '%s flag' % (cc, self.icon_path, cc) table.appendRow([icon, cc, visitors]) table.computeRatio(2) index.appendBlock(table) diff --git a/plugins/display/operating_systems.py b/plugins/display/operating_systems.py index dfb88c3..98bec17 100644 --- a/plugins/display/operating_systems.py +++ b/plugins/display/operating_systems.py @@ -78,7 +78,7 @@ class IWLADisplayTopOperatingSystems(IPlugin): table = display.createBlock(DisplayHTMLBlockTable, self.iwla._(u'Operating Systems'), ['', self.iwla._(u'Operating System'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', '', 'iwla_hit']) for (os_name, entrance) in operating_systems: - icon = 'Operating system icon' % (self.icon_path, os_name) + icon = '%s icon' % (os_name, self.icon_path, os_name) table.appendRow([icon, os_name, entrance]) page.appendBlock(table) @@ -95,7 +95,7 @@ class IWLADisplayTopOperatingSystems(IPlugin): table = display.createBlock(DisplayHTMLBlockTable, title, ['', self.iwla._(u'Operating System'), self.iwla._(u'Entrance')]) table.setColsCSSClass(['', '', 'iwla_hit']) for (family, entrance) in os_families: - icon = 'Operating system icon' % (self.icon_path, self.icon_names[family]) + icon = '%s icon' % (self.icon_names[family], self.icon_path, self.icon_names[family]) table.appendRow([icon, family, entrance]) table.computeRatio(2) index.appendBlock(table)