Changeset 7454

Timestamp:

10/24/12 10:29:57 (11 years ago)

Author:

thiago

Message:

Ticket #3088 - Tradução de pasta e correção de bug nas pastas.

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (4 diffs)
• prototype/modules/mail/templates/detailedfoldertree.ejs (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -332 +332 @@
                 var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";
                 var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";
+        var outboxfolder = "Outbox";
+
                 var token_param = "'.$var_tokens.'";
                 var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";

trunk/prototype/modules/mail/js/foldertree.js

@@ -48 +48 @@
 
 function count_unseen_children(folder){
-
     if(folder.children.length){
         for(var i=0; i< folder.children.length; i++){
@@ -467 +466 @@
 
                     $.Zebra_Dialog(confirm_text+folder_name, {
-                        'type':     'question',
+                        'type': 'question',
                         'overlay_opacity': '0.5',
                         'buttons':  [get_lang('Yes'), get_lang('No')],
@@ -540 +539 @@
                         event.stopPropagation();
 
+                        existsIdenticalFolder = false;
+
                     var ok = false;
                     var makeChildren = function(auxNameFolder, father){
@@ -579 +580 @@
                                  var father = typeof(selected_li.attr('id')) != "undefined" ? selected_li.attr('id').split("_")[2] : "home";
 
-                                 $(this).parents(".filetree:first").find("li").each(function(){
+                                 $(this).parents(".treeview:first").find("li").each(function(){
                                      var eachFolder = $(this).find("span:first").text().trim();
                                      if(folderName == eachFolder){

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

@@ -1 +1 @@
 <%
+
         var specialFolders = {
                         INBOX: {name:'Caixa de Entrada', classe:'inbox'}, 
                         Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 
                 };
-    specialFolders["Outbox"] = {name: 'Caixa de Sa&iacuteda', classe:'outbox'};
+    specialFolders[outboxfolder] = {name: 'Caixa de Sa&iacuteda', classe:'outbox'};
         specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'};
         specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'};