Changeset 8232 for branches/2.5/prototype/modules/mail/templates

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

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

Location:

branches/2.5/prototype/modules/mail/templates

Files:

• attachment.ejs (modified) (1 diff)
• detailedfoldertree.ejs (modified) (3 diffs)

branches/2.5/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">
                 <div class="attachments-list ui-corner-all" style="display:none;"></div>
         </div>

branches/2.5/prototype/modules/mail/templates/detailedfoldertree.ejs

@@ -5 +5 @@
                         Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 
                 };
-    specialFolders[outboxfolder] = {name: 'Caixa de Saída', classe:'outbox'};
+    specialFolders[outboxfolder] = {name: 'Caixa de Saï¿œda', classe:'outbox'};
         specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'};
         specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'};
@@ -26 +26 @@
                   %><li id="<%= array_trees[i].id %>" class="closed"><span class="folder <%= folder_class %>" title="<%= folder_name %>" style="text-align : left; position : static;"><%= folder_name %>
                   <% if(array_trees[i].messageCount.unseen > 0){        %>
-                        <span style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_unseen" class="folder_unseen" style="color : red; text-align : left;"><%= array_trees[i].messageCount.unseen %></label>]</span>
-                  <% }  %>
+                        <span class="message_unseen_count" style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_unseen" class="folder_unseen" style="color : red; text-align : left;"><%= array_trees[i].messageCount.unseen %></label>]</span>
+          <% }  %>
                   <% if(array_trees[i].children_unseen > 0){    %>
-                        <span style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_children_unseen" class="folder_unseen" style="color : blue; text-align : left;"><%= array_trees[i].children_unseen %></label>]</span>
+                        <span style="text-align : left;">[<label id="dftree_<%= array_trees[i].id%>_children_unseen" class="folder_children_unseen" style="color : blue; text-align : left;"><%= array_trees[i].children_unseen %></label>]</span>
                   <% }  %>
                   </span>
@@ -67 +67 @@
 
           <%}%>
+        <% if(preferences['use_followupflags_and_labels'] == "1"){%>
           <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span>
+          <%}%>
           </li>
         </ul>