Changeset 5690


Ignore:
Timestamp:
03/09/12 16:04:36 (12 years ago)
Author:
douglasz
Message:

Ticket #2486 - Correção de interface e erros de variaveis

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/index.php

    r5638 r5690  
    2727        echo "<script src='js/modal/modal.js'></script>"; 
    2828        //jquery and Editor  
    29                 echo '                           
    30                                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link> 
    31                                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link> 
    32                                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/icalendar/jquery.icalendar.css"></link> 
    33                          
    34                          
    35                                         <link rel="Stylesheet" type="text/css" href="templates/default/expressoMail_reset.css" /> 
    36                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script> 
    37  
    38                                         <script type="text/javascript">  
    39                                                 $.ajax({  
    40                                                                 url: "../expressoCalendar/index.php",  
    41                                                                 async: false});  
    42                                         </script>  
    43  
    44                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script> 
    45                                         <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.custom.min.js"></script> 
    46                                         <script src="../prototype/plugins/json2/json2.js" language="javascript"></script> 
    47                                         <script src="../prototype/plugins/ejs/ejs.js" language="javascript"></script> 
    48                                         <script src="../prototype/plugins/store/jquery.store.js" language="javascript"></script> 
    49                                         <script src="../prototype/plugins/farbtastic/farbtastic.js" language="javascript"></script> 
    50                                         <script src="../prototype/api/datalayer.js" language="javascript"></script>                                      
    51                                         <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 
    52                                         <script language="javascript">DataLayer.dispatchPath = "../prototype/";</script>                                         
    53                                         <script src="../library/ckeditor/ckeditor.js" language="javascript"></script>  
    54                                         <script src="../library/ckeditor/adapters/jquery.js" language="javascript"></script>  
    55                                         <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.css" />                                       
    56                                         <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.custom.css" /> 
    57                                         <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script> 
    58                                         <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 
    59                                         <link rel="Stylesheet" type="text/css" href="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.css" /> 
    60                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/contextmenu/jquery.contextMenu.css"></link> 
    61                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/zebradialog/css/zebra_dialog.css"></link> 
    62                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css"></link> 
    63                                          
    64                                         <link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" > 
    65                                         <script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script> 
    66                                         <script type="text/javascript" src="../prototype/plugins/datejs/date-pt-BR.js"></script> 
    67                                         <script type="text/javascript" src="../prototype/plugins/datejs/sugarpak.js"></script> 
    68                                         <script type="text/javascript" src="../prototype/plugins/datejs/parser.js"></script> 
    69  
    70                                         <script type="text/javascript" src="../prototype/plugins/watermark/jquery.watermarkinput.js"></script> 
    71                                         <script type="text/javascript" src="../prototype/plugins/mask/jquery.maskedinput.js"></script> 
    72                                         <script type="text/javascript" src="../prototype/plugins/alphanumeric/jquery.alphanumeric.js"></script> 
    73                                         <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 
    74                                         <script type="text/javascript" src="../prototype/plugins/jquery-elastic/jquery.elastic.source.js"></script> 
    75                                          
    76                                         <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script> 
    77                                         <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script> 
    78                                         <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.fileupload.js"></script> 
    79                                         <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script> 
    80                                         <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> --> 
    81                                          
    82                                         <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script> 
    83                                          
    84                                         <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script> 
    85  
    86                 <script src="js/rich_text_editor.js" type="text/javascript"></script> 
    87                 <script src="js/base64.js" type="text/javascript"></script>'; 
    88                 //---------------------------// 
     29        echo '                           
     30                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link> 
     31                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link> 
     32                <link rel="stylesheet" type="text/css" href="../prototype/plugins/icalendar/jquery.icalendar.css"></link> 
     33         
     34                <link rel="Stylesheet" type="text/css" href="templates/default/expressoMail_reset.css" /> 
     35                <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script> 
     36 
     37                <script type="text/javascript">  
     38                        $.ajax({  
     39                                        url: "../expressoCalendar/index.php",  
     40                                        async: false});  
     41                </script>  
     42 
     43                <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script> 
     44                <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.custom.min.js"></script> 
     45                <script src="../prototype/plugins/json2/json2.js" language="javascript"></script> 
     46                <script src="../prototype/plugins/ejs/ejs.js" language="javascript"></script> 
     47                <script src="../prototype/plugins/store/jquery.store.js" language="javascript"></script> 
     48                <script src="../prototype/plugins/farbtastic/farbtastic.js" language="javascript"></script> 
     49                <script src="../prototype/api/datalayer.js" language="javascript"></script>                                      
     50                <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 
     51                <script language="javascript">DataLayer.dispatchPath = "../prototype/";</script>                                         
     52                <script src="../library/ckeditor/ckeditor.js" language="javascript"></script>  
     53                <script src="../library/ckeditor/adapters/jquery.js" language="javascript"></script>  
     54                <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.css" />                                       
     55                <link rel="Stylesheet" type="text/css" href="../prototype/plugins/jquery/jquery-ui.custom.css" /> 
     56                <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script> 
     57                <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 
     58                <link rel="Stylesheet" type="text/css" href="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.css" /> 
     59                <link rel="stylesheet" type="text/css" href="../prototype/plugins/contextmenu/jquery.contextMenu.css"></link> 
     60                <link rel="stylesheet" type="text/css" href="../prototype/plugins/zebradialog/css/zebra_dialog.css"></link> 
     61                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css"></link> 
     62                 
     63                <link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" > 
     64                <script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script> 
     65                <script type="text/javascript" src="../prototype/plugins/datejs/date-pt-BR.js"></script> 
     66                <script type="text/javascript" src="../prototype/plugins/datejs/sugarpak.js"></script> 
     67                <script type="text/javascript" src="../prototype/plugins/datejs/parser.js"></script> 
     68 
     69                <script type="text/javascript" src="../prototype/plugins/watermark/jquery.watermarkinput.js"></script> 
     70                <script type="text/javascript" src="../prototype/plugins/mask/jquery.maskedinput.js"></script> 
     71                <script type="text/javascript" src="../prototype/plugins/alphanumeric/jquery.alphanumeric.js"></script> 
     72                <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 
     73                <script type="text/javascript" src="../prototype/plugins/jquery-elastic/jquery.elastic.source.js"></script> 
     74                 
     75                <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script> 
     76                <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.contextMenu.js"></script> 
     77                <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.fileupload.js"></script> 
     78                <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script> 
     79                <!-- <script type="text/javascript" src="../prototype/plugins/contextmenu/jquery.ui.position.js"></script> --> 
     80                 
     81                <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script> 
     82                 
     83                <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script> 
     84 
     85                <script src="js/rich_text_editor.js" type="text/javascript"></script> 
     86                <script src="js/base64.js" type="text/javascript"></script>'; 
     87        //---------------------------// 
    8988 
    9089        echo "<script src='js/globals.js?".$update_version."' type='text/javascript'></script>"; 
     
    9998                <script type="text/javascript" src="../phpgwapi/js/x_tools/xtools.js?'.$update_version.'"></script>';            
    10099 
    101         echo ' 
    102          
    103         <script type="text/javascript" src="../prototype/plugins/treeview/jquery.treeview.js"></script> 
    104         <script type="text/javascript" src="../prototype/plugins/treeview/lib/jquery.cookie.js"></script> 
    105         <script type="text/javascript" src="../prototype/plugins/block/jquery.blockUI.js"></script> 
    106         <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 
    107  
    108         <link rel="stylesheet" href="../prototype/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" /> 
    109          
    110         <script src="../prototype/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script> 
    111         <script src="../prototype/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script> 
    112         <script src="../prototype/modules/mail/js/foldertree.js" type="text/javascript"></script> 
    113         <link rel="stylesheet" href="../prototype/modules/mail/css/foldertree.css" type="text/css" media="screen" /> 
    114          
    115         <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" />   
    116         <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" />        
    117  
    118         <script src="../prototype/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script> 
    119         <script src="../prototype/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script>          
    120          
    121                  
    122         '; 
    123          
    124         echo '<script src="../prototype/modules/mail/js/label.js" type="text/javascript"></script>';     
    125         echo '<script src="../prototype/modules/mail/js/followupflag.js" type="text/javascript"></script>'; 
    126          
    127                  
    128         //followupflags 
    129         echo'<link rel="stylesheet" href="../prototype/modules/mail/css/followupflag.css" type="text/css" />'; 
     100        echo '   
     101                <script type="text/javascript" src="../prototype/plugins/treeview/jquery.treeview.js"></script> 
     102                <script type="text/javascript" src="../prototype/plugins/treeview/lib/jquery.cookie.js"></script> 
     103                <script type="text/javascript" src="../prototype/plugins/block/jquery.blockUI.js"></script> 
     104                <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 
     105 
     106                <link rel="stylesheet" href="../prototype/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" /> 
     107                 
     108                <script src="../prototype/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script> 
     109                <script src="../prototype/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script> 
     110                <script src="../prototype/modules/mail/js/foldertree.js" type="text/javascript"></script> 
     111                <link rel="stylesheet" href="../prototype/modules/mail/css/foldertree.css" type="text/css" media="screen" /> 
     112                 
     113                <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" />   
     114                <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" />        
     115 
     116                <script src="../prototype/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script> 
     117                <script src="../prototype/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script>          
     118                 
     119                <script src="../prototype/modules/mail/js/label.js" type="text/javascript"></script>     
     120                <script src="../prototype/modules/mail/js/followupflag.js" type="text/javascript"></script> 
     121                <link rel="stylesheet" href="../prototype/modules/mail/css/followupflag.css" type="text/css" /> 
     122                <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 
     123                <link rel="stylesheet" href="../prototype/modules/mail/css/label.css" type="text/css" />';       
    130124         
    131125        /* 
     
    177171    $current_config = $c->config_data;     
    178172 
    179         //Carrega Configuração global do expressoMail  
     173    //Carrega Configuração global do expressoMail  
    180174        $_SESSION['phpgw_info']['expresso']['expressoMail'] =  $current_config;  
    181175     
    182176        $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']); 
    183 //      $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 
     177        //$_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 
    184178        $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server']; 
    185179        $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null; 
     
    188182         
    189183        $preferences = $GLOBALS['phpgw']->preferences->read(); 
    190         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_firefox_windows'] = $current_config['expressoMail_gears_firefox_windows'] ? $current_config['expressoMail_gears_firefox_windows'] : ""; 
    191         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_firefox_linux'] = $current_config['expressoMail_gears_firefox_linux'] ? $current_config['expressoMail_gears_firefox_linux'] : ""; 
    192         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_ie'] = $current_config['expressoMail_gears_ie'] ? $current_config['expressoMail_gears_ie'] : ""; 
     184        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_firefox_windows'] = $current_config['expressoMail_gears_firefox_windows'] ? $current_config['expressoMail_gears_firefox_windows'] : ""; 
     185        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_firefox_linux'] = $current_config['expressoMail_gears_firefox_linux'] ? $current_config['expressoMail_gears_firefox_linux'] : ""; 
     186        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['gears_ie'] = $current_config['expressoMail_gears_ie'] ? $current_config['expressoMail_gears_ie'] : ""; 
    193187        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['enable_local_messages'];  
    194188        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['expressoMail']; 
     
    284278 
    285279        // Begin Set Hidden Copy options.  
    286                     $_SESSION['phpgw_info']['server']['expressomail']['allow_hidden_copy'] = $current_config['allow_hidden_copy'];  
    287                     echo '<script> var allow_hidden_copy = \''.$current_config['allow_hidden_copy'].'\' </script>';  
    288                     // End Set Hidden Copy options.  
     280        $_SESSION['phpgw_info']['server']['expressomail']['allow_hidden_copy'] = $current_config['allow_hidden_copy'];  
     281        echo '<script> var allow_hidden_copy = \''.$current_config['allow_hidden_copy'].'\' </script>';  
     282        // End Set Hidden Copy options.  
    289283         
    290284    // Set Imap Folder names options 
    291  
    292285    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : lang("Trash"); 
    293286    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : lang("Drafts"); 
     
    308301    } 
    309302 
    310     echo '<script> var special_folders = new Array(4); 
    311         special_folders[\'Trash\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"; 
    312     special_folders[\'Drafts\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 
    313     special_folders[\'Spam\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 
    314     special_folders[\'Sent\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 
    315     var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"; 
    316     var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 
    317     var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 
    318     var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 
    319     var token_param = "'.$var_tokens.'"; 
    320     var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'"; 
    321         var new_agenda = "'.$current_config['new_agenda'].'"; 
    322         $("#sideboxdragarea").addClass("hidden"); 
    323         $("#menu2Container").addClass("hidden"); 
     303    echo ' 
     304        <script> var special_folders = new Array(4); 
     305                special_folders[\'Trash\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"; 
     306                special_folders[\'Drafts\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 
     307                special_folders[\'Spam\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 
     308                special_folders[\'Sent\'] = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 
     309                var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"; 
     310                var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"; 
     311                var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"; 
     312                var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"; 
     313                var token_param = "'.$var_tokens.'"; 
     314                var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'"; 
     315                var new_agenda = "'.$current_config['new_agenda'].'"; 
     316                $("#sideboxdragarea").addClass("hidden"); 
     317                $("#menu2Container").addClass("hidden"); 
    324318    </script>'; 
    325319 
     
    330324        $obj = createobject("expressoMail1_2.functions"); 
    331325 
    332         // setting timezone preference 
    333         $zones = $obj->getTimezones(); 
    334         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] : sprintf("%s", array_search("America/Sao_Paulo", $zones)); 
     326        // setting timezone preference 
     327        $zones = $obj->getTimezones(); 
     328        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] : sprintf("%s", array_search("America/Sao_Paulo", $zones)); 
    335329 
    336330        // este arquivo deve ser carregado antes que 
     
    359353        echo $obj -> getFilesJs($scripts, $update_version); 
    360354        echo ' 
    361         <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 
    362          
    363                                         <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 
    364                                         <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script> 
    365                                         <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 
    366         <script type="text/javascript"> 
    367                 init(); 
    368         </script>'; 
     355                <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" />  
     356                <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 
     357                <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script> 
     358                <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 
     359                <script type="text/javascript"> 
     360                        init(); 
     361                </script>'; 
    369362 
    370363        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts']) 
     
    385378<html> 
    386379<head> 
    387 <title>ExpressoMail</title> 
     380        <title>ExpressoMail</title> 
    388381</head> 
    389382<body scroll="no" style="overflow:hidden" class="expressomail-module-container"> 
    390 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" /> 
    391 <link rel="stylesheet" href="../prototype/modules/mail/css/label.css" type="text/css" />         
    392 <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/layout.css' /> 
    393 <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/style.css' /> 
    394 <link rel='stylesheet' type='text/css' href='../prototype/plugins/fileupload/jquery.fileupload-ui.css' /> 
    395 <script src="../prototype/plugins/fileupload/jquery.fileupload.js"></script> 
    396 <script src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script> 
     383        <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/layout.css' /> 
     384        <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/style.css' /> 
     385        <link rel='stylesheet' type='text/css' href='../prototype/plugins/fileupload/jquery.fileupload-ui.css' /> 
     386        <script src="../prototype/plugins/fileupload/jquery.fileupload.js"></script> 
     387        <script src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script> 
    397388</body> 
    398389</html> 
  • trunk/prototype/modules/mail/css/label.css

    r5603 r5690  
    9393        font-size:11px; 
    9494        color:#000000;  
     95        cursor:pointer; 
     96} 
     97#MyMarckersList.list-label .title-my-labels:hover { 
     98        color:red !important; 
     99        text-decoration: none !important; 
    95100} 
    96101#MyMarckersList.list-label .status-list-labels{display:inline-block; position: absolute;} 
  • trunk/prototype/modules/mail/js/label.js

    r5677 r5690  
    6060} 
    6161 
    62 function rgb2hex(rgb){ 
    63  rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/); 
    64  return "#" + 
    65   ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) + 
    66   ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) + 
    67   ("0" + parseInt(rgb[3],10).toString(16)).slice(-2); 
     62function rgb2hex(rgb){   
     63        if(!!(rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/))){ 
     64                return "#" + 
     65                ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) + 
     66                ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) + 
     67                ("0" + parseInt(rgb[3],10).toString(16)).slice(-2); 
     68        }else{ 
     69                return rgb; 
     70        } 
    6871} 
    6972 
Note: See TracChangeset for help on using the changeset viewer.