Changeset 7228 for branches/2.4/expressoMail1_2/templates

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/templates/default/folderExpresso.ejs (deleted)
• expressoMail1_2/templates/default/images/ajax-loader.gif (copied) (copied from trunk/expressoMail1_2/templates/default/images/ajax-loader.gif)
• expressoMail1_2/templates/default/images/big-event.png (copied) (copied from trunk/expressoMail1_2/templates/default/images/big-event.png)
• expressoMail1_2/templates/default/images/big-task.png (copied) (copied from trunk/expressoMail1_2/templates/default/images/big-task.png)
• expressoMail1_2/templates/default/images/event.png (copied) (copied from trunk/expressoMail1_2/templates/default/images/event.png)
• expressoMail1_2/templates/default/images/task.png (copied) (copied from trunk/expressoMail1_2/templates/default/images/task.png)
• expressoMail1_2/templates/default/index.tpl (modified) (1 diff)
• expressoMail1_2/templates/default/listContacts.ejs (modified) (1 diff)
• expressoMail1_2/templates/default/main.css (modified) (17 diffs)

branches/2.4/expressoMail1_2/templates/default/index.tpl

@@ -186 +186 @@
         </fieldset>   
 </div>
-<div id="import-dialog" title="Importar Evento" style="display:none">
+<div id="import-dialog" title="Importar Evento/Tarefa" style="display:none">
         <p>Seleciona uma Agenda para o Evento :</p>
         <p>

branches/2.4/expressoMail1_2/templates/default/listContacts.ejs

@@ -8 +8 @@
 <li>
         <img style="position:relative; top:2px; "src="templates/default/images/<%=data.type == 'pessoal' ? 'contato_pessoal' : 'contato_recente'%>.png" title="Contato <%=data.type == 'pessoal' ? data.type : 'recente'%>"/>
-        <a style="width:80%; display: inline-block;"><%= data.name %> - <%= data.email %></a>
+        <a style="width:80%; display: inline-block;"><%= data.name.length <= 21 ? data.name : data.name.substr(0,18) + "..."%> - <%= data.email %></a>
         <span style="width:16px; height:16px; top:5px; <%=data.type == 'pessoal' ? 'display:none' : ''%>">Excluir contato recente</span>        
 <%}%>

branches/2.4/expressoMail1_2/templates/default/main.css

@@ -144 +144 @@
 form.fileupload .files-list { margin-left: 5px; margin-top: -14px; padding: 0.2em 0.7em; }
 form.fileupload .files-list .delete-upload { top: 7px}
-ul.attachments-list { padding: 0; }
+
+div.attachments-list {
+        max-height: 130px;
+        overflow-y: auto;
+        padding-top: 5px;
+}
 
 .button-files-upload { float:left; }
@@ -230 +235 @@
 .expressomail-qs-container .menu-control { float:right; margin-left:400px; position: absolute; z-index: 100; padding-top:5px;}
 .expressomail-qs-container .acc-list { width:444px;height:250px;float:left;border:1px solid #DDD;background-color:#EEE;border-radius:3px;margin-left:1px; margin: 10px 5px 5px 1px;}
-.expressomail-qs-container .details-container { width:295px;height:246px; float:right; margin: 5px 5px;}
+.expressomail-qs-container .details-container { width:300px;height:246px; float:right; margin: 5px 0;}
 
 .expressomail-qs-container .acc-list .demo {width:100%;margin-top:20px;}
@@ -236 +241 @@
 .dialog-modal.expressomail-qs-container  { height: 416px; padding:5px; }
 
-.ui-dialog .ui-dialog-buttonpane { padding: 0; border:none; margin: 0; padding-right: 0.3px !important;}
+.ui-dialog .ui-dialog-buttonpane { padding: 0; border:none; margin: 0;}
 .expressomail-qs-container .menu-control .ui-button-text-only .ui-button-text { padding: 0.1em 0.6em; }
 
@@ -404 +409 @@
         color: red;
 }
