changeset 469:045b03f49a3e

merge
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Mon, 21 Dec 2009 20:36:26 +0300
parents 8b53c9f8da32 (current diff) 6e5f50c5855f (diff)
children 67b064b600e9
files
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/macro/CycleContent.py	Mon Dec 21 20:35:18 2009 +0300
+++ b/data/plugin/macro/CycleContent.py	Mon Dec 21 20:36:26 2009 +0300
@@ -2,9 +2,9 @@
 """
     MoinMoin - Cylce Content Macro
 
-    Selects a pagename from CycleContent or a given page and cycles 
+    Selects a pagename from CycleContent or a given page and cycles
     it by the refresh rate given on the page e.g. #refresh 5 ExamplePage
-    For an attachment from a cycled page of name MyPage use an absolute 
+    For an attachment from a cycled page of name MyPage use an absolute
     name for the attachment e.g. {{attachment:MyPage/image.png}}
 
     Usage:
@@ -22,7 +22,7 @@
     Based on RandomQuote
     Originally written by Thomas Waldmann.
     Gustavo Niemeyer added wiki markup parsing of the quotes.
-    
+
 """
 from MoinMoin.action import cache
 from MoinMoin.Page import Page
@@ -79,3 +79,4 @@
                                      content_only=1, content_id="CycleContent")
 
     return quote
+
--- a/data/plugin/macro/DataRevPlot.py	Mon Dec 21 20:35:18 2009 +0300
+++ b/data/plugin/macro/DataRevPlot.py	Mon Dec 21 20:36:26 2009 +0300
@@ -103,12 +103,12 @@
     points1 = svgfig.Dots(zip(x, y),
               svgfig.make_symbol("data1", stroke="black", fill="red",
                                  stroke_width="0.25pt"))
-    # define scientific plot 
+    # define scientific plot
     svgfig.Frame.text_ytitle_offset = 16
     myFrame = svgfig.Frame(xrange[0], xrange[1], 0, max(y) + 0.05 * max(y),
                            points1, xtitle='days (%d = today)' % len(y),
                            ytitle=parameter).SVG()
-    # create complete svg xml 
+    # create complete svg xml
     data = myFrame.standalone_xml()
     # create key
     key = cache.key(request, itemname=pagename, content=data)
@@ -131,3 +131,4 @@
     return m.execute('EmbedObject',
           u'width=%s, height=%s, target=%s, url_mimetype=%s' % (
           width, height, url, content_type))
+