Changeset 6984

Timestamp:

08/10/12 11:23:09 (12 years ago)

Author:

thiago

Message:

Ticket #2966 - Icones do expresssoCalender e expressoMail

Location:

sandbox/2.4.2-expresso1

Files:

• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• expressoMail1_2/templates/default/images/big-event.png (added)
• expressoMail1_2/templates/default/images/big-task.png (added)
• prototype/modules/calendar/css/layout.css (modified) (1 diff)
• prototype/modules/calendar/css/style.css (modified) (1 diff)
• prototype/modules/calendar/img/big-event.png (added)
• prototype/modules/calendar/img/big-task.png (added)
• prototype/modules/calendar/img/mini-event.png (added)
• prototype/modules/calendar/img/mini-task.png (added)
• prototype/modules/calendar/js/init.js (modified) (1 diff)
• prototype/modules/calendar/templates/calendar_day_print.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/calendar_month_print.ejs (modified) (1 diff)
• prototype/modules/calendar/templates/event_list.ejs (modified) (2 diffs)

sandbox/2.4.2-expresso1/expressoMail1_2/js/draw_api.js

@@ -2986 +2986 @@
                 new_task_logo.title = "Criar uma nova tarefa a partir deste email.";
                 new_task_logo.alt = "Criar uma nova tarefa a partir deste email.";
-                new_task_logo.src = "./templates/default/images/task.png";
+                new_task_logo.src = "./templates/default/images/big-task.png";
                 new_task_logo.style.cursor = "pointer";
                 new_task_logo.style.marginLeft = "5px";
-                $(new_task_logo).css({
-                        'height' : '16px',
-                        'width' : '16px'
-                });
                 new_task_logo.onclick = function(){
                 import_implements_calendar();
@@ -3006 +3002 @@
                 new_event_logo.alt = "Criar evento a partir deste email";
                 //new_event_logo.src = "./templates/default/images/calendar_add.png";
-                new_event_logo.src = "./templates/default/images/event.png";
+                new_event_logo.src = "./templates/default/images/big-event.png";
                 new_event_logo.style.cursor = "pointer";
-                $(new_event_logo).css({
-                        'height' : '16px',
-                        'width' : '16px'
-                });
                 new_event_logo.style.marginLeft = "5px";
                 new_event_logo.onclick = function(){

sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css

@@ -1262 +1262 @@
 }
 
-.events-list-win table img {
-  width: 12px;
-  height: 12px;
-  padding: 0 2px;
-}
 
 .events-list-win table span { font-size:12px; }

sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css

@@ -406 +406 @@
   color: rgb(48, 72, 126) !important;
   cursor: pointer;
-}
-
-.events-list-win table img {
-  width: 12px;
-  height: 12px;
-  padding: 0 2px;
 }
 

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js

@@ -344 +344 @@
                         var img_icon = "";
                         if(event.type == 1)
-                                img_icon = "event.png";
+                                img_icon = "mini-event.png";
                         if(event.type == 2)
-                                img_icon = "task.png";
+                                img_icon = "mini-task.png";
                         if(event.type == 3)
                                 img_icon = "activity_icon.jpg";

sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/calendar_day_print.ejs

@@ -46 +46 @@
                                         var title_type = "";
                                         if(data.days.events[0][jj].events[ii].type == '1'){
-                                                img_type = "../prototype/modules/calendar/img/event.png";
+                                                img_type = "../prototype/modules/calendar/img/mini-event.png";
                                                 title_type = "Evento";
                                         }if(data.days.events[0][jj].events[ii].type == '2'){
-                                                img_type = "../prototype/modules/calendar/img/task.png"; 
+                                                img_type = "../prototype/modules/calendar/img/mini-task.png"; 
                                                 title_type = "Tarefa";
                                         }if(data.days.events[0][jj].events[ii].type == '3'){

sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/calendar_month_print.ejs

@@ -29 +29 @@
                                                         var title_type = "";
                                                         if(data.days.events[i][jj].events[ii].type == '1'){
-                                                                img_type = "../prototype/modules/calendar/img/event.png";
+                                                                img_type = "../prototype/modules/calendar/img/mini-event.png";
                                                                 title_type = "Evento";
                                                         }if(data.days.events[i][jj].events[ii].type == '2'){
-                                                                img_type = "../prototype/modules/calendar/img/task.png"; 
+                                                                img_type = "../prototype/modules/calendar/img/mini-task.png"; 
                                                                 title_type = "Tarefa";
                                                         }if(data.days.events[i][jj].events[ii].type == '3'){

sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/event_list.ejs

@@ -53 +53 @@
                                                         var title_type = "";
                                                         if(_event.type == '1'){
-                                                                img_type = "../prototype/modules/calendar/img/event.png";
+                                                                img_type = "../prototype/modules/calendar/img/big-event.png";
                                                                 title_type = "Evento";
                                                         }if(_event.type == '2'){
-                                                                img_type = "../prototype/modules/calendar/img/task.png"; 
+                                                                img_type = "../prototype/modules/calendar/img/big-task.png"; 
                                                                 title_type = "Tarefa";
                                                         }if(_event.type == '3'){
@@ -63 +63 @@
                                                         }
                                                         %>
-                                                        <img style="width: 16px; height: 16px" title="<%= title_type %>" src="<%= img_type %>"> 
+                                                        <img title="<%= title_type %>" src="<%= img_type %>"> 
                                                         <a class="title event-details-item" title='<%= _event.summary %>' aria-expanded='false' role='button' tabindex='0'><%= _event.summary %></a>
                                                         <!-- TODO: FAZER FUNCIONAR DESTA FORMA -->