[Mpuls-commits] r2443 - in wasko/branches/2.0/mpulsweb: controllers lib public/styles

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-20 16:09:44 +0200 (Tue, 20 Apr 2010)
New Revision: 2443

Modified:
   wasko/branches/2.0/mpulsweb/controllers/formularpage.py
   wasko/branches/2.0/mpulsweb/lib/renderer.py
   wasko/branches/2.0/mpulsweb/public/styles/screen.css
Log:
cleanup

Modified: wasko/branches/2.0/mpulsweb/controllers/formularpage.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/formularpage.py	2010-04-20 14:07:59 UTC (rev 2442)
+++ wasko/branches/2.0/mpulsweb/controllers/formularpage.py	2010-04-20 14:09:44 UTC (rev 2443)
@@ -121,8 +121,6 @@
     # Currently values of the fields are set within the renderer.
     # Htmlfill is used to fill in the error values from the error items.
     defaults = prepare_htmlfill_defaults(defaults)
-    print "++++++++++++++++++++++++++++++Error %s ++++++++++++++++++++++" % errors
-    print "++++++++++++++++++++++++++++++Warning %s ++++++++++++++++++++++" % renderer.warnings
     
     # Parse the real errors
     parsedForm = formencode.htmlfill.render(form,

Modified: wasko/branches/2.0/mpulsweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-20 14:07:59 UTC (rev 2442)
+++ wasko/branches/2.0/mpulsweb/lib/renderer.py	2010-04-20 14:09:44 UTC (rev 2443)
@@ -349,6 +349,9 @@
         return "".join(out)
 
     def _renderErrors(self, node):
+        """
+        Render errors and warnings
+        """
         meta = self._getMeta(node)
         hasWarnings = node.getIdentifier() in self.warnings
         out = []
@@ -356,22 +359,11 @@
             spanClass = 'warning'
         else:
             spanClass = 'error'
-            
-        #if node.hasErrors() or True:
-            #out.append('<span class="error">')
-            #out.append(tag("form:error", name=node.getIdentifier(),
-                           #format=""))
-            #out.append('</span>')
+
         out.append('<span class="%s">' % spanClass)
-        if hasWarnings and not node.hasErrors():
-            out.append(tag("form:%s" % spanClass,
-                    name      = node.getIdentifier(),
-                    format    = '',
-                    formatter = 'none'))
-        else:
-            out.append(tag("form:%s" % spanClass,
-                    name   = node.getIdentifier(),
-                    format =""))
+        out.append(tag("form:%s" % spanClass,
+                name      = node.getIdentifier(),
+                format    = ''))
         out.append('</span>')
         
         return "".join(out)

Modified: wasko/branches/2.0/mpulsweb/public/styles/screen.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/screen.css	2010-04-20 14:07:59 UTC (rev 2442)
+++ wasko/branches/2.0/mpulsweb/public/styles/screen.css	2010-04-20 14:09:44 UTC (rev 2443)
@@ -506,11 +506,7 @@
 select, input[type="text"]{
     border: 1px solid #babdb6;
     height: 1.5em;
-}
-
-select{
     background-color: white;
-    height:           1.5em;
 }
 
 input[type="text"][disabled], input[type="text"][disabled="disabled"]