Changeset 1743 for ZMS/trunk

Timestamp:

03.12.2011 23:32:07 (6 months ago)

Author:

zmsdev

Message:

applied minor fixes for (ajax) file-upload

Location:

ZMS/trunk

Files:

• _fileutil.py (modified) (4 diffs)
• _globals.py (modified) (2 diffs)
• _objattrs.py (modified) (1 diff)
• _ziputil.py (modified) (2 diffs)
• dtml/objattrs/f_select_file.dtml (modified) (2 diffs)
• dtml/objattrs/f_select_image.dtml (modified) (1 diff)
• etc/zms.conf (modified) (1 diff)
• plugins/fileupload/ajax_upload/input.dtml (modified) (2 diffs)
• plugins/www/objattrs/zmi.blob.ZMSGraphic_extEdit.js (modified) (1 diff)
• plugins/www/objattrs/zmi.blob.js (modified) (2 diffs)

ZMS/trunk/_fileutil.py

@@ -19 +19 @@
 # Imports.
 from ZPublisher.Iterators import filestream_iterator
-try: # >= Zope-2.10
-  from zope.contenttype import guess_content_type
-except: # < Zope-2.10
-  from zope.app.content_types import guess_content_type
 import fnmatch
 import os
@@ -29 +25 @@
 import tempfile
 import zipfile
+# Product Imports.
+import _globals
 
 
@@ -211 +209 @@
           else:
             try:
-              mt, enc = guess_content_type( local_filename)
+              mt, enc = _globals.guess_contenttype( local_filename)
             except:
               mt, enc = 'content/unknown', ''
@@ -247 +245 @@
     data = filestream_iterator( filename, 'r'+mode)
   try:
-    mt, enc  = guess_content_type( filename, data)
+    mt, enc  = _globals.guess_contenttype( filename, data)
   except:
     mt, enc = 'content/unknown', ''

ZMS/trunk/_globals.py

@@ -23 +23 @@
 from types import StringTypes
 from traceback import format_exception
+try: # >= Zope-2.10
+  from zope.contenttype import guess_content_type
+except: # < Zope-2.10
+  from zope.app.content_types import guess_content_type
 import cgi
 import copy
@@ -131 +135 @@
     url = url.replace(ch,'%'+bin2hex(ch).upper())
   return url
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+_globals.guess_contenttype:
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+def guess_contenttype(filename, data):
+  mt, enc  = guess_content_type( filename, data)
+  return mt, enc
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

ZMS/trunk/_objattrs.py

@@ -1057 +1057 @@
               f = o.data
               filename = getattr( temp_folder, id).title
-              set, value = True, {'data':f,'filename':filename}
+              mt, enc = _globals.guess_contenttype( filename, f)
+              set, value = True, {'data':f,'filename':filename,'content_type':mt}
               if not self.pilutil().enabled() and datatype == _globals.DT_IMAGE and REQUEST.get('width_%s'%attr) and REQUEST.get('height_%s'%attr):
                 w = REQUEST['width_%s'%attr]

ZMS/trunk/_ziputil.py

@@ -20 +20 @@
 from cStringIO import StringIO
 from types import StringTypes
-try: # >= Zope-2.10
-  from zope.contenttype import guess_content_type
-except: # < Zope-2.10
-  from zope.app.content_types import guess_content_type
 import zipfile
+# Product Imports.
+import _globals
 
 
@@ -47 +45 @@
     if id:
       file = zf.read( name)
-      mt, enc  = guess_content_type( id, file)
+      mt, enc  = _globals.guess_contenttype( id, file)
       if id in container.objectIds():
         container.manage_delObjects( [id])

ZMS/trunk/dtml/objattrs/f_select_file.dtml

@@ -8 +8 @@
         @param REQUEST
 -->
+
+<dtml-unless "REQUEST.get('f_zmiGraphicExtEdit')">
+<script type="text/javascript" charset="UTF-8" src="<dtml-var "REQUEST['BASE0']">/<dtml-var "getConfProperty('jquery.plugin.version').split('/')[1]">/objattrs/zmi.blob.ZMSGraphic_extEdit.js"></script>
+<dtml-call "REQUEST.set('f_zmiGraphicExtEdit',True)">
+</dtml-unless>
 
 <dtml-unless "REQUEST.get('f_zmiBlobJs')">