-.selected_shortcut_msg{
-        color: white;
-        background-color: #5194d2;
-}
+
 .show_img_link{
         width : 100%;
@@ -896 +898 @@
 
 
-
 /*
  * Este arquivo limpa o estilo para a nova agenda, .new-event-win.active sobrescrevendo o código CSS
@@ -926 +927 @@
 /*      font-family: Arial,Helvetica,sans-serif;*/
 /*}*/
-.new-event-win.active:focus {
+.new-event-win.active:focus, .new-task-win.active:focus {
         outline: 0;
 }
-.new-event-win.active body {
+.new-event-win.active body , .new-task-win.active body {
         line-height: 1;
         color: black;
         background: white;
 }
-.new-event-win.active ol, .new-event-win.active ul {
+.new-event-win.active ol, .new-event-win.active ul , .new-task-win.active ol, .new-task-win.active ul {
         list-style: none;
         list-style-image : none;
@@ -940 +941 @@
 }
 
-.new-event-win.active table {
+.new-event-win.active table , .new-task-win.active table {
         border-collapse: separate;
         border-spacing: 0;
 }
-.new-event-win.active caption, .new-event-win.active th, .new-event-win.active td {
+.new-event-win.active caption, .new-event-win.active th, .new-event-win.active td, .new-task-win.active caption, .new-task-win.active th, .new-task-win.active td {
         /*text-align: left;*/
         font-weight: normal;
 }
 .new-event-win.active blockquote:before, .new-event-win.active blockquote:after,
-.new-event-win.active q:before, .new-event-win.active q:after {
+.new-event-win.active q:before, .new-event-win.active q:after,
+.new-task-win.active blockquote:before, .new-task-win.active blockquote:after,
+.new-task-win.active q:before, .new-task-win.active q:after {
         content: "";
 }
-.new-event-win.active blockquote, .new-event-win.active q {
+.new-event-win.active blockquote, .new-event-win.active q ,
+.new-task-win.active blockquote, .new-task-win.active q 
+{
         quotes: "" "";
 }
-.new-event-win.active .mail.name-special, .new-event-win.active .name.name-special{
+.new-event-win.active .mail.name-special, .new-event-win.active .name.name-special,
+.new-task-win.active .mail.name-special, .new-task-win.active .name.name-special
+{
   padding: 0 0 0 35px;
 }
 
-.new-event-win.active .add-attendee-search.search-field {
+.new-event-win.active .add-attendee-search.search-field ,
+.new-task-win.active .add-attendee-search.search-field 
+{
   width: 249px;
  }
  
- .new-event-win.active #calendar_addevent_details4 {
+ .new-event-win.active #calendar_addevent_details4, .new-task-win.active #calendar_addtask _details4 {
   margin: 10px 0 0 0;
  } 
  
- .new-event-win.active input{
+ .new-event-win.active input, .new-task-win.active input{
   color: #000;
  } 
  
- .new-event-win.active #calendar_addevent_details5 {
+ .new-event-win.active #calendar_addevent_details5 , .new-task-win.active #calendar_addtask_details5 {
   margin: 10px 0 11px 0;
  }
 
-.new-event-win.active select {
+ .new-event-win fieldset.tab-level2, .new-task-win fieldset.tab-level2 { padding: 0px 5px; min-height: 110px; max-height: 310px; overflow: hidden;}
+ 
+.new-event-win.active select , .new-task-win.active select {
     border: 1px solid #CFCFCF;
     border-color: #CFCFCF;
@@ -981 +992 @@
     background-color: #FFF;
 }
-.new-event-win.active a:link, .new-event-win.active a:visited {
+.new-event-win.active a:link, .new-event-win.active a:visited 
+.new-task-win.active a:link, .new-task-win.active a:visited
+{
+
     color: #2E6E9E;
 }
 
-.new-event-win.active  dd, .new-event-win.active  dl, .new-event-win.active  dt{
+.new-event-win.active  dd, .new-event-win.active  dl, .new-event-win.active  dt, 
+.new-task-win.active  dd, .new-task-win.active  dl, .new-task-win.active  dt
+{
         margin: 0;
 }
@@ -999 +1015 @@
 { color: #ff9933; }*/
 
-.new-event-win.active #divAppbox{
+.new-event-win.active #divAppbox
+.new-task-win.active #divAppbox
+{
         overflow-x: auto;
         overflow-y: scroll;
@@ -1005 +1023 @@
 
 .new-event-win.active select
+.new-task-win.active select
 { border-color: #CFCFCF; color: #555; padding-left:0px;}
 
@@ -1010 +1029 @@
         padding: 0;
         border: 0;
-}
-
-.qtip.qtip-blue.qtip-active ul {
-        padding: 0;
-}
-
-.qtip.qtip-blue.qtip-active li {
-        width: 160px;
-        list-style: none;
 }
 
@@ -1052 +1062 @@
 }
 
+div.new-event-win.active div.button-files-upload {margin: 15px 0 0 0;}
+
 fieldset.alarm{  
     border: none !important;
@@ -1058 +1070 @@
 }
 
-div.new-event-win.active div.button-files-upload{
-    margin: 15px 0 0 0;
-}
-
-div.new-event-win.active div.files-list{
-    margin: 45px 0 0 0;
+.new-task-win dl.block-add-attendee{
+        width: 350px;
+}
+.new-task-win.active .add-attendee-search.search-field{
+        width: 322px;
+}
+
+.new-task-win .menu-container.footer-container{
+        width: 774px;
 }
 
@@ -1177 +1192 @@
         border-top: 0px;
 }*/
-
 
 
@@ -1302 +1316 @@
         border-radius: 5px;
         -moz-border-radius: 5px;
-        border: 1px solid #ADD9ED;
+        border: 1px solid #ADD9ED; 
         display: inline-block;
         cursor : pointer;
@@ -1355 +1369 @@
 }
 
-.box-selected{
-        background-color : #BBBBBB;
-}
-
 .hidden {
         display : none;
@@ -1391 +1401 @@
 }
 
-div.new-msg-head-data div.email-area .invalid-email-box{ 
-        color: #540303; 
-        background-color: #ea9aa0; 
-        border : 1px solid #540303 !important; 
-} 
- 
-div.new-msg-head-data div.email-area .box-selected{ 
-        background-color : #BBBBBB; 
-} 
-
-.new-message-input.email-text{ 
-        resize: none; 
-        height: 16px; 
-        overflow: hidden; 
-        vertical-align: middle; 
-}
+div.conteudo div.new-msg-head-data div.att-box{
+        background-color: #DFEFFC;
+        border-radius: 5px;
+        -moz-border-radius: 5px;
+        border: 1px solid #ADD9ED; 
+        display: inline-block;
+        cursor : pointer;
+        margin-top : 3px;
+        margin-right: 3px;
+        outline : none;
+        padding : 1px;
+}
+
+
+div.conteudo div.new-msg-head-data  div.att-box span.att-box-value{
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        color : #201b41;
+        outline : none;
+}
+
+div.conteudo div.new-msg-head-data div.att-box span.att-box-loading{
+        background : url("../../../prototype/modules/mail/img/loading.gif") no-repeat !important;
+        display: inline-block;
+        background-size: 15px auto !important;
+}
+
+div.conteudo div.new-msg-head-data div.att-box.invalid-email-box{
+        background-color: #ea9aa0;
+        border : 1px solid #540303 !important;
+}
+
+div.new-msg-head-data div.email-area .invalid-email-box{
+        color: #540303;
+        background-color: #ea9aa0;
+        border : 1px solid #540303 !important;
+}
+
+div.new-msg-head-data div.email-area .box-selected{
+        background-color : #BBBBBB;
+}
+
+.fileupload_msg_tooltip{
+    width: 99.7%;
+    text-align: center;
+    background: #DFEFFC;
+    font-weight: bold;
+    border-radius: 5px;
+    height: 115px;
+    line-height: 115px;
+    font-size: larger;
+}
+
+.fileupload_msg_tooltip.hover {
+    background: #ADD9ED;
+}
+
+.select-all-messages{
+        min-height: 20px;
+        font-size: 13px;
+        font-family: Arial;
+        white-space: nowrap;
+        text-align: center;
+}
+.select-all-messages .select-link{
+        text-decoration: underline !important;
+}
+
+.selected_shortcut_msg{
+    color: white;
+    background-color: #95A7FC;
+}
+
+.current_selected_shortcut_msg{
+    color: white;
+    background-color: #5194d2;
+}
+
+/*freeow*/
+div.gray.alarmDeadline .button.delete
+{
+/*
+        display: block;
+        position: absolute;
+        right: 19px;
+        top: 50px;
+        */
+}
+
+/*div.gray.alarmDeadline ul.message-list{overflow: hidden;}*/
+
+/*div.gray.alarmDeadline ul.message-list li{ margin: 5px 0;}*/
+
+div.gray li{float: left; width: 253px;}
+
+div.gray li a.button.delete{float: right;}
+
+
+.div-addtask #calendar_addtask_details1 .h1{
+  width: 100%;
+}
+
+.div-addtask #calendar_addtask_details2 textarea {
+  width: 675px;
+}
+
+.div-addtask .button-files-upload{width: 100%;}
+.div-addtask fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list{width: 330px;}
+
+.new-event-win div.div-addevent, .new-task-win div.div-addtask{width: 775px;}
+
+.calendar-addevent-details-txt-timezone, .calendar-addtask-details-txt-timezone{width: 212px;} 
+
+.div-addtask #calendar_addtask_details1 .time-previsao { width: 40px; }
+
+.div-addtask #calendar_addtask_details1 .date-previsao{ width: 80px; }
+
+.div-addtask #calendar_addtask_details6{ width: 756px; }
+.div-addtask #calendar_addtask_details1 .start-time{ width: 40px; }
+.div-addtask #calendar_addtask_details1 .start-date{ width: 80px; }
+.div-addtask #calendar_addtask_details1 .end-time{ width: 40px; }
+.div-addtask #calendar_addtask_details1 .end-date{ width: 80px; }
+.div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 20px; }
+.div-addtask #calendar_addtask_details1 .subitem { margin: 5px; display: block;}
+.div-addtask #calendar_addtask_details1 .subitem .span_done{ margin: 0 30px;}
+.div-addtask #calendar_addtask_details1 .subitem .span_done img{position: relative; top:4px; width:16px; height:16px;}
+.div-addtask #calendar_addtask_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;}
+.div-addtask #calendar_addtask_details1 .subitem .done { width: 45px;}
+.div-addtask #calendar_addtask_details1 .ui-spinner-buttons{ top: -2px !important;}
+.div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-up{height: 7px !important;}
+.div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-down{height: 8px !important;}
+
+.div-addtask #calendar_addtask_details1 .subitem .span_done.noAction{background-image: url("../../../prototype/modules/calendar/img/gray.png"); background-repeat: no-repeat; }
+.div-addtask #calendar_addtask_details1 .subitem .span_done.inProcess{background-image: url("../../../prototype/modules/calendar/img/yellow.png"); background-repeat: no-repeat;}
+.div-addtask #calendar_addtask_details1 .subitem .span_done.finished{background-image: url("../../../prototype/modules/calendar/img/green.png"); background-repeat: no-repeat;}
+.div-addtask #calendar_addtask_details1 .subitem .span_done.canceled{background-image: url("../../../prototype/modules/calendar/img/red.png"); background-repeat: no-repeat;}
+
+#calendar_addtask_details4{margin: 0;}
+#calendar_addtask_details5{margin: -2px 0 0 0;}
+#calendar_addtask_details7{margin: 3px 0 0 0;}
+.div-addtask #calendar_addtask_details1 .subitem .span_done label{position: relative; left: 28px;}
+
+.div-addtask fieldset#calendar_addtask_details5.tab-level2{ margin: 0 }
+
+.div-addtask  #calendar_addtask_details8 .parent {width: 746px; min-height: 208px; float: left;}
+/*.div-addtask  #calendar_addtask_details8 .parent .child-top {width: 745px; height: 20px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}*/
+.div-addtask  #calendar_addtask_details8 .parent .child-top {width: 745px; height: 25px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC; border-top: 1px solid #CCC;}
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 208px; overflow: auto;  float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 20px; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;}
+
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour {overflow: hidden; width: 140px; float: left; height: 20px}
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user{overflow: hidden; width: 150px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user span{ margin: 8px; float: left; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute{overflow: hidden; width: 130px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute span{ margin: 8px; float: left; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue{overflow: hidden; width: 150px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue span{ margin: 8px; float: left; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue{overflow: hidden; width: 150px; float: left;  height: 20px; border-left: 1px solid #CCC; }
+.div-addtask  #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue span{ margin: 8px; float: left; }
+
+.div-addtask  #calendar_addtask_details8 .parent .child-top .date-hour { width: 140px; float: left; background: #E8F4FD; height: 20px; text-align: center; }
+.div-addtask  #calendar_addtask_details8 .parent .child-top .date-hour span{ display: block; padding: 6px; font-weight: bold; color: #2E6E9E; }
+.div-addtask  #calendar_addtask_details8 .parent .child-top .user { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .user span{display: block; padding: 6px;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .attribute { width: 130px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .attribute span{display: block; padding: 6px;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .beforeValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .beforeValue span{display: block; padding: 6px; }
+.div-addtask  #calendar_addtask_details8 .parent .child-top .afterValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E;  text-align: center;}
+.div-addtask  #calendar_addtask_details8 .parent .child-top .afterValue span{display: block; padding: 6px; }
+
+.new-message-input.email-text{
+        resize: none;
+        height: 16px;
+        overflow: hidden;
+        vertical-align: middle;
+}