merge branch master

browser/concept.py

@@ -196,6 +196,12 @@ class BaseRelationView(BaseView):
             return u''
         return self.predicateTitle
 
+    @Lazy
+    def relationInfo(self):
+        predInfo = ', ' .join(p.title for p in self.predicates 
+                                if p != self.defaultPredicate)
+        return ' | '.join(t for t in (self.description, predInfo) if t)
+
 
 class ConceptView(BaseView):
 

browser/concept_macros.pt

@@ -151,11 +151,8 @@
                  tal:attributes="dojoType python:
                         item.editable and 'dojo.dnd.Source' or ''">
           <tal:items repeat="related children">
-            <tal:item define="class python: repeat['related'].odd() and 'even' or 'odd';
+            <tal:item define="class python: 
-                              description related/description;
+                        repeat['related'].odd() and 'even' or 'odd';">
-                              predicate related/predicateTitle;
-                              info python: ' | '.join(
-                                    t for t in (description, predicate) if t)">
               <tr tal:attributes="class string:$class dojoDndItem dojoDndHandle;
                                   id related/uniqueId">
                 <td tal:condition="item/showCheckboxes|nothing"
@@ -165,7 +162,7 @@
                          tal:attributes="value uid;" /></td>
                 <td valign="top">
                   <a tal:attributes="href python: view.getUrlForTarget(related);
-                                     title info">
+                                     title related/relationInfo">
                     <span tal:replace="related/title">Resource Title</span>
                   </a>
                 </td>
@@ -234,11 +231,8 @@
                  tal:attributes="dojoType python:
                         item.editable and 'dojo.dnd.Source' or ''">
           <tal:items repeat="related resources">
-            <tal:item define="class python: repeat['related'].odd() and 'even' or 'odd';
+            <tal:item define="class python: 
-                              description related/description;
+                        repeat['related'].odd() and 'even' or 'odd';">
-                              predicate related/predicateTitle;
-                              info python: ' | '.join(
-                                    t for t in (description, predicate) if t)">
               <tr tal:attributes="class string:$class dojoDndItem dojoDndHandle;
                                   id related/uniqueId">
                 <td tal:condition="item/showCheckboxes|nothing"
@@ -255,7 +249,7 @@
                     <img tal:attributes="src icon/src" />
                   </a>
                   <a tal:attributes="href python: view.getUrlForTarget(related);
-                                     title info">
+                                     title related/relationInfo">
                     <div tal:content="related/title">Resource Title</div>
                   </a>
                 </td>

browser/resource.py

@@ -40,6 +40,7 @@ from zope.traversing.browser import absoluteURL
 from cybertools.browser.action import actions
 from cybertools.meta.interfaces import IOptions
 from cybertools.typology.interfaces import IType
+from cybertools.util.html import extractFirstPart
 from cybertools.xedit.browser import ExternalEditorView, fromUnicode
 from loops.browser.action import DialogAction, TargetAction
 from loops.browser.common import EditForm, BaseView
@@ -252,6 +253,12 @@ class ResourceView(BaseView):
             #return util.toUnicode(wp.render(self.request))
         return super(ResourceView, self).renderText(text, contentType)
 
+    def renderShortText(self):
+        return self.renderDescription() or self.createShortText(self.render())
+
+    def createShortText(self, text=None):
+        return extractFirstPart(text or self.render())
+
     def download(self):
         """ Force download, e.g. of a PDF file """
         return self.show(True)

compound/README.txt

@@ -355,7 +355,7 @@ Books, Sections, and Pages
   >>> importPath = os.path.join(os.path.dirname(__file__), 'book')
   >>> importData(loopsRoot, importPath, 'loops_book_de.dmp')
 
-  >>> from loops.compound.book.browser import PageLayout
+  >>> from loops.compound.book.browser import BookView, SectionView, TopicView
 
 
 Fin de partie

compound/book/base.py

