Changeset 587 for pagoda

Timestamp:

11/02/07 19:23:36 (1 year ago)

Author:

ian

Message:

redoing templates, haven't even checked in the client-side code yet so here goes. this is just for historical purposes

Files:

• pagoda/trunk/Pagoda/pagoda/controllers/admin.py (modified) (4 diffs)
• pagoda/trunk/Pagoda/pagoda/models/template.py (modified) (2 diffs)
• pagoda/trunk/Pagoda/pagoda/templates/admin/templates.html (added)
• pagoda/trunk/Pagoda/pagoda/view/engines.py (modified) (6 diffs)
• pagoda/trunk/Pagoda/pagoda/widgets/admin/static/css/templates.css (added)
• pagoda/trunk/Pagoda/pagoda/widgets/admin/static/javascript/templates.js (added)
• pagoda/trunk/Pagoda/setup.py (modified) (1 diff)

pagoda/trunk/Pagoda/pagoda/controllers/admin.py

@@ +1 @@
+import os
-from urlparse import urljoin
+from itertools import groupby
+from operator import attrgetter
+import pkg_resources
+from sqlalchemy.util import OrderedDict
-import cherrypy
-from cherrypy import request, response, session
@@ -9 +14 @@
-from pagoda.controllers.util import *
-from pagoda import config, models, widgets, plugins, validators, workflow
+from pagoda.view.engines import get_engine
-
-__all__ = ['EditController', 'LiveController', 'AdminContentController',
@@ -268 +274 @@
-
-
+class TemplatesController(Controller, identity.SecureResource):
+    #require = identity.has_permission('pagoda_admin')
+    #@expose(format='json')
+    #def default(self, template_id, *args, **kwargs):
+        #template = models.Template.get(template_id)
+        #package = ".".join(template.template_path.split(".")[:-1])
+        #name = template.template_path.split(".")[:-1]
+        #pkg_resources.get_
+
+    #require = identity.has_permission('pagoda_admin')
+    #@expose(format='json')
+    #def create(self, *args, **kwargs):
+    #    """Creates a new template using specified `template_engine`."""
+    #    template_engine = kwargs.get('template_engine', None)
+    #    engine = get_engine(template_engine)
+    #    t = Template(
+    #        template_name="Untitled",
+    #        template_path=???,
+    #        template_engine=template_engine,
+    #        content_type=???
+    #    )
+
+    require = identity.has_permission('pagoda_admin')
+    @expose(format='json')
+    def get(self, *args, **kwargs):
+        """Return the unrendered template specified by `template_id` kwarg."""
+        template_id = kwargs.get('template_id', None)
+        template = models.Template.get(template_id)
+        f = open(template.filepath)
+        return dict(template_data = f.read())
+
+    require = identity.has_permission('pagoda_admin')
+    @expose(format='json')
+    def save(self, *args, **kwargs):
+        """Save the specified template.
+        
+        Looks up the template specified by the `template_id` kwarg, opens
+        that file, and overwrites the file with the new template given
+        by the `template_data` kwarg.
+        
+        """
+        template_id = kwargs.get('template_id', None)
+        template_data = kwargs.get('template_data', None)
+        template = models.Template.get(template_id)
+        f = open(template.filepath, 'w')
+        f.write(template_data)
+        f.close()
+        return dict()
+
+    require = identity.has_permission('pagoda_admin')
+    @expose(template="genshi:pagoda.templates.admin.templates", format="html")
+    def index(self, *args, **kwargs):
+        # Get all templates and compute filename for each.
+        templates = models.Template.select()
+        for template in templates:
+            template.template_filename = os.path.basename(template.filepath)
+        
+        # Construct a SelectField containing all known content types
+        from toscawidgets.widgets.forms import SingleSelectField, validators
+        content_types = []
+        entry_point_id = 'pagoda.content_types.models'
+        for entry_point in pkg_resources.iter_entry_points(entry_point_id):
+            content_types.append(entry_point.name)
+        content_types_field = SingleSelectField(
+            label=None,
+            options=zip(content_types, content_types)
+        )
+
+        # Group templates by content_type.
+        grouped_templates = OrderedDict()
+        for k, group in groupby(templates, attrgetter('content_type')):
+            grouped_templates[k] = list(group)
+        return dict(
+            grouped_templates=grouped_templates,
+            content_types_field=content_types_field
+        )
+
-class PagodaAdminController(RootController):
-    edit = EditController()
@@ -277 +360 @@
-    plugins = PluginsController()
-    settings = SettingsController()
+    templates = TemplatesController()
-
-    @expose(template="genshi:pagoda.templates.admin.control_panel", format="html")

pagoda/trunk/Pagoda/pagoda/models/template.py

@@ -5 +5 @@
-from sqlalchemy.ext.assignmapper import assign_mapper
-from turbogears.database import metadata, session
+from pagoda.view.engines import get_engine
-
-__all__ = ['template_table', 'Template']
@@ -10 +11 @@
-template_table = Table('template', metadata,
-    Column('template_id', Integer, primary_key=True),
-Tru
+Fals
-    Column('template_path', Unicode, nullable=True),
-
+
+
-)
-
-class Template(object):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-assign_mapper(session.context, Template, template_table)

pagoda/trunk/Pagoda/pagoda/view/engines.py

@@ -8 +8 @@
-
-engines = dict()
-
-class MetaDeprecatedVariableProviders(type):
-    def __new__(cls, name, bases, dict):
-        for (key, value) in dict.items():
-            if key == "__metaclass__":
-                continue
-            if callable(value):
-                dict[key] = print_warning(value)
-        return type.__new__(cls, name, bases, dict)
-
-def split_template_path(template_uri):
@@ -41 +32 @@
-    return engine
-
-
-class PagodaTemplatePlugin(object):
-    @property
@@ -48 +38 @@
-        raise NotImplemented
-
-
-
-
+
+
+
+
-        package = ".".join(pieces[:-1])
-
+:
-            filename = pkg_resources.resource_filename(
-                package, "%s.%s" % (pieces[-1], extension)
@@ -61 +52 @@
-        
-    def safe_xml(self, data):
-s
+
-        raise NotImplemented
-
+
+
+
+
-
-class GenshiPlugin(PagodaTemplatePlugin):
@@ -78 +72 @@
-    def safe_xml(self, data):
-        return self.genshi.Markup(data)
+    
+    def get_default_template(self):
+        path = pkg_resources.resource_filename(
+            'pagoda.view.templates', 'genshi.html'
+        )
+        f = open(path)
+        return f.read()
-
-
@@ -94 +95 @@
-        return self.kid.XML(data)
-
+    def get_default_template(self):
+        path = pkg_resources.resource_filename(
+            'pagoda.view.templates', 'kid.kid'
+        )
+        f = open(path)
+        return f.read()
+
-ENGINE_MAP = {
-    'genshi': GenshiPlugin,

pagoda/trunk/Pagoda/setup.py

@@ -36 +36 @@
-        "TurboGears >= 1.0.3, < 1.0.4",
-        "Genshi >= 0.4",
-
+
+
+
+
+
-        "SQLAlchemy >= 0.3.8, <= 0.3.10",
-        "dateutil"