From 56bc752702eb30651bb1caa67b0603e08a1551a0 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 28 Mar 2012 11:52:25 +0200
Subject: [PATCH] use image description (if present) instead of title for
 display

---
 browser/lobo/standard.pt | 10 +++++-----
 browser/lobo/standard.py |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/browser/lobo/standard.pt b/browser/lobo/standard.pt
index 40a8061..13715db 100644
--- a/browser/lobo/standard.pt
+++ b/browser/lobo/standard.pt
@@ -83,7 +83,8 @@
                          style cell/style">
         <metal:image use-macro="item/macros/image" />
         <div class="legend">
-          <a tal:attributes="href cell/targetUrl"><b tal:content="cell/title" /></a>
+          <a tal:attributes="href cell/targetUrl">
+            <b tal:content="python: cell.description or cell.title" /></a>
           <span tal:condition="cell/img/showInfo|nothing">
             <a tal:define="url string:${cell/img/url}/meta_info.html"
                tal:attributes="href url;
@@ -93,7 +94,7 @@
                     string:${controller/resourceBase}/cybertools.icons/info.png" />
             </a></span>
           <br />
-          <i tal:content="cell/description" />
+          <!--<i tal:content="cell/description" />-->
         </div>
     </div>
   </tal:cell>
@@ -104,11 +105,10 @@
 
 <metal:image define-macro="image">
   <tal:img condition="cell/img">
-    <a title="Information about this object."
-       dojoType="dojox.image.Lightbox" group="mediasset"
+    <a dojoType="dojox.image.Lightbox" group="mediasset"
        i18n:attributes="title"
        tal:attributes="href cell/img/fullImageUrl;
-                       title cell/img/title">
+                       title python: cell.img['description'] or cell.img['title']">
       <img tal:condition="showImageLink|python:False"
            tal:attributes="src cell/img/src;
                            class cell/img/cssClass;
diff --git a/browser/lobo/standard.py b/browser/lobo/standard.py
index 7dcb317..aa82276 100644
--- a/browser/lobo/standard.py
+++ b/browser/lobo/standard.py
@@ -144,6 +144,7 @@ class ConceptView(BaseConceptView):
             adImg = adapted(r)
             showInfo = adImg.showInfo and adImg.metaInfo
             return dict(src=src, fullImageUrl=fullSrc, title=r.title,
+                        description=r.description,
                         url=url, cssClass=self.parentView.imageCssClass,
                         showInfo=showInfo)
 
@@ -313,6 +314,7 @@ class ConceptRelationView(BaseConceptRelationView, ConceptView):
             adImg = adapted(r)
             showInfo = adImg.showInfo and adImg.metaInfo
             return dict(src=src, fullImageUrl=fullSrc, title=r.title,
+                        description=r.description,
                         url=url, cssClass=self.parentView.imageCssClass,
                         showInfo=showInfo)
 
@@ -347,6 +349,7 @@ class ResourceView(BaseResourceView):
         adImg = adapted(self.context)
         showInfo = adImg.showInfo and adImg.metaInfo
         return dict(src=src, fullImageUrl=fullSrc, title=self.context.title,
+                    description=self.context.description,
                     url=url, cssClass=self.parentView.imageCssClass,
                     showInfo=showInfo)