From 20fc077b5ba3d3de1d14a3ccf036411ac654c9e1 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 4 Sep 2013 10:48:01 +0200 Subject: [PATCH] [tv, wiki, dns] vignette et liste des chaines sur cochon. --- gestion/gen_confs/bind.py | 2 +- wiki/macro/TV.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gestion/gen_confs/bind.py b/gestion/gen_confs/bind.py index c1866192..16c9782d 100755 --- a/gestion/gen_confs/bind.py +++ b/gestion/gen_confs/bind.py @@ -242,7 +242,7 @@ zone "%(NOM_zone)s" { lignes_d = '\n' lignes_r = '\n' - lignes_d +='@\tIN\tA\t%s\n' % '138.231.136.243' + lignes_d +='@\tIN\tA\t%s\n' % '138.231.136.88' for line in sap: [nom,ip]=line.split(':') nom=re.sub('TNT([0-9]*) ','',nom) # on enlève les TNT## des noms diff --git a/wiki/macro/TV.py b/wiki/macro/TV.py index 675319e6..3331d356 100644 --- a/wiki/macro/TV.py +++ b/wiki/macro/TV.py @@ -2,8 +2,8 @@ Dependencies = ["Time"] -SAP_FILE_URL = "http://tv/sap.txt" -BASE_IMAGE_URL = "http://tv/images/" +SAP_FILE_URL = "http://tv.crans.org/sap.txt" +BASE_IMAGE_URL = "http://tv.crans.org/images/" IMAGE_SUFFIX = ".jpg" SMALL_IMAGE_SUFFIX = "_petites.jpg" @@ -70,14 +70,14 @@ def execute(macro, args): text+= macro.formatter.table_row(1) text+= macro.formatter.table_cell(1, {'style':'text-align:center;'}) text+= macro.formatter.strong( 1 ) - text+= macro.formatter.text( a_channel["name"] ) + text+= macro.formatter.text( unicode(a_channel["name"], 'utf-8') ) 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, url=a_channel["url"], style="text-decoration:none;") - text+= macro.formatter.image( src=a_channel["image_url"], alt="No image", style="width:%s;" % IMAGE_WIDTH ) + text+= macro.formatter.image( src=a_channel["image_url"], alt="", style="width:%s;" % IMAGE_WIDTH ) text+= macro.formatter.linebreak( 0 ) - text+= macro.formatter.text( "Regarder maintenant" ) +# text+= macro.formatter.text( "Regarder maintenant" ) text+= macro.formatter.url(0) text+= macro.formatter.table_cell(0) if i == IMAGES_PER_LINE - 1: