diff --git a/hms.py b/hms.py
index cc4569a..46e4d11 100644
--- a/hms.py
+++ b/hms.py
@@ -1,6 +1,4 @@
import modules
from hooks import *
-from themes import *
from generate import *
-modules.init()
diff --git a/modules.py b/modules.py
index 94b0806..61e1db7 100644
--- a/modules.py
+++ b/modules.py
@@ -10,16 +10,12 @@ import sys
import os
from os.path import dirname,join
-sys.path.append(dirname(dirname(dirname(__file__))))
-import settings
-
from hooks import *
-from themes import *
from generate import *
MODS_DIR = "modules"
modules = []
-exports = ['settings','export', 'export_as', 'hook', 'intercept','themeable','theme',
+exports = ['export', 'export_as', 'hook', 'intercept',
'generates', 'generate', 'Generated']
def export(func):
diff --git a/modules/blocks.py b/modules/blocks.py
index ea785c2..910e722 100644
--- a/modules/blocks.py
+++ b/modules/blocks.py
@@ -3,25 +3,19 @@
weight = -10
def init():
- print "Blocks module loaded."
-
block = generates('block')
export_as(block,'block')
- @themeable
- def block(blk):
- return u"""<div class='block block-%s'>
- <h3>%s</h3>
- <div class='content'>
- %s
- </div>
- </div>""" % (blk.name,blk.title,blk.content)
-
class Block(Generated):
name = "Block"
title = "<none>"
content = "<empty>"
def show(self):
- return theme('block', self)
+ return u"""<div class='block block-%s'>
+ <h3>%s</h3>
+ <div class='content'>
+ %s
+ </div>
+ </div>""" % (self.name,self.title,self.content)
export_as(Block,'Block')
diff --git a/modules/node.py b/modules/node.py
index ebea2b0..41531f1 100644
--- a/modules/node.py
+++ b/modules/node.py
@@ -7,13 +7,4 @@ def init():
content = ""
fields = {}
- @themeable
- def node(nd):
- return """<div class='node'>
- <h2>%s</h2>
- <div class='content'>
- %s
- </div>
- </div>""" % (nd.title, nd.content)
-
export_as(Node,"Node")
diff --git a/test.py b/test.py
index 8fbf658..d1b31fb 100755
--- a/test.py
+++ b/test.py
@@ -4,28 +4,15 @@ import os.path
import modules
from hooks import *
-from themes import *
from generate import generate
modules.init()
-THEME = "default"
-
@hook
def do_something(s):
print "Doing something with",s
-@themeable
-def page(path):
- return "Content for "+path
-
print "All modules loaded."
-th= __import__(os.path.join("themes",THEME,"theme"))
-th.override = override
-th.init()
-
-print theme('page','/')
-
for b in generate('block'):
print b.show()
diff --git a/th1.py b/th1.py
deleted file mode 100755
index 095473b..0000000
--- a/th1.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-from themes import theme,override
-
-@override
-def Test(x,y):
- return "Some vars: [%s, %s]" % (x,y)
-
-
-print theme('Test',2,3)
diff --git a/themes.py b/themes.py
deleted file mode 100644
index 8b642c8..0000000
--- a/themes.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/python
-
-themed = dict()
-
-def themeable(func):
- global themed
- name = func.__name__
- themed[name] = func
- def wrapper(*args,**kwargs):
- return (themed[name])(*args,**kwargs)
- wrapper.__name__ = name
- return wrapper
-
-def override(func):
- global themed
- themed[func.__name__] = func
- return func
-
-def theme(name,*args,**kwargs):
- global themed
- f = themed[name]
- return f(*args,**kwargs)
-
-
-@themeable
-def Test(x,y):
- return "<%s, %s>" % (x,y)
diff --git a/themes/default/theme.py b/themes/default/theme.py
deleted file mode 100644
index 1a8e10b..0000000
--- a/themes/default/theme.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-def init():
- @override
- def page(path):
- return """<html>
- <title>%s</title>
- <body>
- Some content.
- </body>
- </html>""" % path
-