Changeset 5615 for trunk/expressoMail1_2/index.php

Timestamp:

03/02/12 19:52:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Remocao do importe de arquivos da agenda na inicializacao do modulo expressoMail e correcoes de bugs

File:

• trunk/expressoMail1_2/index.php (modified) (5 diffs)

trunk/expressoMail1_2/index.php

@@ -30 +30 @@
                                         <link rel="Stylesheet" type="text/css" href="templates/default/expressoMail_reset.css" />
                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script>
-                                        
-                                        <script type="text/javascript">
-                                                $.ajax({
-                                                        url: "../expressoCalendar/index.php",
-                                                        async: false});
-                                        
-                                        </script>
-                                        
-                                        
+
                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.custom.min.js"></script>
@@ -63 +55 @@
                                         <script type="text/javascript" src="../prototype/plugins/datejs/sugarpak.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/datejs/parser.js"></script>
-                                        <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script>
+
                                         <script type="text/javascript" src="../prototype/plugins/watermark/jquery.watermarkinput.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/mask/jquery.maskedinput.js"></script>
@@ -69 +61 @@
                                         <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/jquery-elastic/jquery.elastic.source.js"></script>
-                                        <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script>
-                                        <script type="text/javascript" src="../prototype/modules/calendar/js/helpers.js"></script>
-                                        <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script>
-                                        <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script>
-                                        <script type="text/javascript" src="../prototype/plugins/encoder/encoder.js"></script>
+                                        
                                         <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script>
@@ -79 +67 @@
                                         <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script>
                                         <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> -->
-                                        <script language="javascript">var CalendarBkp = Calendar;</script>
+                                        
                 <script src="js/rich_text_editor.js" type="text/javascript"></script>
                 <script src="js/base64.js" type="text/javascript"></script>';
@@ -94 +82 @@
         echo '<script type="text/javascript" src="../phpgwapi/js/wz_dragdrop/wz_dragdrop.js?'.$update_version.'"></script>
                 <script type="text/javascript" src="../phpgwapi/js/dJSWin/dJSWin.js?'.$update_version.'"></script>
-                <script type="text/javascript" src="../phpgwapi/js/x_tools/xtools.js?'.$update_version.'"></script>';
-        echo "<script language='javascript'>Calendar = $.extend(CalendarBkp, Calendar);</script>";
-                
+                <script type="text/javascript" src="../phpgwapi/js/x_tools/xtools.js?'.$update_version.'"></script>';           
 
         echo '