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 +