From d17b0bd523faca3dc2352c6393cf5c24480da4d5 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Fri, 28 Nov 2008 10:57:48 +0000
Subject: [PATCH] add package version definition + CHANGES.txt file

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3015 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 CHANGES.txt               |  9 +++++++++
 layout/browser/concept.py |  6 +++++-
 layout/browser/node.py    | 19 +++++++++++++++++++
 version.py                | 10 ++++++----
 4 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..0a4e071
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,9 @@
+Change Log
+==========
+
+$Id$
+
+0.9
+---
+
+- add definition of loops package version (see loops/version.py)
diff --git a/layout/browser/concept.py b/layout/browser/concept.py
index 62c92aa..ca697ae 100644
--- a/layout/browser/concept.py
+++ b/layout/browser/concept.py
@@ -49,9 +49,13 @@ class ConceptView(object):
     def description(self):
         return self.context.description
 
+    @Lazy
+    def menu(self):
+        return self.node.getMenu()
+
     @Lazy
     def url(self):
-        return '%s/.%s-%s' % (absoluteURL(self.node, self.request),
+        return '%s/.%s-%s' % (absoluteURL(self.menu, self.request),
                               self.context.uid, normalize(self.context.title))
 
     @property
diff --git a/layout/browser/node.py b/layout/browser/node.py
index 0553227..a257535 100644
--- a/layout/browser/node.py
+++ b/layout/browser/node.py
@@ -25,6 +25,7 @@ $Id$
 from zope.cachedescriptors.property import Lazy
 
 from cybertools.composer.layout.browser.view import Page
+from loops.common import adapted
 
 
 class LayoutNodeView(Page):
@@ -44,3 +45,21 @@ class LayoutNodeView(Page):
         result.append('page')
         return result
 
+    @Lazy
+    def viewAnnotations(self):
+        return self.request.annotations.get('loops.view', {})
+
+    @Lazy
+    def target(self):
+        target = self.viewAnnotations.get('target')
+        if target is None:
+            target = adapted(self.context.target)
+        return target
+
+    @Lazy
+    def headTitle(self):
+        if self.target:
+            return ' - '.join((self.context.title, self.target.title))
+        else:
+            return self.context.title
+
diff --git a/version.py b/version.py
index 8b21d39..d4be2c9 100644
--- a/version.py
+++ b/version.py
@@ -21,8 +21,10 @@ loops version specifications.
 """
 
 revision = '$Id$'
-shortVersion = '0.9'
-longVersion = '%s-%s' % (shortVersion, ' '.join(revision.split()[2:5]))
+version = '0.9'
+package = 'loops'
+
+from cybertools.util.version import versions
+
+versions.add(package, version, revision)
 
-versions = dict(loops=shortVersion)
-longVersions = dict(loops=longVersion)