Changeset 1525 for CMESS/mediaplayer/branches

Timestamp:

01.06.2011 14:38:41 (12 months ago)

Author:

mhallbauer

Message:

3.1.8

• added option to enable/disable caption-box
• improved regexp for alt-parameter

File:

• CMESS/mediaplayer/branches/3.1/com/zms/mediaplayer/mediaplayer.metaobj.xml (modified) (5 diffs)

CMESS/mediaplayer/branches/3.1/com/zms/mediaplayer/mediaplayer.metaobj.xml

@@ -1011 +1011 @@
                 <item type="dictionary">
                   <dictionary>
+                    <item key="default"><![CDATA[1]]></item>
+                    <item key="id"><![CDATA[galleryCaption]]></item>
+                    <item key="mandatory" type="int">0</item>
+                    <item key="multilang" type="int">1</item>
+                    <item key="name"><![CDATA[Show Caption?]]></item>
+                    <item key="repetitive" type="int">0</item>
+                    <item key="type"><![CDATA[boolean]]></item>
+                  </dictionary>
+                </item>
+                <item type="dictionary">
+                  <dictionary>
                     <item key="id"><![CDATA[delimiter3]]></item>
                     <item key="mandatory" type="int">0</item>
@@ -1396 +1407 @@
                 <dtml-in galleryImages>
                 <li>
-                <dtml-let title_match="re_search('alt='+QUOT+'([\s\wÀöÌßÜÖÄ]*)'+QUOT, getObjProperty('img_attrs_spec',REQUEST), True)" 
+                <dtml-let title_match="re_search('alt='+QUOT+'([\s\w\.ÀöÌßÜÖÄ\(\)-;,]*)'+QUOT, getObjProperty('img_attrs_spec',REQUEST), True)" 
                                                         title_str="(((title_match is not None) and (len(title_match) > 0) and (len(title_match[0]) > 0)) and title_match[0] or 'Image #' + str(_['sequence-number']))">
                         <a class="thumb" href="<dtml-var "getObjProperty('imghires',REQUEST).getHref(REQUEST)">" title="<dtml-var title_str>">
@@ -1429 +1440 @@
         <div id="loadingContainerSel_<dtml-var id>" class="loader"></div>
         <div id="imageContainerSel_<dtml-var id>" class="slideshow"></div>
-        <div id="captionContainerSel_<dtml-var id>" class="embox"></div>
+        <dtml-if "getObjProperty('galleryCaption', REQUEST)">
+                <div id="captionContainerSel_<dtml-var id>" class="embox"></div>
+        </dtml-if>
 </div>
                 
@@ -2032 +2045 @@
             <item key="name"><![CDATA[ZMSGallery]]></item>
             <item key="package"><![CDATA[com.zms.mediaplayer]]></item>
-            <item key="revision"><![CDATA[2.1.15]]></item>
+            <item key="revision"><![CDATA[2.1.16]]></item>
             <item key="type"><![CDATA[ZMSObject]]></item>
           </dictionary>
@@ -5194 +5207 @@
             <item key="name"><![CDATA[com.zms.mediaplayer]]></item>
             <item key="package"/>
-            <item key="revision"><![CDATA[3.1.7]]></item>
+            <item key="revision"><![CDATA[3.1.8]]></item>
             <item key="type"><![CDATA[ZMSPackage]]></item>
           </dictionary>