The validator now better deduces property declarations by also recursing datablock inheritance; fix datablock inheritance erroneously including commenting on the same line; fix bugs in dealing with datablock redeclarations; make HTML exporter output some basic website structure with Bootstrap; Adjust datablock property checks a little bit

exporters/doku.py

@@ -10,8 +10,7 @@ class Exporter(object):
     def __init__(self, data):
         self.data = data
 
-    def write(self, directory):
-        
+    def write(self, directory):        
         with open("Out.txt", "w") as handle:
             # Write the header
             handle.write("====== Test ======\n\n")

exporters/html.py

@@ -3,6 +3,7 @@ import os
 import sys
 import importlib
 import os.path
+import shutil
 
 class Exporter(object):
     data = None
@@ -18,7 +19,6 @@ class Exporter(object):
 
             try:
                 if (os.path.isdir(mirrored_path)):
-                    print(relative_path)
                     os.mkdir(relative_path)
             except OSError:
                 pass
@@ -50,7 +50,7 @@ class Exporter(object):
             # FIXME: Dirty hack to make sure the os.path.join works
             html_filename = file.path.replace(self.target_directory + "/", "")
             script_relative = html_filename
-
+            file.mod_path = html_filename
             script_relative_paths.append(script_relative)
 
             # Next, we ensure that the subdirectories exist
@@ -58,15 +58,22 @@ class Exporter(object):
             html_filename, oldextension = os.path.splitext(html_filename)
             html_filename = "%s.html" % html_filename
             html_filenames.append(html_filename)
+            file.web_path = html_filename
 
             with open(os.path.join(directory, html_filename), "w") as handle:
                 template = jinja2.Template(file_template)
-                handle.write(template.render(file=file.path, globals=file.global_functions))
+                handle.write(template.render(file=file))
 
         # Dump the index file
         with open(os.path.join(directory, "index.html"), "w") as handle:
             template = jinja2.Template(index_template)
 
-            handle.write(template.render(files=script_relative_paths))
+            handle.write(template.render(files=self.data["files"]))
+
+        # Puke bootstrap into the directory
+        try:
+            shutil.copytree("data/bootstrap", os.path.join(directory, "bootstrap"))
+        except OSError:
+            pass
 
         print("Done processing.")