[Checkins] SVN: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/ more chages

[Christian Klinger]

Log message for revision 97133:
  more chages

Changed:
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/__init__.py
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/component.py
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/directive.py
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py

-=-
Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/__init__.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/__init__.py	2009-02-23 08:04:32 UTC (rev 97132)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/__init__.py	2009-02-23 10:19:42 UTC (rev 97133)
@@ -1,3 +1,3 @@
 from megrok.pagelet.component import Layout, Pagelet 
 from grokcore.component import name, title, description
-from megrok.pagelet.directive import layout, template 
+from megrok.pagelet.directive import template

Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/component.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/component.py	2009-02-23 08:04:32 UTC (rev 97132)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/component.py	2009-02-23 10:19:42 UTC (rev 97133)
@@ -47,12 +47,6 @@
         pass
 
     def render(self):
-        # render content template
-        #if self.template is None:
-        #    template = component.getMultiAdapter(
-        #        (self, self.request), IContentTemplate)
-        #    return template(self)
-        
         # We don not work with IContentTemplate for now
         # We use instead our grok.View behavior with the associated
         # Templates

Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/directive.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/directive.py	2009-02-23 08:04:32 UTC (rev 97132)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/directive.py	2009-02-23 10:19:42 UTC (rev 97133)
@@ -1,11 +1,7 @@
 import martian
 
-class layout(martian.Directive):
-    scope = martian.CLASS
-    store = martian.ONCE
-    default = u'megrok.pagelet.layout'
-
 class template(martian.Directive):
     scope = martian.CLASS
     store = martian.ONCE
     default = u'megrok.pagelet.template'
+    

Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py	2009-02-23 08:04:32 UTC (rev 97132)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py	2009-02-23 10:19:42 UTC (rev 97133)
@@ -71,14 +71,6 @@
 
     def checkTemplates(self, templates, module_info, factory):
 
-        #def has_render(factory):
-        #    render = getattr(factory, 'render', None)
-        #    base_method = getattr(render, 'base_method', False)
-        #    return render and not base_method
-
-        #def has_no_render(factory):
-        #    return not getattr(factory, 'render', None)
-
         def has_render(factory):
             return factory.render != megrok.pagelet.component.Pagelet.render
         def has_no_render(factory):
@@ -110,7 +102,6 @@
     martian.directive(grokcore.component.context)
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
     martian.directive(grokcore.component.name, get_default=default_view_name)
-    martian.directive(megrok.pagelet.layout)
     martian.directive(megrok.pagelet.template)
 
     def grok(self, name, factory, module_info, **kw):
@@ -119,12 +110,12 @@
         factory.module_info = module_info
         return super(LayoutViewGrokker, self).grok(name, factory, module_info, **kw)
 
-    def execute(self, factory, config, context, layer, name, layout, template, **kw):
+    def execute(self, factory, config, context, layer, name, template, **kw):
         # __view_name__ is needed to support IAbsoluteURL on views
         factory.__view_name__ = name
         adapts = (context, layer)
 	#from grokcore.component.directive import name
-        # Let´s register it only for the given grok.name
+        # Let register it only for the given grok.name
 	name = grokcore.component.directive.name.bind().get(self)
 	path = '/'.join(factory.module_info.path.split('/')[:-1])
 	template = "%s/%s" %(path, template)