Changeset 7751
- Timestamp:
- 01/15/13 10:52:32 (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r7724 r7751 58 58 <script type="text/javascript" src="../prototype/plugins/mask/jquery.maskedinput.js"></script> 59 59 <script type="text/javascript" src="../prototype/plugins/lazy/jquery.lazy.js"></script> 60 '; 60 <script type="text/javascript" src="../prototype/plugins/jquery.autoscroll/jquery.aautoscroll.min.2.41.js"></script> 61 '; 61 62 62 63 echo "<script src='js/globals.js?".$update_version."' type='text/javascript'></script>"; -
trunk/expressoMail1_2/js/abas.js
r7746 r7751 281 281 $(td).draggable({ 282 282 start : function(){ 283 $('.upper, .lower').show(); 284 $(".lower").css("top", ($("#content_folders").height()-18) + $("#content_folders").offset().top); 283 285 if($(".shared-folders").length){ 284 286 $(".shared-folders").parent().find('.folder:not(".shared-folders")').droppable({ … … 296 298 297 299 } 298 $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});300 //$("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400}); 299 301 }, 300 302 out : function(){ … … 325 327 }, 326 328 stop :function(){ 329 $('.upper, .lower').hide(); 327 330 $(".shared-folders").parent().find(".folder").droppable("destroy"); 328 331 }, -
trunk/expressoMail1_2/js/draw_api.js
r7745 r7751 1642 1642 $(tr_element).draggable({ 1643 1643 start : function(){ 1644 $('.upper, .lower').show(); 1645 $(".lower").css("top", ($("#content_folders").height()-18) + $("#content_folders").offset().top); 1644 1646 if($(".shared-folders").length){ 1645 1647 $(".shared-folders").parent().find('.folder:not(".shared-folders")').droppable({ … … 1657 1659 1658 1660 } 1659 $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});1660 1661 }, 1661 1662 out : function(){ … … 1685 1686 }, 1686 1687 stop :function(){ 1688 $('.upper, .lower').hide(); 1687 1689 $(".shared-folders").parent().find(".folder").droppable("destroy"); 1688 1690 }, -
trunk/expressoMail1_2/js/main.js
r7749 r7751 807 807 $(new_msg).draggable({ 808 808 start : function(){ 809 $('.upper, .lower').show(); 810 $(".lower").css("top", ($("#content_folders").height()-18) + $("#content_folders").offset().top); 809 811 if($(".shared-folders").length){ 810 812 $(".shared-folders").parent().find('.folder:not(".shared-folders")').droppable({ … … 822 824 823 825 } 824 $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});825 826 }, 826 827 out : function(){ … … 850 851 }, 851 852 stop :function(){ 853 $('.upper, .lower').hide(); 852 854 $(".shared-folders").parent().find(".folder").droppable("destroy"); 853 855 }, -
trunk/expressoMail1_2/js/search.js
r7727 r7751 823 823 $(tr).draggable({ 824 824 start : function(){ 825 $('.upper, .lower').show(); 826 $(".lower").css("top", ($("#content_folders").height()-18) + $("#content_folders").offset().top); 825 827 if($(".shared-folders").length){ 826 828 $(".shared-folders").parent().find('.folder:not(".shared-folders")').droppable({ 827 829 over : function(a, b){ 828 830 //SETA BORDA EM VOLTA DA PASTA 829 $(this).css("border", "1px solid black"); 831 over = $(this); 832 $(this).addClass("folder-over"); 833 if(($(this)[0] != $(this).parent().find(".head_folder")[0])) 834 if($(this).prev()[0]) 835 if($(this).parent().find(".expandable-hitarea")[0] == $(this).prev()[0]){ 836 setTimeout(function(){ 837 if(over.hasClass("folder-over")) 838 over.prev().trigger("click"); 839 }, 500); 840 841 } 830 842 }, 831 843 out : function(){ 832 844 //RETIRA BORDA EM VOLTA DA PASTA 833 $(this). css("border", "");845 $(this).removeClass("folder-over"); 834 846 }, 835 847 //accept: ".draggin_mail", … … 855 867 }, 856 868 stop :function(){ 869 $('.upper, .lower').hide(); 857 870 $(".shared-folders").parent().find(".folder").droppable("destroy"); 858 871 }, -
trunk/expressoMail1_2/templates/default/main.css
r7743 r7751 1627 1627 background-repeat : no-repeat; 1628 1628 } 1629 1630 .upper, .lower { 1631 background-color: gray; 1632 opacity:0.1; 1633 filter:alpha(opacity=30); 1634 height: 16px; 1635 position: fixed; 1636 width: 230px; 1637 display: none; 1638 } 1639 1640 .lower { 1641 top: 585px; 1642 } -
trunk/prototype/modules/mail/js/foldertree.js
r7745 r7751 238 238 search_emails("UNDELETED KEYWORD \"$Followupflagged\""); 239 239 }).end().end(); 240 240 241 $('.upper').droppable({ 242 over: function(event, ui){ 243 $('#content_folders').autoscroll({ 244 direction: 'up', 245 step: 150, 246 scroll: true 247 }); 248 }, 249 out: function(event, ui){ 250 $('#content_folders').autoscroll('destroy'); 251 } 252 }); 253 254 $('.lower').droppable({ 255 over: function(event, ui){ 256 $('#content_folders').autoscroll({ 257 direction: 'down', 258 step: 150, 259 scroll: true 260 }); 261 }, 262 out: function(event, ui){ 263 $('#content_folders').autoscroll('destroy'); 264 } 265 }); 266 267 268 241 269 folders_html.find('[id="'+selected+'"]').children().addClass("selected"); 242 270 $(".folder").not(".head_folder").not(".shared-folders").not(".shared-folders + ul .folder").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({ … … 244 272 start : function(){ 245 273 $(this).css("color", "gray"); 274 $('.upper, .lower').show(); 275 $(".lower").css("top", ($("#content_folders").height()-18) + $("#content_folders").offset().top); 246 276 }, 247 277 stop : function(){ 248 278 $(this).css("color", ""); 279 $('.upper, .lower').hide(); 249 280 }, 250 281 revert: "invalid", … … 275 306 over.prev().trigger("click"); 276 307 } 277 }, 1000);308 }, 500); 278 309 279 310 } 280 311 //FIM : SE A PASTA CONTER FILHAS EXPANDE 281 $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});312 //$("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400}); 282 313 //SETA BORDA EM VOLTA DA PASTA 283 314 // -
trunk/prototype/modules/mail/templates/detailedfoldertree.ejs
r7456 r7751 43 43 } 44 44 %> 45 <ul class="filetree foldertree-skin-prognus mainfoldertree"> 46 <li><span class="folder head_folder">Minhas Pastas</span> 47 <% recursive_forest(data.folders[0]); %> 48 </li> 49 <% if(data.folders[1].length > 0) { %> 50 <li><span class="folder shared-folders">Pastas compartilhadas</span> 51 <% recursive_forest(data.folders[1]); %> 52 </li> 53 <%}%> 54 <% if(preferences.use_local_messages == 1) { %> 55 <% if(expresso_mail_archive.enabled && data.folders[2].length > 0) { /*MailArchive ativado*/ %> 56 <li> 57 <span class="folder local-folder head_folder" style="display: inline;">Pastas locais</span> 58 <% recursive_forest(data.folders[2]); %> 59 </li> 60 <%} else { /*MailArchive desativado*/ %> 61 <li> 62 <span class="folder local-folder head_folder" style="display: inline;" title="MailArchive Desconectado">Pastas locais</span> 63 <span class="local-connect" onclick="services_retry();" title="Conectar ao MailArchive"></span> 64 </li> 65 <%}%> 45 <div class="upper"></div> 46 <ul class="filetree foldertree-skin-prognus mainfoldertree"> 47 <li><span class="folder head_folder">Minhas Pastas</span> 48 <% recursive_forest(data.folders[0]); %> 49 </li> 50 <% if(data.folders[1].length > 0) { %> 51 <li><span class="folder shared-folders">Pastas compartilhadas</span> 52 <% recursive_forest(data.folders[1]); %> 53 </li> 54 <%}%> 55 <% if(preferences.use_local_messages == 1) { %> 56 <% if(expresso_mail_archive.enabled && data.folders[2].length > 0) { /*MailArchive ativado*/ %> 57 <li> 58 <span class="folder local-folder head_folder" style="display: inline;">Pastas locais</span> 59 <% recursive_forest(data.folders[2]); %> 60 </li> 61 <%} else { /*MailArchive desativado*/ %> 62 <li> 63 <span class="folder local-folder head_folder" style="display: inline;" title="MailArchive Desconectado">Pastas locais</span> 64 <span class="local-connect" onclick="services_retry();" title="Conectar ao MailArchive"></span> 65 </li> 66 <%}%> 66 67 67 <%}%> 68 <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span> 69 </li> 70 </ul> 68 <%}%> 69 <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span> 70 </li> 71 </ul> 72 <div class="lower"></div>
Note: See TracChangeset
for help on using the changeset viewer.