Changeset 8113 for branches/2.5
- Timestamp:
- 04/24/13 18:16:28 (11 years ago)
- Location:
- branches/2.5
- Files:
-
- 5 edited
-
expressoMail1_2/js/main.js (modified) (2 diffs)
-
expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
-
expressoMail1_2/templates/default/index.tpl (modified) (1 diff)
-
prototype/api/templates/foldertree.ejs (modified) (1 diff)
-
prototype/modules/mail/templates/detailedfoldertree.ejs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/expressoMail1_2/js/main.js
r8085 r8113 4842 4842 write_msg(get_lang('You must wait while the messages will be imported...')); 4843 4843 4844 cExecuteForm('$this.imap_functions.import_msgs', formSend , handler_return ); 4844 var local_folder = input_hidden.attr("value"); //recupera a pasta selecionada 4845 if(local_folder.indexOf("local_") == 0){ //verifica se a pasta selecionada é uma pasta local 4846 4847 var fdata = local_folder.substr(15, local_folder.length); //recupera somente a estrutura da pasta ou o id 4848 expresso_mail_archive.getFolderInfo(fdata); //recuperar a estrutura da pasta, 4849 //para realizar a importação de mensagens 4850 fdata = expresso_mail_archive.folder.path; 4851 4852 //o mailarchiver não provê um serviço para a importação de mensagens nas pastas locais, 4853 //mas sim uma modal, da qual são extraídas as informações e as urls para submitar os dados 4854 //para o arquivamento de mensagens em pastas locais. 4855 var url_src = mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port + '/arcserv/import?prt=' + mail_archive_protocol + '&por=' + mail_archive_port+ '&fid='+ encodeURIComponent(fdata) + '&sid=' + expresso_mail_archive.session.id; 4856 var _html = DataLayer.render(url_src); 4857 var regex_url = RegExp('\<iframe(.)*src=\"([^\"]*)"(.)*\>'); 4858 var obj_params = $.parseQuery( regex_url.exec(_html)[2].split('?')[1] || '' ); 4859 $(formSend).append('<input id="ma_import_flat" type="checkbox" value="false" name="flat" style="display:none"> ' + 4860 '<input id="sessionId" type="hidden" value="'+obj_params['sessvalue']+'" name="sessionId">' + 4861 '<input id="base" type="hidden" value="'+obj_params['basevalue']+'" name="base">' + 4862 '<input id="lang" type="hidden" value="'+obj_params['langvalue']+'" name="lang">'); 4863 4864 var importEmailsLocalDialog = $('#importEmailsLocal'); 4865 importEmailsLocalDialog.css("overflow","hidden"); 4866 importEmailsLocalDialog.dialog( 4867 { 4868 autoOpen : false, 4869 height : 200, 4870 width : 350, 4871 resizable : false, 4872 title : get_lang('Local Archive'), 4873 modal : true, 4874 buttons : [ 4875 { 4876 text : get_lang("Close"), 4877 click : function() 4878 { 4879 importEmailsLocalDialog.dialog("close").dialog("destroy"); 4880 } 4881 } 4882 ] 4883 }); 4884 4885 importEmailsLocalDialog.html('<iframe frameborder="0" scrolling="no" id="frameResult" name="frameResult" ></iframe>') 4886 $(formSend).attr("action", mail_archive_protocol + '://' + mail_archive_host + ':' + mail_archive_port + '/arcserv/import'); 4887 $(formSend).attr("target", "frameResult"); 4888 $(formSend).submit(); 4889 importEmailsLocalDialog.dialog( "open" ); 4890 if(typeof(shortcut) != 'undefined') 4891 shortcut.disabled = false; 4892 } else { 4893 cExecuteForm('$this.imap_functions.import_msgs', formSend , handler_return ); 4894 } 4895 4845 4896 } 4846 4897 } … … 4901 4952 var foldersTree = jQuery("#foldertree-container-importMessage") 4902 4953 .removeClass('empty-container') 4903 .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, [] ]}))4954 .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, cp_tree3, [] ]})) 4904 4955 .find("#foldertree").treeview() 4905 4956 .click(function(event) -
branches/2.5/expressoMail1_2/setup/phpgw_pt-br.lang
r7703 r8113 973 973 Error trying to send the message. Retry in a few seconds... expressoMail1_2 pt-br Erro ao tentar enviar a mensagem. Nova tentativa em alguns segundos... 974 974 Sending the message... expressoMail1_2 pt-br Enviando a mensagem... 975 Local Archive expressoMail1_2 pt-br Arquivamento Local -
branches/2.5/expressoMail1_2/templates/default/index.tpl
r7553 r8113 209 209 <div class="expressomail-module-container" style="display: none;"></div> 210 210 <div id="importEmails" style="display:none;padding:5px;"></div> 211 <div id="importEmailsLocal" style="display:none;padding:5px;"></div> 211 212 <div id="sendFileMessages" style="display:none;"></div> 212 213 <div id="quickAddContact" style="display:none;"></div> -
branches/2.5/prototype/api/templates/foldertree.ejs
r5341 r8113 3 3 INBOX: {name:'Caixa de Entrada', classe:'inbox'}, 4 4 Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 5 Trash: {name:'Lixeira', classe:'trash'},6 Drafts:{name:'Rascunhos', classe:'drafts'},7 Spam: {name:'Spam', classe:'spam'},8 Sent: {name:'Enviados', classe:'sent'}9 5 }; 6 specialFolders[outboxfolder] = {name: 'Caixa de Saída', classe:'outbox'}; 7 specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'}; 8 specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'}; 9 specialFolders[spamfolder] = {name:'Spam', classe:'spam'}; 10 specialFolders[sentfolder] = {name:'Enviados', classe:'sent'}; 10 11 11 12 function recursive_forest(array_trees) -
branches/2.5/prototype/modules/mail/templates/detailedfoldertree.ejs
r8101 r8113 5 5 Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 6 6 }; 7 specialFolders[outboxfolder] = {name: 'Caixa de Sa ída', classe:'outbox'};7 specialFolders[outboxfolder] = {name: 'Caixa de Saída', classe:'outbox'}; 8 8 specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'}; 9 9 specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'};
Note: See TracChangeset
for help on using the changeset viewer.
