Changeset 5713

Timestamp:

03/13/12 16:11:40 (11 years ago)

Author:

douglasz

Message:

Ticket #2486 - Compatibizar a tela dos marcadores e sinalizadore com o IE

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• prototype/modules/mail/css/followupflag.css (modified) (2 diffs)
• prototype/modules/mail/css/label.css (modified) (1 diff)
• prototype/modules/mail/js/label.js (modified) (7 diffs)

trunk/expressoMail1_2/index.php

@@ -353 +353 @@
         echo $obj -> getFilesJs($scripts, $update_version);
         echo '
-                <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 
-                <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script>
-                <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>
-                <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>
                 <script type="text/javascript">
                         init();

trunk/expressoMail1_2/js/common_functions.js

@@ -723 +723 @@
 
         dialogElement.dialog({
-                width:542,
+                width:532,
                 height:420,
                 title:get_lang('Follow up'),

trunk/expressoMail1_2/js/draw_api.js

@@ -364 +364 @@
         }).find(".square-color").css("display","");
 
-        $("#MyMarckersList a.title-my-labels").click(function() {
-                $("#MyMarckersList ul.label-list").toggleClass("hidden")
+        $("#MyMarckersList a.title-my-labels").click(function() {       
+                if($("#MyMarckersList ul.label-list").css("display") == "none"){
+                        $("#MyMarckersList ul.label-list").show();
+                }else{
+                        $("#MyMarckersList ul.label-list").hide();
+                }
                 $('#MyMarckersList .status-list-labels').toggleClass("ui-icon-triangle-1-s");
-                $('#MyMarckersList .status-list-labels').toggleClass("ui-icon-triangle-1-n");
+                $('#MyMarckersList .status-list-labels').toggleClass("ui-icon-triangle-1-n");   
          });
-         
+        
         if (!labels){
-                $(".my-labels").addClass("hidden");
+                $(".my-labels").hide();
         }
 }

trunk/prototype/modules/mail/css/followupflag.css

@@ -1 @@
-.followupflag-configure-win { width:543px; height:412px !important;  } 
+.followupflag-configure-win { width:533px; height:411px !important;  padding:0 !important;} 
 .followupflag-container { 
-        width:530px; 
+        width:520px; 
         height:398px; 
         border: 1px solid #A6C9E2; 
-        float:left; 
         -moz-border-radius: 5px; 
         -webkit-border-radius: 5px; 
@@ -60 +59 @@
         position:absolute; 
         bottom:14px; 
-        right:11px; 
+        right:10px; 
         background:transparent; 
         width:auto; 

trunk/prototype/modules/mail/css/label.css

@@ -118 +118 @@
 .label-configure-win .form-item { margin: 5px 0;}
 .label-configure-win .selectedDefault { background: #fed4b4; border: 1px solid #fb8c37; -moz-border-radius: 5px; -webkit-border-radius:5px; }
-.label-configure-win .edit-value-list { opacity:0.65; margin-top:0; width:125px;}
+.label-configure-win .edit-value-list { opacity:0.65; margin-top:0; width:115px;}
 
 #listMarkers{width: 800px !important;}
 .label-configure-win .add-label-button { float:right; cursor: pointer; }
+
+.configure-zebra-dialog {z-index:1007 !important;}

trunk/prototype/modules/mail/js/label.js

@@ -31 +31 @@
                         var nameLabel = $(".label-list").find(".edit-value-list").val();
                         $(span).html($(".label-list").find(".edit-value-list").val())
-                        .parent().find('.edit').removeClass("hidden").parents("li").click(configureLabel).trigger("click");
+                        .parent().find('.edit').css("display","").parents("li").click(configureLabel).trigger("click");
                         save_editLabel(nameLabel, data.applyToSelectedMessages);
                         
@@ -39 +39 @@
         }).focusout(function(){
                 $(span).html(conteudoSpan)
-                .parent().find('.edit').removeClass("hidden").parents("li").click(configureLabel);
+                .parent().find('.edit').css("display","").parents("li").click(configureLabel);
         }).focus();
-        $(this).addClass("hidden");
+        $(this).hide();
 }
 
@@ -81 +81 @@
         $.Zebra_Dialog('<strong>Deseja excluir esse marcador?</strong>', {
                 'type':     'question',
+                'custom_class': (is_ie ? 'configure-zebra-dialog' : ''),
                 'title':    'Atenção',
-                'buttons': ['Sim','Não'],
+                'buttons': ['Sim','Não'],               
                 'overlay_opacity': '0.5',
                 'onClose':  function(caption) {
@@ -90 +91 @@
                 }
         });     
+        if(is_ie)
+                $(".ZebraDialogOverlay").css("z-index","1006");
 }               
         
@@ -188 +191 @@
         var qtdLi = $(".label-list-container ul").find("li").not(".empty-item").length;
         if (qtdLi == 0){
-                $(".my-labels").addClass("hidden");
+                $(".my-labels").hide();
                 $(".label-list-container ul").find(".empty-item").css("display","");
                 winElement.find(".buttons .save-label .ui-button-text").text('Criar');
@@ -271 +274 @@
                 winElement.find('.close').click(deleteLabel);
                 
-                $(".my-labels").removeClass("hidden");
+                $(".my-labels").show();
                 
                 $.contextMenu( 'destroy', ".table_box tbody tr");
@@ -455 +458 @@
         }).keyup();     
 }
-/**
- * TODO:
- * * Qunado excluir um marcador deve ser removido das mensagens sem que seja necessario atualizar o Expresso.
- * * Quando editado um marcador dever ser atualizado na lista de mensagem onde esse marcador foi aplicado.
- */