[Zapp-cvs-commit] ZApp/skins/zapp_generic zapp_show_mov.pt,NONE,1.1 zapp_cmf_object_edit_form.pt,1.8,1.9 zapp_image_view.pt,1.4,1.5

[Steve S. <ssp...@us...>]

Update of /cvsroot/zapp/ZApp/skins/zapp_generic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30311/skins/zapp_generic

Modified Files:
	zapp_cmf_object_edit_form.pt zapp_image_view.pt 
Added Files:
	zapp_show_mov.pt 
Log Message:
fixed up some media skins.. 

Index: zapp_cmf_object_edit_form.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_cmf_object_edit_form.pt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** zapp_cmf_object_edit_form.pt	22 Mar 2004 18:33:08 -0000	1.8
--- zapp_cmf_object_edit_form.pt	2 Apr 2004 14:26:59 -0000	1.9
***************
*** 34,38 ****
                   typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType);
                   myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
!                  myPropSet myTPropsMiscData/zapp_properties | nothing;
                   myProperties python:here.safeMiscData.getXMLDict()">
  
--- 34,38 ----
                   typePropertiesObjects python:miscDataSpecialist.ZApp_getItems(Manager=cmfSpec.getId(), objectID='metaObject', dataType='ZCMFPropsFor' + myType);
                   myTPropsMiscData python:typePropertiesObjects and typePropertiesObjects[0].getXMLDict();
!                  myPropSet python:myTPropsMiscData.get('zapp_properties',[]);
                   myProperties python:here.safeMiscData.getXMLDict()">
  
***************
*** 40,44 ****
  My Portal Type: <span tal:content="here/portal_type"/>
  </div>
! <table tal:condition="myPropSet">
  <form action="." tal:attributes="action string:${here/getId}/zapp_cmf_object_edit" method="post">
  <tr><td>Title: &nbsp; <input name="title" size="20" value="" tal:attributes="value here/title"/></td></tr>
--- 40,44 ----
  My Portal Type: <span tal:content="here/portal_type"/>
  </div>
! <table>
  <form action="." tal:attributes="action string:${here/getId}/zapp_cmf_object_edit" method="post">
  <tr><td>Title: &nbsp; <input name="title" size="20" value="" tal:attributes="value here/title"/></td></tr>
***************
*** 117,121 ****
  </table>
  
- <div tal:condition="not:myPropSet"> Sorry.. there is no propSet for this type! </div>
  </div>
  </div>
--- 117,120 ----

--- NEW FILE: zapp_show_mov.pt ---
<div metal:define-macro="main">
<tal:block tal:omit-tag="" define="main_name python:'.'.join(path('here/getId').split('.')[:-1]); 
                                   mov_url here/graphic_url">
 <OBJECT CLASSID="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" WIDTH="480" HEIGHT="300" CODEBASE="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0">
    <PARAM NAME="type" VALUE="video/quicktime">
    <PARAM NAME="controller" VALUE="true">
    <PARAM NAME="autoplay" VALUE="true">
    <PARAM NAME="target" VALUE="myself">
    <PARAM NAME="src" VALUE="" tal:attributes="value mov_url">
    <PARAM NAME="HREF" VALUE="" tal:attributes="value mov_url">
    <PARAM NAME="pluginspage" VALUE="http://www.apple.com/quicktime/download/indext.html">
    <EMBED WIDTH="480" HEIGHT="300" CONTROLLER="TRUE" SRC="" HREF="" tal:attributes="src mov_url; href mov_url"
      type="video/quicktime" 
      TARGET="myself" BGCOLOR="#000000" 
      BORDER="0" 
      PLUGINSPAGE="http://www.apple.com/quicktim e/download/indext.html"></EMBED></OBJECT></tal:block>
</div>

Index: zapp_image_view.pt
===================================================================
RCS file: /cvsroot/zapp/ZApp/skins/zapp_generic/zapp_image_view.pt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zapp_image_view.pt	21 Jan 2004 16:35:00 -0000	1.4
--- zapp_image_view.pt	2 Apr 2004 14:26:59 -0000	1.5
***************
*** 18,22 ****
  <div metal:fill-slot="main">
  
!  <div tal:condition="python:here.Format() == 'application/x-shockwave-flash'">
     <div metal:use-macro="here/zapp_show_swf/macros/main">
   Sorry!
--- 18,25 ----
  <div metal:fill-slot="main">
  
! <tal:block tal:omit-tag=""  tal:define="mov_mime string:video/quicktime;
!                                         swf_mime string:application/x-shockwave-flash">
! 
!  <div tal:condition="python:here.Format() == swf_mime">
     <div metal:use-macro="here/zapp_show_swf/macros/main">
   Sorry!
***************
*** 24,31 ****
   </div>
  
!  <div tal:condition="python:here.Format() != 'application/x-shockwave-flash'">
   <img tal:attributes="src python:here.zapp_get_fileObj().absolute_url();
                        width zapp_image_width | string:400"/>
   </div>
  </div>
  
--- 27,42 ----
   </div>
  
!  <div tal:condition="python:here.Format() == mov_mime">
!    <div metal:use-macro="here/zapp_show_mov/macros/main">
!  Sorry!
!    </div>
!  </div>
! 
!  <div tal:condition="python:here.Format() not in [mov_mime, swf_mime]">
   <img tal:attributes="src python:here.zapp_get_fileObj().absolute_url();
                        width zapp_image_width | string:400"/>
   </div>
+ 
+ </tal:block>
  </div>