changeset 312:928d0324af65

macro.Image: simplified return
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Thu, 27 Nov 2008 16:07:50 +0100
parents 81dc3a93fd84
children ba7dae2cfec0
files data/plugin/macro/Image.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/macro/Image.py	Thu Nov 27 15:39:12 2008 +0100
+++ b/data/plugin/macro/Image.py	Thu Nov 27 16:07:50 2008 +0100
@@ -247,12 +247,11 @@
     if '/' not in itemname:
         itemname = macro.formatter.page.page_name + '/' + itemname
     img = Image(macro.request, itemname, caption=alt)
-    return "%s%s%s%s%s%s%s%s%s%s%s" % ('<div class="thumbnail">', 
+    return """<div class="thumbnail">%s<div class="decription"><div style="width:%spx">%s
+              <div class="show-datetime">%s</div></div></div></div>""" % (
                                      macro.formatter.image(src=img.url((width, height)), alt=img.caption),
-                                     '<div class="decription">',
-                                     '<div style="width:%spx">' % (width),
+                                     width,
                                      macro.formatter.text(description),
-                                     '<div class="show-datetime">',
                                      macro.request.user.getFormattedDateTime(img.ctime),
-                                     '</div>', '</div>', '</div>', '</div>')
+                                     )