@@ -75 +80 @@
                                                 <td class="form-element">
                                                         <dtml-try>
-                                                                <dtml-var "getPlugin('fileupload/'+getConfProperty('ZMS.input.file.plugin','input_file')+'/input.dtml',REQUEST,{'elName':elName,'elMaxlength':getConfProperty('ZMS.input.image.maxlength',''),'key':key})">
+                                                                <dtml-var "getPlugin('fileupload/'+getConfProperty('ZMS.input.file.plugin')+'/input.dtml',REQUEST,{'elName':elName,'elMaxlength':getConfProperty('ZMS.input.file.maxlength',''),'key':key})">
                                                         <dtml-except>
                                                                 <!-- ERROR: 

ZMS/trunk/dtml/objattrs/f_select_image.dtml

@@ -132 +132 @@
                                                         <dtml-try>
                                                                 <dtml-call "REQUEST.set('ZMS_ALLOWED_EXTENSIONS',['jpg', 'jpeg', 'png', 'gif'])">
-                                                                <dtml-var "getPlugin('fileupload/'+getConfProperty('ZMS.input.file.plugin','input_file')+'/input.dtml',REQUEST,{'elName':elName,'elMaxlength':getConfProperty('ZMS.input.image.maxlength',''),'key':key})">
+                                                                <dtml-var "getPlugin('fileupload/'+getConfProperty('ZMS.input.file.plugin')+'/input.dtml',REQUEST,{'elName':elName,'elMaxlength':getConfProperty('ZMS.input.image.maxlength',''),'key':key})">
                                                         <dtml-except>
                                                                 <!-- ERROR: 

ZMS/trunk/etc/zms.conf

@@ -35 +35 @@
 #manage_page_style.css=/++resource++zms_etc_/manage_page_style.css
 #manage_page_script.js=/++resource++zms_etc_/manage_page_script.js
+
+[ZMS]
+input.file.plugin=input_file

ZMS/trunk/plugins/fileupload/ajax_upload/input.dtml

@@ -56 +56 @@
                                 onSubmit: function(id, fileName){
                                         $('input[name=btn][type=submit]').attr("disabled","disabled");
+                                        $('ul.qq-upload-list').html('');
                                 },
                                 onProgress: function(id, fileName, loaded, total){},
@@ -71 +72 @@
                                                         var elParams = '<dtml-if ZMS_INSERT>meta_id=<dtml-var ZMS_INSERT>&</dtml-if>lang=<dtml-var lang>&key=<dtml-var key>&form_id=<dtml-var "REQUEST.get('ZMI_TIME')">';
                                                         ZMSGraphic_extEdit_set('<dtml-var elName>', img['src'], img['filename'], img['width'], img['height'],elParams,<dtml-var "_.int(pilutil().enabled())">);
-                                                        onResize();
                                                 }
                                         );

ZMS/trunk/plugins/www/objattrs/zmi.blob.ZMSGraphic_extEdit.js

@@ -118 +118 @@
                 zmiUndoBlobDelete(elName);
         }
-        var img = $('img#img_'+elName);
+        img = $('img#img_'+elName);
         img.attr('src',src).css('background-color','#FF9900');
         $('input#width_'+elName).val(width);
         $('input#height_'+elName).val(height);
         $('span#filename_'+elName).html(filename);
+        $('span#size_'+elName).html("");
         $('span#dimensions_'+elName).html(width+'x'+height+'px');
         zmiSwitchBlobButtons(elName);

ZMS/trunk/plugins/www/objattrs/zmi.blob.js

@@ -44 +44 @@
                 $('#undo_btn_'+elName).hide('normal');
         }
-        var img = $('img#img_'+elName);
-        var canDelete = $('input[name=del_'+elName+']').val()!=1 && img.length > 0;
+        var canDelete = $('input[name=del_'+elName+']').val()!=1;
         if (canDelete) {
                 $('#delete_btn_'+elName).show('normal');
@@ -99 +98 @@
                 }
                 // Create transparent overlay.
-                $('body').append('<div id="div_opaque_'+elName+'" class="zmiDivOpaque">&nbsp;</div>');
                 var img = $('img#img_'+elName);
                 if (img.length > 0) {
+                        $('body').append('<div id="div_opaque_'+elName+'" class="zmiDivOpaque">&nbsp;</div>');
                         var div = $('div#div_opaque_'+elName);
                         var pos = img.offset();