From 308dd1a2e8709139b251780ee0fa29ac4a26987c Mon Sep 17 00:00:00 2001 From: gdetrez Date: Thu, 7 Dec 2006 12:35:30 +0100 Subject: [PATCH] disvers correction de style + utilisation de la bonne version du formatteur darcs-hash:20061207113530-f46e9-d0c2a6c1e46904a08d70e21b9ab8f2b7b9909922.gz --- wiki/macro/TV.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/wiki/macro/TV.py b/wiki/macro/TV.py index 09b97587..71d86811 100644 --- a/wiki/macro/TV.py +++ b/wiki/macro/TV.py @@ -60,12 +60,12 @@ def execute(macro, args): text = macro.formatter.table(1,{}) i = 0 for a_channel in ch_list: - if CATHEGORY: - if not a_channel["name"].startswith(CATHEGORY): - continue - if CHANNEL: - if a_channel["name"].find(CHANNEL)<0: - continue + if CATHEGORY: + if not a_channel["name"].startswith(CATHEGORY): + continue + if CHANNEL: + if a_channel["name"].find(CHANNEL)<0: + continue if i == 0: text+= macro.formatter.table_row(1) text+= macro.formatter.table_cell(1, {'style':'text-align:center;'}) @@ -73,7 +73,8 @@ def execute(macro, args): text+= macro.formatter.text( a_channel["name"] ) text+= macro.formatter.strong( 0 ) text+= macro.formatter.linebreak( 0 ) - text+= macro.formatter.url(1, href=a_channel["url"], style="text-decoration:none;") + #text+= macro.formatter.url(1, href=a_channel["url"], style="text-decoration:none;") + text+= macro.formatter.url(1, url=a_channel["url"], style="text-decoration:none;") text+= macro.formatter.image( src=a_channel["image_url"], alt="No image", style='%s' % IMAGE_WIDTH ) text+= macro.formatter.linebreak( 0 ) text+= macro.formatter.text( "Regarder maintenant" ) @@ -89,4 +90,4 @@ def execute(macro, args): text+= macro.formatter.table(0) return text - \ No newline at end of file +