Changeset 5626
- Timestamp:
- 03/05/12 16:55:14 (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/abas.js
r5620 r5626 4 4 var partMsgs = new Array(); 5 5 var msgAttachments = new Array(); 6 var imgAttachmentFlag = new Array();7 6 var uidsSave = new Array(); 8 7 -
trunk/expressoMail1_2/js/draw_api.js
r5625 r5626 4205 4205 attach.fullFileName = file.name; 4206 4206 attach.fileName = file.name; 4207 if(file.name.length > 10)4208 attach.fileName = file.name.substr(0, 18) + "..." + file.name.substr(file.name.length-9, file.name.length);4207 if(file.name.length > 50) 4208 attach.fileName = file.name.substr(0, 32) + " ... " + file.name.substr(file.name.length-9, file.name.length); 4209 4209 attach.fileSize = formatBytes(file.size); 4210 4210 if(maxAttachmentSise && file.size > maxAttachmentSise) 4211 4211 attach.error = 'Tamanho de arquivo nao permitido!!' 4212 4213 fileUploadMSG.find('.attachments-list').append(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach}));4214 4215 if(!maxAttachmentSise || file.size < maxAttachmentSise){4216 fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');4217 fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden');4218 }else4219 fileUploadMSG.find(' .fileinput-button.new').removeClass('new');4220 4212 4221 fileUploadMSG.find(' .attachments-list').find('.button.close').button({ 4213 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 4214 upload.find('.button.close').button({ 4222 4215 icons: { 4223 4216 primary: "ui-icon-close" … … 4230 4223 $(this).parent().remove(); 4231 4224 }); 4225 4226 fileUploadMSG.find('.attachments-list').append(upload); 4227 4228 if(!maxAttachmentSise || file.size < maxAttachmentSise){ 4229 fileUploadMSG.find('.fileinput-button.new').append(data.fileInput[0]).removeClass('new'); 4230 fileUploadMSG.find('.attachments-list').find('[type=file]').addClass('hidden'); 4231 }else 4232 fileUploadMSG.find(' .fileinput-button.new').removeClass('new'); 4232 4233 4233 4234 })}, … … 4274 4275 var attach = {}; 4275 4276 attach.fileName = att.name 4277 if(attach.fileName.length > 45) 4278 attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 4279 4276 4280 attach.fileSize = formatBytes(onceOpenedMessages[folder_name][message_number].size); 4277 4281 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 4278 4282 upload.find('.status-upload').remove(); 4279 4283 upload.find('.in-progress').remove(); 4280 upload.find('p').append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 4281 fileUploadMSG.find('.attachments-list').append(upload); 4284 upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 4282 4285 4286 upload.find('.button.close').button({ 4287 icons: { 4288 primary: "ui-icon-close" 4289 }, 4290 text: false 4291 }).click(function(){ 4292 var idAttach = $(this).parent().find('input[name="fileId[]"]').val(); 4293 fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]'); 4294 delAttachment(ID,idAttach); 4295 $(this).parent().remove(); 4296 }); 4297 4298 fileUploadMSG.find('.attachments-list').append(upload); 4283 4299 } 4284 4300 … … 4287 4303 4288 4304 jQuery('#message-attach-dialog').dialog('close'); 4289 4290 //botao fechar4291 $('.attachments-list').find('.button.close').button({4292 icons: {4293 primary: "ui-icon-close"4294 },4295 text: false4296 }).click(function(){4297 var idAttach = $(this).parent().find('input[name="fileId[]"]').val();4298 fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]');4299 delAttachment(ID,idAttach);4300 $(this).parent().remove();4301 });4302 4305 4303 4306 }); -
trunk/expressoMail1_2/js/main.js
r5622 r5626 1689 1689 1690 1690 if (Element("attachments_" + border_ID)) 1691 { 1692 1693 var fileUploadMSG = $('#fileupload_msg'+new_border_ID); 1694 var attachments = document.getElementById("attachments_" + border_ID).getElementsByTagName("a"); 1695 for (var i = 0; i < attachments.length; i++){ 1696 if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1))) 1697 continue; 1698 1699 var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(','); 1700 var att = new Object(); 1701 var regex = new RegExp( "'", "g" ); 1702 att.folder = arrayAtt[0].replace(regex,""); 1703 att.uid = arrayAtt[1].replace(regex,""); 1704 att.part = arrayAtt[3].replace(regex,""); 1705 att.type = 'imapPart'; 1706 var idATT = JSON.stringify(att); 1707 addAttachment( new_border_ID , idATT); 1708 1709 var attach = {}; 1710 attach.fileName = arrayAtt[5].replace(regex,""); 1711 1712 if(attach.fileName.length > 10) 1713 attach.fileName = attach.fileName.substr(0, 18) + "..." + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 1714 1715 attach.fileSize = attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 1716 1717 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 1718 upload.find('.status-upload').remove(); 1719 upload.find('.in-progress').remove(); 1720 upload.find('p').append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 1721 fileUploadMSG.find('.attachments-list').append(upload); 1722 1723 } 1724 $('.attachments-list').find('.button.close').button({ 1725 icons: { 1726 primary: "ui-icon-close" 1727 }, 1728 text: false 1729 }).click(function(){ 1730 var idAttach = $(this).parent().find('input[name="fileId[]"]').val(); 1731 fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]'); 1732 delAttachment(new_border_ID,idAttach); 1733 $(this).parent().remove(); 1734 }); 1735 } 1691 addOriginalAttachments(new_border_ID,border_ID); 1736 1692 1737 1693 // Insert the signature automaticaly at message body if use_signature preference is set … … 1830 1786 1831 1787 if (Element("attachments_" + border_ID)) 1832 { 1833 1834 var fileUploadMSG = $('#fileupload_msg'+new_border_ID); 1835 var attachments = document.getElementById("attachments_" + border_ID).getElementsByTagName("a"); 1836 for (var i = 0; i < attachments.length; i++){ 1837 if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1))) 1838 continue; 1839 1840 var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(','); 1841 var att = new Object(); 1842 var regex = new RegExp( "'", "g" ); 1843 att.folder = arrayAtt[0].replace(regex,""); 1844 att.uid = arrayAtt[1].replace(regex,""); 1845 att.part = arrayAtt[3].replace(regex,""); 1846 att.type = 'imapPart'; 1847 var idATT = JSON.stringify(att); 1848 addAttachment( new_border_ID , idATT); 1849 1850 var attach = {}; 1851 attach.fileName = arrayAtt[5].replace(regex,""); 1852 1853 if(attach.fileName.length > 10) 1854 attach.fileName = attach.fileName.substr(0, 18) + "..." + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 1855 1856 attach.fileSize = attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 1857 1858 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 1859 upload.find('.status-upload').remove(); 1860 upload.find('.in-progress').remove(); 1861 upload.find('p').append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 1862 fileUploadMSG.find('.attachments-list').append(upload); 1863 1864 } 1865 $('.attachments-list').find('.button.close').button({ 1866 icons: { 1867 primary: "ui-icon-close" 1868 }, 1869 text: false 1870 }).click(function(){ 1871 var idAttach = $(this).parent().find('input[name="fileId[]"]').val(); 1872 fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]'); 1873 delAttachment(new_border_ID,idAttach); 1874 $(this).parent().remove(); 1875 }); 1876 } 1788 addOriginalAttachments(new_border_ID,border_ID); 1789 1877 1790 RichTextEditor.setInitData(new_border_ID, data.body, 'edit'); 1878 1791 … … 1936 1849 1937 1850 function useOriginalAttachments(new_border_ID,old_id_border) 1938 { 1851 { 1939 1852 if (Element("attachments_" + old_id_border)) 1940 1853 { 1941 var fileUploadMSG = $('#fileupload_msg'+new_border_ID); 1942 var attachments = document.getElementById("attachments_" + old_id_border).getElementsByTagName("a"); 1943 for (var i = 0; i < attachments.length; i++){ 1944 if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1))) 1945 continue; 1946 1947 var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(','); 1948 var att = new Object(); 1949 var regex = new RegExp( "'", "g" ); 1950 att.folder = arrayAtt[0].replace(regex,""); 1951 att.uid = arrayAtt[1].replace(regex,""); 1952 att.part = arrayAtt[3].replace(regex,""); 1953 att.type = 'imapPart'; 1954 var idATT = JSON.stringify(att); 1955 addAttachment( new_border_ID , idATT); 1956 1957 var attach = {}; 1958 attach.fileName = arrayAtt[5].replace(regex,""); 1959 1960 if(attach.fileName.length > 10) 1961 attach.fileName = attach.fileName.substr(0, 18) + "..." + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 1962 1963 attach.fileSize = attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 1964 1965 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 1966 upload.find('.status-upload').remove(); 1967 upload.find('.in-progress').remove(); 1968 upload.find('p').append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 1969 fileUploadMSG.find('.attachments-list').append(upload); 1970 1971 } 1972 $('.attachments-list').find('.button.close').button({ 1854 var fileUploadMSG = $('#fileupload_msg'+new_border_ID); 1855 var orignialAtt = fileUploadMSG.find('.fileupload-buttonbar').append(' <span tabindex="-1" class="message-add-original-att button small ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button"><span class="icon-plus ui-button-text">Anexar arquivos originais</span></span>'); 1856 var attachments = document.getElementById("attachments_" + old_id_border).getElementsByTagName("a"); 1857 1858 orignialAtt.find('.message-add-original-att').click(function(event ){ 1859 1860 for (var i = 0; i < attachments.length; i++){ 1861 if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1))) 1862 continue; 1863 1864 var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(','); 1865 var att = new Object(); 1866 var regex = new RegExp( "'", "g" ); 1867 att.folder = arrayAtt[0].replace(regex,""); 1868 att.uid = arrayAtt[1].replace(regex,""); 1869 att.part = arrayAtt[3].replace(regex,""); 1870 att.type = 'imapPart'; 1871 var idATT = JSON.stringify(att); 1872 addAttachment( new_border_ID , idATT); 1873 1874 var attach = {}; 1875 attach.fileName = attachments[i].text.substring(0, attachments[i].text.lastIndexOf('(')); 1876 1877 if(attach.fileName.length > 45) 1878 attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 1879 1880 attach.fileSize = attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 1881 1882 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 1883 upload.find('.status-upload').remove(); 1884 upload.find('.in-progress').remove(); 1885 upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 1886 upload.find('.button.close').button({ 1887 icons: { 1888 primary: "ui-icon-close" 1889 }, 1890 text: false 1891 1892 }).click(function(){ 1893 var idAttach = $(this).parent().find('input[name="fileId[]"]').val(); 1894 var content_body = RichTextEditor.getData('body_'+new_border_ID); 1895 var imagens = content_body.match(/<img[^>]*>/g); 1896 var att = JSON.parse(idAttach); 1897 if(imagens != null) 1898 { 1899 for (var x = 0; x < imagens.length; x++) 1900 if(imagens[x].indexOf('src="./inc/get_archive.php?msgFolder='+att.folder+'&msgNumber='+att.uid+'&indexPart='+att.part) !== -1) 1901 content_body = content_body.replace(imagens[x],''); 1902 1903 RichTextEditor.setData('body_'+new_border_ID,content_body); 1904 } 1905 1906 fileUploadMSG.find('.attachments-list').find('input[value="'+idAttach+'"]'); 1907 delAttachment(new_border_ID,idAttach); 1908 $(this).parent().remove(); 1909 }); 1910 1911 fileUploadMSG.find('.attachments-list').append(upload); 1912 1913 } 1914 1915 $(this).remove(); 1916 }); 1917 1918 } 1919 1920 } 1921 1922 function addOriginalAttachments(new_border_ID,old_id_border) 1923 { 1924 var fileUploadMSG = $('#fileupload_msg'+new_border_ID); 1925 var attachments = document.getElementById("attachments_" + old_id_border).getElementsByTagName("a"); 1926 for (var i = 0; i < attachments.length; i++){ 1927 if((attachments[i].tagName=="SPAN") || (attachments[i].tagName=="IMG") || ((attachments[i].href.indexOf("javascript:download_local_attachment")==-1)&&(attachments[i].href.indexOf("javascript:download_attachments")==-1))) 1928 continue; 1929 1930 var arrayAtt = attachments[i].href.replace("javascript:download_attachments(", "").replace(")", "").split(','); 1931 var att = new Object(); 1932 var regex = new RegExp( "'", "g" ); 1933 att.folder = arrayAtt[0].replace(regex,""); 1934 att.uid = arrayAtt[1].replace(regex,""); 1935 att.part = arrayAtt[3].replace(regex,""); 1936 att.type = 'imapPart'; 1937 var idATT = JSON.stringify(att); 1938 addAttachment( new_border_ID , idATT); 1939 1940 var attach = {}; 1941 attach.fileName = attachments[i].text.substring(0, attachments[i].text.lastIndexOf('(')); 1942 1943 if(attach.fileName.length > 45) 1944 attach.fileName = attach.fileName.substr(0, 32) + " ... " + attach.fileName.substr(attach.fileName.length-9, attach.fileName.length); 1945 1946 attach.fileSize = attachments[i].text.substring(( attachments[i].text.lastIndexOf('(')+1), attachments[i].text.lastIndexOf(')')); 1947 1948 var upload = $(DataLayer.render("../prototype/modules/mail/templates/attachment_add_itemlist.ejs", {file : attach})); 1949 upload.find('.status-upload').remove(); 1950 upload.find('.in-progress').remove(); 1951 upload.find('.button.close').button({ 1973 1952 icons: { 1974 1953 primary: "ui-icon-close" … … 1977 1956 }).click(function(){ 1978 1957 var idAttach = $(this).parent().find('input[name="fileId[]"]').val(); 1958 var content_body = RichTextEditor.getData('body_'+new_border_ID); 1959 var imagens = content_body.match(/<img[^>]*>/g); 1960 var att = JSON.parse(idAttach); 1961 if(imagens != null) 1962 { 1963 for (var x = 0; x < imagens.length; x++) 1964 if(imagens[x].indexOf('src="./inc/get_archive.php?msgFolder='+att.folder+'&msgNumber='+att.uid+'&indexPart='+att.part) !== -1) 1965 content_body = content_body.replace(imagens[x],''); 1966 1967 RichTextEditor.setData('body_'+new_border_ID,content_body); 1968 } 1969 1979 1970 fileUploadMSG.find(' .attachments-list').find('input[value="'+idAttach+'"]'); 1980 1971 delAttachment(new_border_ID,idAttach); 1981 1972 $(this).parent().remove(); 1982 1973 }); 1983 } 1984 1974 1975 1976 upload.append('<input type="hidden" name="fileId[]" value=\''+idATT+'\'/>'); 1977 fileUploadMSG.find('.attachments-list').append(upload); 1978 1979 } 1985 1980 } 1986 1981 … … 3235 3230 3236 3231 //$.ajax({ url: "../expressoCalendar/index.php", async: false}); 3237 $.ajax({ 3238 $.ajax({ 3232 $.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false}); 3233 $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false}); 3239 3234 //$.ajax({ url: "../prototype/modules/calendar/js/timezone.js", async: false}); 3240 3235 //$.ajax({ url: "../prototype/modules/calendar/js/calendar.codecs.js", async: false}); 3241 $.ajax({ 3242 $.ajax({ 3236 $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false}); 3237 $.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false}); 3243 3238 3244 3239 … … 3576 3571 3577 3572 }); 3573 3574 function formatBytes(bytes) { 3575 if (bytes >= 1000000000) { 3576 return (bytes / 1000000000).toFixed(2) + ' GB'; 3577 } 3578 if (bytes >= 1000000) { 3579 return (bytes / 1000000).toFixed(2) + ' MB'; 3580 } 3581 if (bytes >= 1000) { 3582 return (bytes / 1000).toFixed(2) + ' KB'; 3583 } 3584 return bytes + ' B'; 3585 }; -
trunk/expressoMail1_2/templates/default/expressomail.css
r5604 r5626 138 138 139 139 form.fileupload { margin: 14px 0 0 -13px; float: left; margin-bottom: -20px; } 140 form.fileupload .files-list { margin-left: 5px;} 140 form.fileupload .files-list { margin-left: 5px; margin-top: -14px; padding: 0.2em 0.7em; } 141 form.fileupload .files-list .delete-upload { top: 7px} 141 142 ul.attachments-list { padding: 0; } 142 143 .button-files-upload { float:left; } … … 144 145 form.fileupload .ui-button .ui-button-text { line-height: 2; } 145 146 form.fileupload .ui-button { margin-left: 5px; } 146 147 form.fileupload .message-add-original-att { margin-left: 0px; } 147 148 .button.add.button-add-attachment{margin: -9px 0 0 8px;} 148 149 .button.upload{margin-bottom: 4px;} … … 154 155 .row.fileupload-buttonbar{margin-top: -14px; padding: 0.2em 0.7em;} 155 156 156 .archive-attach.name{width: 200px;}157 .archive-attach.name{width: 310px;} 157 158 .archive-attach.name label{display: block; position: absolute; left: 136px; top: 194px;} 158 .size{min-width: 6 0px; max-width: 60px;}159 .size{min-width: 65px;} 159 160 160 161 .message-attach.name{width: 200px;} -
trunk/prototype/modules/mail/templates/attachment.ejs
r5604 r5626 11 11 12 12 <span tabindex="-1" class="message-attach-link button small ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button"><span class="icon-plus ui-button-text">Anexar mensagens</span></span> 13 <div id="fileupload-progress"></div> 13 </div> 14 14 15 <div class="files-list"> 15 16 <ul class="attachments-list"></ul> 16 17 </div> 17 </div> 18 <br> 18 <br /> 19 19 </form>
Note: See TracChangeset
for help on using the changeset viewer.