extend HTML head title; make retrieving of type concept independent of current container

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3296 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-03-24 11:26:17 +00:00
parent 4a65b2d87a
commit b9fa00b1e7
2 changed files with 7 additions and 4 deletions

View file

@ -267,7 +267,7 @@ class TypeInstances(object):
@Lazy
def typeConcept(self):
return self.context[self.typeName]
return self.context.getLoopsRoot().getConceptManager()[self.typeName]
@Lazy
def typeToken(self):

View file

@ -24,6 +24,7 @@ $Id$
from zope.app.security.interfaces import IUnauthenticatedPrincipal
from zope.cachedescriptors.property import Lazy
from zope import component
from cybertools.composer.layout.browser.view import Page
from loops.common import adapted
@ -34,7 +35,7 @@ class LayoutNodeView(Page):
@Lazy
def loopsRoot(self):
return self.context.getLoopsRoot()
@Lazy
def defaultPredicate(self):
return self.loopsRoot.getConceptManager().getDefaultPredicate()
@ -75,8 +76,10 @@ class LayoutNodeView(Page):
@Lazy
def headTitle(self):
if self.target:
return ' - '.join((self.context.title, self.target.title))
if self.target is not None:
targetView = component.getMultiAdapter((self.target, self.request),
name='layout')
return ' - '.join((self.context.title, targetView.title))
else:
return self.context.title