@@ -1,52 +0,0 @@
-#
-#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-"""
-Implementation of book and book components
-"""
-
-from zope.cachedescriptors.property import Lazy
-from zope.interface import implements
-from zope.traversing.api import getName
-
-from loops.compound.base import Compound
-from loops.compound.book.interfaces import IPage
-from loops.type import TypeInterfaceSourceList
-
-
-TypeInterfaceSourceList.typeInterfaces += (IPage,)
-
-
-class Page(Compound):
-
-    implements(IPage)
-
-    compoundPredicateNames = ['ispartof', 'standard']
-
-    @Lazy
-    def documentType(self):
-        return self.context.getConceptManager()['documenttype']
-
-    def getParts(self):
-        result = {}
-        for r in super(Page, self).getParts():
-            for parent in r.getParents():
-                if parent.conceptType == self.documentType:
-                    item = result.setdefault(getName(parent), [])
-                    item.append(r)
-        return result

compound/book/browser.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -45,10 +45,22 @@ class Base(object):
     def book_macros(self):
         return book_template.macros
 
+    @Lazy
+    def documentTypeType(self):
+        return self.conceptManager['documenttype']
+
+    @Lazy
+    def sectionType(self):
+        return self.conceptManager['section']
+
     @Lazy
     def isPartOfPredicate(self):
         return self.conceptManager['ispartof']
 
+    @Lazy
+    def showNavigation(self):
+        return self.typeOptions.show_navigation
+
     @Lazy
     def breadcrumbsParent(self):
         for p in self.context.getParents([self.isPartOfPredicate]):
@@ -82,34 +94,8 @@ class Base(object):
         if self.editable:
             return 'index.html'
 
-
-class BookOverview(Base, ConceptView):
-
-    @Lazy
-    def macro(self):
-        return book_template.macros['book']
-
-
-class SectionView(Base, ConceptView):
-
-    @Lazy
-    def macro(self):
-        return book_template.macros['section']
-
-    @Lazy
-    def documentTypeType(self):
-        return self.conceptManager['documenttype']
-
-    @Lazy
-    def showNavigation(self):
-        return self.typeOptions.show_navigation
-
-    @Lazy
-    def sectionType(self):
-        return self.conceptManager['section']
-
     def getResources(self):
-        relViews = super(SectionView, self).getResources()
+        relViews = super(Base, self).getResources()
         return relViews
 
     @Lazy
@@ -144,64 +130,23 @@ class SectionView(Base, ConceptView):
                 yield c
 
 
-# layout parts - probably obsolete:
+class BookView(Base, ConceptView):
 
-class PageLayout(Base, standard.Layout):
+    @Lazy
-
+    def macro(self):
-    def getParts(self):
+        return book_template.macros['book']
-        parts = ['headline', 'keyquestions', 'quote', 'maintext', 
-                 'story', 'tip', 'usecase']
-        return self.getPartViews(parts)
 
 
-class PagePart(object):
+class SectionView(Base, ConceptView):
 
-    template = book_template
+    @Lazy
-    templateName = 'compound.book'
+    def macro(self):
-    macroName = 'text'
+        return book_template.macros['section']
-    partName = None     # define in subclass
-    gridPattern = ['span-4']
-
-    def getResources(self):
-        result = []
-        res = self.adapted.getParts().get(self.partName) or []
-        for idx, r in enumerate(res):
-            result.append(standard.ResourceView(
-                                r, self.request, parent=self, idx=idx))
-        return result
 
 
-class Headline(PagePart, standard.Header2):
+class TopicView(Base, ConceptView):
 
-    macroName = 'headline'
+    @Lazy
+    def macro(self):
+        return book_template.macros['topic']
 
-
-class MainText(PagePart, standard.BasePart):
-
-    partName = 'maintext'
-
-
-class KeyQuestions(PagePart, standard.BasePart):
-
-    partName = 'keyquestions'
-
-
-class Story(PagePart, standard.BasePart):
-
-    partName = 'story'
-
-
-class Tip(PagePart, standard.BasePart):
-
-    partName = 'tip'
-
-
-class UseCase(PagePart, standard.BasePart):
-
-    partName = 'usecase'
-
-
-class Quote(PagePart, standard.BasePart):
-
-    partName = 'quote'
-    gridPattern = ['span-2 last']

compound/book/configure.zcml

@@ -3,18 +3,6 @@
    xmlns:browser="http://namespaces.zope.org/browser"
    i18n_domain="loops">
 
-  <!-- type adapters -->
-
-  <zope:adapter factory="loops.compound.book.base.Page" 
-                provides="loops.compound.book.interfaces.IPage"
-                trusted="True" />
-  <zope:class class="loops.compound.book.base.Page">
-    <require permission="zope.View"
-             interface="loops.compound.book.interfaces.IPage" />
-    <require permission="zope.ManageContent"
-             set_schema="loops.compound.book.interfaces.IPage" />
-  </zope:class>
-
   <!-- Views -->
 
   <zope:adapter
@@ -22,7 +10,7 @@
         for="loops.interfaces.IConcept
              loops.browser.skin.Lobo"
         provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.BookOverview"
+        factory="loops.compound.book.browser.BookView"
         permission="zope.View" />
 
   <zope:adapter
@@ -34,69 +22,11 @@
         permission="zope.View" />
 
   <zope:adapter
-        name="page_layout"
+        name="book_topic_view"
         for="loops.interfaces.IConcept
              loops.browser.skin.Lobo"
         provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.PageLayout"
+        factory="loops.compound.book.browser.TopicView"
-        permission="zope.View" />
-
-  <!-- parts -->
-
-  <zope:adapter
-        name="lobo_headline"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.Headline"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_keyquestions"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.KeyQuestions"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_maintext"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.MainText"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_story"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.Story"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_tip"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.Tip"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_usecase"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.UseCase"
-        permission="zope.View" />
-
-  <zope:adapter
-        name="lobo_quote"
-        for="loops.compound.book.interfaces.IPage
-             loops.browser.skin.Lobo"
-        provides="zope.interface.Interface"
-        factory="loops.compound.book.browser.Quote"
         permission="zope.View" />
 
 </configure>

compound/book/interfaces.py

@@ -1,32 +0,0 @@
-#
-#  Copyright (c) 2012 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-"""
-Books, sections, pages...
-"""
-
-from zope.interface import Interface, Attribute
-from zope import interface, component, schema
-
-from loops.compound.interfaces import ICompound
-from loops.util import _
-
-
-class IPage(ICompound):
-
-    pass

compound/book/loops_book_de.dmp

@@ -4,11 +4,11 @@ type(u'documenttype', u'Dokumentenart', options=u'qualifier:assign',
 # book types
 type(u'book', u'Buch', viewName=u'book_overview', typeInterface=u'',
     options=u'action.portlet:create_subtype,edit_concept')
-#type(u'page', u'Seite', viewName=u'page_layout', 
-#    typeInterface=u'loops.compound.book.interfaces.IPage',
-#    options=u'action.portlet:edit_concept')
 type(u'section', u'Kapitel', viewName=u'section_view', typeInterface=u'',
     options=u'action.portlet:create_subtype,edit_concept')
+#type(u'topic', u'Thema', viewName=u'book_topic_view', 
+#    typeInterface=u'loops.knowledge.interfaces.ITopic',
+#    options=u'action.portlet:create_topic,edit_topic')
 
 concept(u'system', u'System', u'domain')
 
@@ -30,4 +30,3 @@ concept(u'usecase', u'Fallbeispiel', u'documenttype')
 # book structure
 child(u'book', u'section', u'issubtype', usePredicate=u'ispartof')
 child(u'section', u'section', u'issubtype', usePredicate=u'ispartof')
-#child(u'section', u'page', u'issubtype', usePredicate=u'ispartof')

compound/book/view_macros.pt

@@ -1,14 +1,20 @@
 <html i18n:domain="loops">
 
 
-<metal:book define-macro="book">
+<metal:children define-macro="children">
-  <metal:info use-macro="view/concept_macros/concepttitle" />
+  <div tal:repeat="related item/children"
-  <div tal:repeat="related item/children">
+       tal:define="level python:level + 1"
+       tal:attributes="class string:content-$level">
     <h3>
       <a tal:attributes="href python:view.getUrlForTarget(related)"
          tal:content="related/title" /></h3>
     <div tal:content="structure related/renderedDescription" />
   </div>
+</metal:children>
+
+<metal:book define-macro="book">
+  <metal:info use-macro="view/concept_macros/concepttitle" />
+  <metal:info use-macro="item/book_macros/children" />
 </metal:book>
 
 
@@ -32,6 +38,8 @@
     </div>
   </metal:navigation>
   <metal:info use-macro="view/concept_macros/concepttitle" />
+  <metal:info use-macro="item/book_macros/children" />
+  <metal:text define-macro="textresources">
     <div tal:repeat="related item/textResources">
       <div class="span-4">
         <div tal:attributes="class python:
@@ -75,28 +83,37 @@
         </div>
       </div>
     </div>
+  </metal:text>
   <br style="clear: both" />
   <metal:navigation use-macro="item/book_macros/navigation" />
   <br />
 </metal:section>
 
 
-<!-- layout part macros - obsolete? -->
+<metal:topic define-macro="topic">
-
+  <metal:info use-macro="view/concept_macros/concepttitle" />
-<metal:part define-macro="headline">
+  <h2 i18n:translate=""
-  <div tal:define="cell part/getView">
+      tal:condition="python: list(item.children())">Children</h2>
-    <metal:headline use-macro="item/macros/headline" />
+  <metal:children use-macro="item/book_macros/children" />
+  <h2 i18n:translate=""
+      tal:condition="item/textResources">Text Elements</h2>
+  <div>
+    <div tal:repeat="related item/textResources"
+         tal:define="level python:level + 1"
+         tal:attributes="class string:content-$level">
+      <h3>
+        <a tal:attributes="href python:view.getUrlForTarget(related.context)"
+           tal:content="related/title" />
+      </h3>
+      <div>
+        <div tal:replace="structure related/renderShortText" />
+        <p>
+          <a i18n:translate=""
+              tal:attributes="href python:view.getUrlForTarget(related.context)">
+            more...</a></p>
     </div>
-</metal:part>
-
-<metal:part define-macro="text">
-  <tal:cell repeat="cell part/getResources">
-    <div tal:attributes="class cell/cssClass">
-      <h3 tal:content="cell/title" />
-      <span tal:content="structure cell/view/render" />
   </div>
-  </tal:cell>
+</metal:topic>
-</metal:part>
 
 
 </html>

locales/de/LC_MESSAGES/loops.po

@@ -3,7 +3,7 @@ msgstr ""
 
 "Project-Id-Version: 0.13.0\n"
 "POT-Creation-Date: 2007-05-22 12:00 CET\n"
-"PO-Revision-Date: 2013-03-21 12:00 CET\n"
+"PO-Revision-Date: 2013-04-01 12:00 CET\n"
 "Last-Translator: Helmut Merz <helmutm@cy55.de>\n"
 "Language-Team: loops developers <helmutm@cy55.de>\n"
 "MIME-Version: 1.0\n"
@@ -537,6 +537,9 @@ msgstr "Unterbegriffe"
 msgid "Resources"
 msgstr "Ressourcen"
 
+msgid "Text Elements"
+msgstr "Texte"
+
 msgid "Title"
 msgstr "Titel"
 
@@ -705,6 +708,9 @@ msgstr "Zugeordnete Begriffe"
 msgid "more..."
 msgstr "Mehr..."
 
+msgid "More..."
+msgstr "Mehr..."
+
 msgid "Versioning"
 msgstr "Versionierung"