[Mpuls-commits] r3164 - in base/trunk: . mpulsweb/lib mpulsweb/public/styles

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-07-09 11:36:18 +0200 (Fri, 09 Jul 2010)
New Revision: 3164

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/renderer.py
   base/trunk/mpulsweb/public/styles/all.css
Log:
output the icons' URL from the renderer

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-07-09 07:50:53 UTC (rev 3163)
+++ base/trunk/ChangeLog	2010-07-09 09:36:18 UTC (rev 3164)
@@ -1,3 +1,10 @@
+2010-07-09  Roland Geider  <roland.geider at intevation.de>
+
+        * mpulsweb/lib/renderer.py,
+          mpulsweb/public/styles/all.css: output the icons' URL from the
+          renderer to make it work with projects that have more than one
+          application (e.g. jmd and jmd-structure)
+
 2010-07-08  Bernhard Herzog  <bh at intevation.de>
 
 	* development.ini: Include the date in log messages.  Ported from

Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py	2010-07-09 07:50:53 UTC (rev 3163)
+++ base/trunk/mpulsweb/lib/renderer.py	2010-07-09 09:36:18 UTC (rev 3164)
@@ -391,6 +391,7 @@
                                 name   = "del_rg|%s" % child.getIdentifier(),
                                 type   = "submit",
                                 class_ = "pseudo_imagebutton del_rg",
+                                style  = 'background-image:url("%s")' % icon("delete_active_16.png"),
                                 title  = _('Delete RG')))
                 
             out.append('</td>')
@@ -406,6 +407,7 @@
                         name   = "add_rg|%s" % node.getIdentifier(),
                         type   = "submit",
                         class_ = "pseudo_imagebutton add_rg",
+                        style  = 'background-image:url("%s")' % icon("new_16.png"),
                         title  = _('Add new RG')))
             out.append("</td>")
             out.append("</tr>")

Modified: base/trunk/mpulsweb/public/styles/all.css
===================================================================
--- base/trunk/mpulsweb/public/styles/all.css	2010-07-09 07:50:53 UTC (rev 3163)
+++ base/trunk/mpulsweb/public/styles/all.css	2010-07-09 09:36:18 UTC (rev 3164)
@@ -252,14 +252,6 @@
     width:              16px;
 }
 
-.formularpage .del_rg {
-    background-image:   url("/images/icons/delete_active_16.png");
-}
-
-.formularpage .add_rg {
-    background-image:   url("/images/icons/new_16.png");
-}
-
 .formularpage input[type="submit"] {
 	width:  auto;
         border: 1px solid #555753;