Changeset 7228 for branches/2.4/expressoMail1_2/index.php

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/index.php (modified) (4 diffs)

branches/2.4/expressoMail1_2/index.php

@@ -23 +23 @@
         echo "<script src='js/modal/modal.js'></script>";
         //jquery and Editor 
-        echo '                  
+        echo ' 
                 <link rel="stylesheet" type="text/css" href="templates/default/main.css"></link>
+                
                 <link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css"></link>
+                
+                <link rel="stylesheet" type="text/css" href="../prototype/plugins/jquery.spinner/jquery.spinner.css"></link>
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link>
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link>
@@ -32 +35 @@
                 <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script>
                 <link href="../prototype/modules/filters/filters.css" rel="stylesheet" type="text/css">
+                
                 <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script>
                 <script src="../prototype/plugins/json2/json2.js" language="javascript"></script>
@@ -72 +76 @@
                 <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script>
                 <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> -->
-                
+
                 <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script>
-        <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script>
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script>
+                <script type="text/javascript" src="../prototype/modules/calendar/js/desktop.notification.js"></script>
                 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script>
+                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.alarms.js"></script>
+                <script type="text/javascript" src="../prototype/modules/calendar/js/helpers.js"></script>
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" >
                 <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script>
@@ -226 +233 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['return_recipient_deafault'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] : 1;
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['confirm_read_message'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['confirm_read_message'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['confirm_read_message'] : 0;
         //      ACL for block edit Personal Data.
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['enable_quickadd_telephonenumber'] = $current_config['expressoMail_enable_quickadd_telephonenumber'] == 'true' ? $current_config['expressoMail_enable_quickadd_telephonenumber'] : "";