[Mpuls-commits] r2496 - in wasko/branches/2.0: . mpulsweb/lib mpulsweb/public/styles

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Apr 22 15:45:38 CEST 2010


Author: roland
Date: 2010-04-22 15:45:36 +0200 (Thu, 22 Apr 2010)
New Revision: 2496

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/lib/renderer.py
   wasko/branches/2.0/mpulsweb/public/styles/color3.css
Log:
colour warning links in orange

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-22 13:44:47 UTC (rev 2495)
+++ wasko/branches/2.0/ChangeLog	2010-04-22 13:45:36 UTC (rev 2496)
@@ -50,6 +50,8 @@
 	* mpulsweb/controllers/case_bundle.py:
 	* mpulsweb/templates/casemanagement/overview.mako: Wald issue #1427: handle
 	plural forms in gettext
+	* mpulsweb/lib/renderer.py:
+	* mpulsweb/public/styles/color3.css: colour warning links in orange
 
 
 2010-04-21  Torsten Irländer <torsten.irlaender at intevation.de>

Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-22 13:44:47 UTC (rev 2495)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-22 13:45:36 UTC (rev 2496)
@@ -1036,18 +1036,23 @@
         tree = page.getInstanceTree()
 
         out = []
-        out.append(self.render_items(self.error_items, _('Formular errors'),
-                                     "/images/icons/info/alert.png", tree))
-        out.append(self.render_items(self.warnings, _('Formular warnings'),
-                                     "/images/icons/info/info.png", tree))
+        out.append(self.render_items(self.error_items,
+                                    _('Formular errors'),
+                                    "/images/icons/info/alert.png",
+                                    tree))
+        out.append(self.render_items(self.warnings,
+                                    _('Formular warnings'),
+                                    "/images/icons/info/info.png",
+                                    tree,
+                                    css_class = 'warning-box'))
         return "".join(out)
 
-    def render_items(self, items, title, icon, tree):
+    def render_items(self, items, title, icon, tree, css_class = ""):
         if not items:
             return ""
 
         out = []
-        out.append('<div class="widget dialog">')
+        out.append('<div class="widget dialog %s">' % css_class)
         out.append('<h1>')
         out.append(tag("img", src=icon, alt=''))
         out.append(escape(title))

Modified: wasko/branches/2.0/mpulsweb/public/styles/color3.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/color3.css	2010-04-22 13:44:47 UTC (rev 2495)
+++ wasko/branches/2.0/mpulsweb/public/styles/color3.css	2010-04-22 13:45:36 UTC (rev 2496)
@@ -43,8 +43,8 @@
 	border: 1px solid #a40000 !important;
 }
 
-.warning {
-	color: #f57900;
+.warning, .warning-box a.error {
+	color: #f57900 !important;
 }
 
 select.warning, input.warning, input[type="text"].warning {



More information about the Mpuls-commits mailing list