Index: /branch/PreferencesWindow/umitExport/HTML/Parse.py
===================================================================
--- /branch/PreferencesWindow/umitExport/HTML/Parse.py (revision 3645)
+++ /branch/PreferencesWindow/umitExport/HTML/Parse.py (revision 3650)
@@ -19,5 +19,5 @@
 
 from umitExport.Parse import Export
-from umitExport.HTML.Codes import Node 
+from umitExport.HTML.Codes import Node, STYLE
 
 BR = Node(None, None, "<br />")
@@ -31,4 +31,5 @@
         head = Node('head')
         self.head.add_child(head)
+        self.add_style(STYLE)
     def add_style(self, style_t):
         headtag = self.head.get_childs()[0]
@@ -74,4 +75,5 @@
         services = self.get_port_services()
         body.add_child(services)
+        body.add_child(self.get_nmap_output())
         return self.head.get_html()
     def get_body(self, head):
@@ -117,6 +119,4 @@
                 td.add_child(Node(None, None, value))
                 tr.add_child(td)
-                
-            
             table.add_child(tr)
             
@@ -124,4 +124,9 @@
     
     def get_port_services(self):
+        """
+        Returns port and services
+        """
+        
+        
         group = Node('div', [{'name':'width', 'value':'60%'}])
         
@@ -144,3 +149,15 @@
             group.add_child(BR)
         return group
-                
+    def get_nmap_output(self):
+        """ Return Node with nmap output """
+        
+        div = Node('div',[{'name':'width', 'value':'60%'}])
+        title = Node(None, None, '<b><h2>Nmap outpuut:</h2></b> <br />')
+        div.add_child(title)
+        
+        pre = Node('pre' , [{'name':'width', 'value':'60%'}])
+        output = Node(None, None, self.parse.nmap_output)
+        pre.add_child(output)
+        div.add_child(pre)
+        
+        return div
Index: /branch/PreferencesWindow/umitExport/HTML/Codes.py
===================================================================
--- /branch/PreferencesWindow/umitExport/HTML/Codes.py (revision 3634)
+++ /branch/PreferencesWindow/umitExport/HTML/Codes.py (revision 3650)
@@ -23,4 +23,70 @@
 TITLE_C = "</title>"
 BL = "<br />"
+
+STYLE = """
+
+body {
+margin-left:auto; margin-right:auto;
+text-align:center;
+font:12px Arial, Helvetica, sans-serif;
+background-color:#FFCC66;
+color: #000000;
+}
+
+h1
+{
+font:14px Arial, Helvetica, sans-serif;
+}
+
+
+h2
+{
+font-style:oblique;
+font-weight:bold;
+font:13px Arial, Helvetica, sans-serif;
+}
+
+
+tr
+{
+/*
+border-style: hidden;*/
+font:11px Arial, Helvetica, sans-serif;
+}
+td
+{
+/*
+border-color: black;
+border-style: solid;*/
+font:11px Arial, Helvetica, sans-serif;
+}
+
+
+pre
+{
+background-color: #FFFFCC;
+margin-left: auto;
+margin-right: auto;
+}
+
+table
+{ 
+
+font-family: sans;
+font-size: 9pt;
+
+background-color: #FFFFCC;
+border-style: hidden;
+margin-left: auto;
+margin-right: auto;
+border-color: green;
+border: 0.5px solid black;
+border-collapse: collapse;
+}
+
+
+"""
+
+
 
 """
Index: /branch/PreferencesWindow/parse.py
===================================================================
--- /branch/PreferencesWindow/parse.py (revision 3645)
+++ /branch/PreferencesWindow/parse.py (revision 3650)
@@ -2,6 +2,6 @@
 
 from umitCore.NmapParser import NmapParser
-#file_to_parse = open("/home/bastiao/Desktop/export.usr")
-file_to_parse = open("quick.usr")
+file_to_parse = open("/home/bastiao/Desktop/export.usr")
+#file_to_parse = open("quick.usr")
 np = NmapParser(file_to_parse)
 np.parse()
@@ -18,55 +18,3 @@
 a = umitExport.HTML.Parse.ExportHTML(np, \
                                      "file.html")
-a.add_style("""
-body {
-margin-left:auto; margin-right:auto;
-text-align:center;
-font:12px Arial, Helvetica, sans-serif;
-background-color:#FFCC66;
-color: #000000;
-}
-
-h1
-{
-font:14px Arial, Helvetica, sans-serif;
-}
-
-
-h2
-{
-font-style:oblique;
-font-weight:bold;
-font:13px Arial, Helvetica, sans-serif;
-}
-
-
-tr
-{
-
-border-style: hidden;
-font:11px Arial, Helvetica, sans-serif;
-}
-td
-{
-border-color: black;
-border-style: solid;
-font:11px Arial, Helvetica, sans-serif;
-}
-
-
-
-
-table
-{ 
-background-color: #FFFFCC;
-border-style: hidden;
-margin-left: auto;
-margin-right: auto;
-border-color: green;
-}
-
-
-
-
-""")
 a.save()