[Mpuls-commits] r4605 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-02-10 17:17:55 +0100 (Thu, 10 Feb 2011)
New Revision: 4605

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/formedrenderer.py
Log:
* mpulsweb/lib/formedrenderer.py (UrlFactory.icon): Inline the
code of the icon function imported from the old renderer
module. That function was not used anywhere else anyway.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-02-10 15:31:31 UTC (rev 4604)
+++ base/trunk/ChangeLog	2011-02-10 16:17:55 UTC (rev 4605)
@@ -1,5 +1,11 @@
 2011-02-10  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/formedrenderer.py (UrlFactory.icon): Inline the
+	code of the icon function imported from the old renderer
+	module. That function was not used anywhere else anyway.
+
+2011-02-10  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/helpers.py (PRINTABLE): Removed. Not used anywhere
 	in mpulsweb or the current applications anymore.
 

Modified: base/trunk/mpulsweb/lib/formedrenderer.py
===================================================================
--- base/trunk/mpulsweb/lib/formedrenderer.py	2011-02-10 15:31:31 UTC (rev 4604)
+++ base/trunk/mpulsweb/lib/formedrenderer.py	2011-02-10 16:17:55 UTC (rev 4605)
@@ -32,7 +32,6 @@
 from formed.renderer.helpers import tag
 
 from mpulsweb.lib.helpers import url_for
-from mpulsweb.lib.renderer import icon
 
 
 class UrlFactory(BaseUrlFactory):
@@ -41,7 +40,8 @@
         return url_for(controller=controller, action=action, id=id)
 
     def icon(self, name):
-        return icon(name)
+        """Return the url for the icon given by name."""
+        return url_for("/images/icons/" + name)
 
 
 class ViewRenderer(HtmlRenderer):