[Epydoc-commits] SF.net SVN: epydoc: [1491] trunk/epydoc/src/epydoc

[<ed...@us...>]

Revision: 1491
          http://svn.sourceforge.net/epydoc/?rev=1491&view=rev
Author:   edloper
Date:     2007-02-13 18:16:36 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
- Reduced vertical whitespace space in epydoc-log.html

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/cli.py
    trunk/epydoc/src/epydoc/docwriter/html_css.py

Modified: trunk/epydoc/src/epydoc/cli.py
===================================================================
--- trunk/epydoc/src/epydoc/cli.py	2007-02-14 01:33:29 UTC (rev 1490)
+++ trunk/epydoc/src/epydoc/cli.py	2007-02-14 02:16:36 UTC (rev 1491)
@@ -1203,7 +1203,8 @@
         <h1 class="epydoc">Epydoc Log</h1>
         <p class="log">Epydoc started at %s</p>''')
     START_BLOCK = '<div class="log-block"><h2 class="log-hdr">%s</h2>'
-    MESSAGE = '<div class="log-%s"><pre class="log"><b>%s</b>: %s</pre></div>\n'
+    MESSAGE = ('<div class="log-%s"><b>%s</b>: \n'
+               '%s</div>\n')
     END_BLOCK = '</div>'
     FOOTER = "</body>\n</html>\n"
     
@@ -1239,12 +1240,20 @@
     def log(self, level, message):
         if message.endswith("(-v) to display markup errors."): return
         if level >= log.ERROR:
-            self.out.write(self.MESSAGE % ('error', 'Error', message))
-            self.is_empty = False
+            self.out.write(self._message('error', message))
+        elif level >= log.WARNING:
+            self.out.write(self._message('warning', message))
         elif level >= log.DOCSTRING_WARNING:
-            self.out.write(self.MESSAGE % ('warning', 'Warning', message))
-            self.is_empty = False
+            self.out.write(self._message('docstring warning', message))
 
+    def _message(self, level, message):
+        self.is_empty = False
+        message = plaintext_to_html(message)
+        if '\n' in message:
+            message = '<pre class="log">%s</pre>' % message
+        hdr = ' '.join([w.capitalize() for w in level.split()])
+        return self.MESSAGE % (level.split()[-1], hdr, message)
+
     def close(self):
         if self.is_empty:
             self.out.write('<div class="log-info">'

Modified: trunk/epydoc/src/epydoc/docwriter/html_css.py
===================================================================
--- trunk/epydoc/src/epydoc/docwriter/html_css.py	2007-02-14 01:33:29 UTC (rev 1490)
+++ trunk/epydoc/src/epydoc/docwriter/html_css.py	2007-02-14 02:16:36 UTC (rev 1491)
@@ -318,25 +318,25 @@
 .nomargin                   { margin-top: 0; margin-bottom: 0; }
 
 /* HTML Log */
-div.log-block               { padding: 0; margin: .5em;
+div.log-block               { padding: 0; margin: .5em 0 .5em 0;
                               background: $log_bg; color: $log_fg;
                               border: $log_border; }
-div.log-error               { padding: .5em; margin: .5em;
+div.log-error               { padding: .1em .3em .1em .3em; margin: 4px;
                               background: $log_error_bg; color: $log_error_fg;
                               border: $log_error_border; }
-div.log-warning             { padding: .5em; margin: .5em;
+div.log-warning             { padding: .1em .3em .1em .3em; margin: 4px;
                               background: $log_warn_bg; color: $log_warn_fg;
                               border: $log_warn_border; }
-div.log-info               { padding: .5em; margin: .5em;
+div.log-info               { padding: .1em .3em .1em .3em; margin: 4px;
                               background: $log_info_bg; color: $log_info_fg;
                               border: $log_info_border; }
 h2.log-hdr                  { background: $log_hdr_bg; color: $log_hdr_fg;
-                              margin: 0; padding: 0.1em 0.5em 0.1em 0.5em;
-                              border-bottom: $log_border; }
-p.log                       { font-weight: bold; }
+                              margin: 0; padding: 0em 0.5em 0em 0.5em;
+                              border-bottom: $log_border; font-size: 110%; }
+p.log                       { font-weight: bold; margin: .5em 0 .5em 0; }
 tr.opt-changed              { color: $opt_changed_fg; font-weight: bold; }
 tr.opt-default              { color: $opt_default_fg; }
-pre.log                     { margin: 0; padding: 0; }
+pre.log                     { margin: 0; padding: 0; padding-left: 1em; }
 """ 
 
 ############################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.