Changeset 5675 for trunk

Timestamp:

03/08/12 11:01:04 (12 years ago)

Author:

marcieli

Message:

Ticket #2486 - Corrigidos bugs referentes às telas de marcador e sinalizador.

Location:

trunk

Files:

• expressoMail1_2/js/doiMenuData.js (modified) (1 diff)
• expressoMail1_2/templates/default/main.css (modified) (1 diff)
• prototype/modules/mail/js/label.js (modified) (3 diffs)
• prototype/modules/mail/templates/followupflag_configure.ejs (modified) (3 diffs)
• prototype/modules/mail/templates/label_configure.ejs (modified) (1 diff)

trunk/expressoMail1_2/js/doiMenuData.js

@@ -167 +167 @@
                 $menu.css('display', 'block').position({ my: "center top", at: "center bottom", of: this}).css('display', 'none');
         },
-        delay:100,
+        delay:500,
         autoHide:true,
         events: {

trunk/expressoMail1_2/templates/default/main.css

@@ -376 +376 @@
 }
 
-.content-menu-td:hover{background-color: #ffffff; border: 1px solid #CCCCCC}
+.content-menu-td:hover{background-color: #ffffff; border: 1px solid #CCCCCC;}
 
 .content-folders {

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

@@ -179 +179 @@
         
         if($(".label-list li").length == 0){
-                winElement.find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found.")+'.</li></ul>');                     
-        } 
+                winElement.find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found.")+'.</li></ul>');
+                $(".save-label").button("disable");     
+        }
         var qtdLi = $(".label-list-container ul").find("li").not(".empty-item").length;
         if (qtdLi == 0){
@@ -187 +188 @@
                 winElement.find(".buttons .save-label .ui-button-text").text('Criar');
                 $(".delete-label").button("disable");   
+                $(".save-label").button("disable");     
                                 
                 winElement.find('.input-nome').val("");
@@ -205 +207 @@
                         winElement.find('.preview-label-inner').text(value);
                 }).keyup();                             
-        }               
+        }       
 }
 

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

@@ -62 +62 @@
                         <div class="alarm-fields">
                                 <input type="checkbox" name="alarm" <%=(followupflagged.alarmDeadline) ? 'checked="checked"' : '' %> /><label><%= get_lang("Alarm")%>: </label>
-                                <input type="text" name="alarmDate" class="date" size="9" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                                <input type="text" name="alarmDate" class="date" size="12" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                                 <input type="text" name="alarmTime" class="time" size="8" value="<%=(followupflagged.alarmDeadline) ? followupflagged.alarmDeadline.toString('hh:mm') : '' %>" />
                         </div>          
@@ -71 +71 @@
                 <div class="right-data input-done">
                         <label><%= get_lang("Conclusion")%>:</label>
-                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
+                        <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneDate" class="date" size="12" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('dd/MM/yyyy') : '' %>" /> ás 
                         <input <%=(followupflagged.isDone && followupflagged.isDone != '0') ? 'disabled="disabled"' : '' %> type="text" name="doneTime" class="time" size="8" value="<%=(followupflagged.doneDeadline) ? followupflagged.doneDeadline.toString('hh:mm') : '' %>" />
                 </div> 
@@ -106 +106 @@
                         <div class="form-item">
                                 <label class="flag-label"><%= get_lang("Color")%>: </label>
-                                <input type="text" name="backgroundColor" class="colorwell background-color" value="<%=(followupflagged.backgroundColor) ? followupflagged.backgroundColor : '#00820F' %>"/>
+                                <input type="text" name="backgroundColor" class="colorwell background-color" value="<%=(followupflagged.backgroundColor) ? followupflagged.backgroundColor : '#00820F' %>" readonly="readonly" />
                                 <div class="flag-edit flag-color-preview" style="background: <%=(followupflagged.backgroundColor) ? followupflagged.backgroundColor : '#00820F' %>">
                                         <img src="../prototype/modules/mail/img/flagEditor.png">

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

@@ -31 +31 @@
                         <div class="form-item">
                           <label for="backgroundColor" class="label-cor"><%= get_lang("Label Color")%>:</label>
-                          <input type="text" name="backgroundColor" id="background" class="colorwell" value="#ebebeb" />
+                          <input type="text" name="backgroundColor" id="background" class="colorwell" value="#ebebeb" readonly="readonly" />
                         </div>
                         <div class="form-item">
                           <label for="fontColor" class="label-cor"><%= get_lang("Text color")%>:</label>
-                          <input type="text" name="fontColor" class="colorwell" value="#000000" />
+                          <input type="text" name="fontColor" class="colorwell" value="#000000" readonly="readonly" />
                         </div>
                         <div class="form-item">
                           <label for="borderColor" class="label-cor"><%= get_lang("Border color")%>:</label>
-                          <input type="text" name="borderColor" class="colorwell" value="#000000" />
+                          <input type="text" name="borderColor" class="colorwell" value="#000000" readonly="readonly" />
                         </div>                    
                         <div class="preview-label-outer">