Ignore:
Timestamp:
09/17/12 14:30:47 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4

  • branches/2.4/expressoMail1_2/index.php

    r6754 r7228  
    2323        echo "<script src='js/modal/modal.js'></script>"; 
    2424        //jquery and Editor  
    25         echo '                   
     25        echo '  
    2626                <link rel="stylesheet" type="text/css" href="templates/default/main.css"></link> 
     27                 
    2728                <link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css"></link> 
     29                 
     30                <link rel="stylesheet" type="text/css" href="../prototype/plugins/jquery.spinner/jquery.spinner.css"></link> 
    2831                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link> 
    2932                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link> 
     
    3235                <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script> 
    3336                <link href="../prototype/modules/filters/filters.css" rel="stylesheet" type="text/css"> 
     37                 
    3438                <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script> 
    3539                <script src="../prototype/plugins/json2/json2.js" language="javascript"></script> 
     
    7276                <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script> 
    7377                <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> --> 
    74                  
     78 
    7579                <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script> 
    76         <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script> 
     80                <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script> 
    7781                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script> 
     82                <script type="text/javascript" src="../prototype/modules/calendar/js/desktop.notification.js"></script> 
    7883                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script> 
     84                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.alarms.js"></script> 
     85                <script type="text/javascript" src="../prototype/modules/calendar/js/helpers.js"></script> 
    7986                <link rel="stylesheet" type="text/css" href="../prototype/plugins/freeow/style/freeow/freeow.css" > 
    8087                <script type="text/javascript" src="../prototype/plugins/freeow/jquery.freeow.min.js"></script> 
     
    226233        $_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"; 
    227234        $_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; 
     235        $_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; 
    228236        //      ACL for block edit Personal Data. 
    229237        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['enable_quickadd_telephonenumber'] = $current_config['expressoMail_enable_quickadd_telephonenumber'] == 'true' ? $current_config['expressoMail_enable_quickadd_telephonenumber'] : ""; 
Note: See TracChangeset for help on using the changeset viewer.