[wiki] on arrete de balancer du HTML

Ces macros sont appel'ees par getpagelinks. Si elles balancent n'importe
quoi lorsqu'on cherche a obtenir leurs liens, CategoriePagePublique
n'apparait pas...

darcs-hash:20090427142002-bd074-46977e63783af21b013023b46ee7e289020f28a7.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-04-27 16:20:02 +02:00
parent d91a411300
commit 6b0022645d
8 changed files with 25 additions and 23 deletions

View file

@ -110,11 +110,11 @@ def execute (macro, text, args_re=None):
try: res = _execute (macro, text)
except Exception, msg:
return """
return macro.formatter.rawHTML("""
<p><strong class="error">
Error: macro ProgressBar: %s</strong> </p>
""" % escape ("%s" % msg)
return res
""" % escape ("%s" % msg))
return macro.formatter.rawHTML(res)
def _execute (macro, text):
@ -167,15 +167,15 @@ def _execute (macro, text):
if len (fmt): t = "<%s> ||" % fmt
else: t = " ||"
return txt + t
# Progress
if text.endswith ('%'):
# correction du bug des 0%
if text == "0%":
for f in [fmt [1]] :
for f in [fmt [1]] :
res = cell (res, f)
else:
for f in fmt [0] + ' %s' % text, fmt [1] :
for f in fmt [0] + ' %s' % text, fmt [1] :
res = cell (res, f)
# Current/Steps