Changeset 42

Timestamp:

01/30/07 21:37:41 (5 years ago)

Author:

tim

Message:

initial theme support (#16) -- testing and refinement required

Location:

trunk

Files:

• cogplanet/admin/controller.py (modified) (2 diffs)
• cogplanet/controllers.py (modified) (3 diffs)
• cogplanet/model.py (modified) (1 diff)
• themes (added)
• themes/__init__.py (added)
• themes/planettg (added)
• themes/planettg/index.html (added)
• themes/planettg/__init__.py (added)
• themes/planettg/layout.html (added)
• themes/planettg/static (added)
• themes/planettg/static/css (added)
• themes/planettg/static/css/style.css (added)
• themes/planettg/static/images (added)
• themes/planettg/static/images/logo.png (added)

trunk/cogplanet/admin/controller.py

@@ -15 +15 @@
     id = HiddenField(name="id")
     name = TextField(name="name", attrs={'size':60})
+    theme_package = TextField(name="theme_package",
+                              label="Theme Package",
+                              attrs={'size': 60})
     display_entries = TextField(name="display_entries",
                                 label="Entries to display",
@@ -96 +99 @@
         planet = Planet.selectone()
         planet.name = kw['name']
+        planet.theme_package = kw['theme_package']
         planet.display_entries = kw['display_entries']
         planet.update_interval = kw['update_interval']

trunk/cogplanet/controllers.py

@@ -4 +4 @@
 from cogplanet import json
 import cherrypy
+import pkg_resources
 from cherrypy import request, response
 from genshi.template import MarkupTemplate
@@ -31 +32 @@
 from cogplanet.admin.controller import AdminController
 
-class PlanetController(controllers.Controller, Restful):
+class PlanetController(controllers.Controller):
     admin = AdminController()
+
+    @expose()
+    def default(self, *vpath, **params):
+        print vpath
+        if vpath[0] == "theme":
+            # TODO fix the content-type headers
+            try:
+                planet = Planet.selectone()
+                file_name = "static/" + "/".join(vpath[1:])
+                str = pkg_resources.resource_stream(planet.theme_package, file_name).read()
+                cherrypy.response.headers['Content-Type'] = 'text/css'
+                return(str)
+            except IOError:
+                pass
+        raise cherrypy.NotFound
+            
 
     @expose(template="genshi:cogplanet.templates.index")
@@ -44 +61 @@
         return {"entries":entries,
                 "feeds":feeds,
-                "planet": planet}
+                "planet": planet,
+                "tg_template": "genshi:%s.index" % planet.theme_package}
 
     @expose(template="genshi:cogplanet.templates.feeds")

trunk/cogplanet/model.py

@@ -30 +30 @@
         name = column(Unicode, nullable=False)
         display_entries = column(Integer, default=50, nullable=False)
+        theme_package = column(Unicode(255), default='cogplanet.templates', nullable=False)
         update_interval = column(Integer, default=1440, nullable=False)
         # TODO cascade='delete' (currently unsupported)