Changeset 8092 for trunk

Timestamp:

04/15/13 11:59:53 (11 years ago)

Author:

angelo

Message:

Ticket #3425 - Inconsistencia ao salvar mensagem criada

Location:

trunk

Files:

• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• prototype/modules/mail/templates/attachment.ejs (modified) (1 diff)

trunk/expressoMail1_2/js/draw_api.js

@@ -5061 +5061 @@
         $(this).prev().show();
         });
-        fileUploadMSG.find(".fileUploadButton, .message-attach-link").button().filter(".fileUploadButton").click(function(){
-            fileUploadMSG.find("input:file").trigger("click");
-    });
-
-    fileUploadMSG.find("input:file").fileupload({
+
+
+    fileUploadMSG.find(".button").button().filter(".fileinput-button").find(".ui-button-text").css("margin-top","2px").find("input:file").fileupload({
                 //singleFileUploads : true,fileUploadMSG
                 sequentialUploads: true, 
@@ -5241 +5239 @@
             });
         }*/
-        });/*.css({
+        }).css({
                 "height" : "20px", 
                 "width": (is_webkit ? "205px" : "100px"), 
                 "border-width": "0 0 0px 0px", 
         "-moz-transform" : "rotate(-180deg) translate(5px, -0.5px) scale(1.1)",  
-        "-webkit-transform" : "rotate(-180deg) translate(0px, 0px)"
-        }).end().end().end().*/
+        "-webkit-transform" : "rotate(-180deg) translate(0px, 0px)",
+        "cursor" : "pointer"
+        });/*.end().end().end().*/
+
     fileUploadMSG.find(".message-attach-link").click(function(){
                 jQuery('#message-attach-dialog').html(DataLayer.render("../prototype/modules/attach_message/attach_message.ejs", {}));

trunk/prototype/modules/mail/templates/attachment.ejs

@@ -1 @@
-<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 5px 0px 0px 0px; padding-bottom : 5px;">
-    <div class="button-files-upload">
-    <button class="fileUploadButton">Anexar Arquivos</button>
-                        <INPUT type="file" id="fileInput<%=data.ID%>" name="files[]" style="display:none;" multiple></INPUT>
+<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px -5px -10px; padding-bottom : 5px;">
+        <div class="row fileupload-buttonbar">
+                <div class="button-files-upload">
+                        <<%= is_webkit ? 'button' : 'span style="height: 22px; cursor:pointer;"' %>  class="fileinput-button button small">
+                                <span style="margin-top: 4px; cursor:pointer;"><i class="icon-plus icon-white"></i>Anexar arquivos</span>
+                                <INPUT type="file" id="fileInput<%=data.ID%>" name="files[]" multiple></INPUT>
                         </<%= is_webkit ? 'button' : 'span' %>>
-                        <button class="message-attach-link button-small">
+                        <button class="message-attach-link button small">
                                 <span>Anexar mensagens</span>
                         </button>
-    </div>
-<div class="files-list">
+                </div>
+        </div>
+        <br />
+        <div class="files-list" style="margin: 5px">
                 <div class="attachments-list ui-corner-all" style="display:none;"></div>
         </div>