Changeset 59

Timestamp:

08/21/07 13:58:17 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• expressoMail1_2/js/draw_api.js (modified) (6 diffs)
• expressoMail1_2/js/main.js (modified) (3 diffs)
• expressoMail1_2/js/preferences.js (modified) (1 diff)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (previous)
• instant_messenger/inc/im_acl.inc.php (modified) (1 diff)
• instant_messenger/js/im_preferences.js (modified) (3 diffs)
• instant_messenger/js/im_templates.js (modified) (1 diff)
• instant_messenger/js/im_win.js (modified) (2 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -388 +388 @@
         var defaultHeight = screenHeight - offset;              
         _divScroll.style.height         = defaultHeight - 110;
+        Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150);
         // Fim: Redimensiona DIV SCROLL
         _divScroll.appendChild(table_element);
@@ -404 +405 @@
         tdFolders.style.display = preferences.hide_folders == '1'  ? "none" : "";
         alternate_border(0);
-        //resizeWindow();       
         draw_footer_box(headers_msgs.num_msgs); 
         Element('main_table').style.display = '';
@@ -660 +660 @@
 function draw_message(info_msg, ID){
         var content = document.getElementById('content_id_' + ID);
-        var defaultWidth = document.body.clientWidth - (is_ie ? 35 : 40);
+        var defaultWidth = document.body.clientWidth - (is_ie ? 32 : 37);
         
         var menuHidden = Element("folderscol").style.display == 'none' ? true : false;
@@ -751 +751 @@
                 }
         };
+
         option_hide_more.innerHTML = get_lang('Options');
         options.appendChild(option_hide_more);
@@ -1068 +1069 @@
                 tbody_message_others_options.appendChild(tr6);
         }
+
 
         // BEGIN MAKE THE SCROLL HEIGHT
@@ -2107 +2109 @@
                 span_options.style.fontSize = "12";
                 span_options.id = "span_options";
-                span_options.innerHTML = 
+                span_R.appendChild(span_options);
+        }
+        span_options.innerHTML = 
                 '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+
                 '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span> | '+
                 '<span title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span> | '+
                 '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span>';
-                span_R.appendChild(span_options);
-        }       
+        
         var span_D = Element("span_D"); 
         if(!span_D){

trunk/expressoMail1_2/js/main.js

@@ -17 +17 @@
 
                 ConstructMenuTools();
-                resizeWindow();
                 cExecute ("$this.imap_functions.get_folders_list", update_menu);
         }
@@ -54 +53 @@
                 // Call function to draw message
                 var id_msg_read = msg_info.msg_number +"_r";
+                // If needed, delete old border
+                if (msg_info.reuse_border)
+                        delete_border(msg_info.reuse_border,'false');
+
                 
                 if(Element("border_id_" + id_msg_read)) 
@@ -67 +70 @@
                 //Change the tr color to read.
                 set_msg_class_to_read(msg_info['msg_number'], true);
-
-                // If needed, delete old border
-                if (msg_info.reuse_border)
-                        delete_border(msg_info.reuse_border,'false');
                 
                 if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){

trunk/expressoMail1_2/js/preferences.js

@@ -48 +48 @@
                                 "<td><input type='checkBox' id='check_show_previous' name='check_show_previous'></td>"+
                                 "</tr>"+
-                                "<tr><td nowrap> - " + get_lang('Do you want receive an alert for new messages?') + "</td>"+
+                                "<tr><td nowrap> - " + get_lang('Do you want to receive an alert for new messages?') + "</td>"+
                                 "<td><input type='checkBox' id='check_alert' name='check_alert'></td>"+
                                 "</tr>"+
-                                "<tr><td nowrap> - " + get_lang('Show ExpressoMail summary at main screen?') + "</td>"+
+                                "<tr><td nowrap> - " + get_lang('Show default view on main screen') + "</td>"+
                                 "<td><input type='checkBox' id='check_view' name='check_view'></td>"+
                                 "</tr>"+

trunk/instant_messenger/inc/im_acl.inc.php

@@ -19 +19 @@
          $_port = PORT_NON_SECURITY;
 
-                        //$SERVER = $_SERVER['SERVER_NAME'];
                         $SERVER = "127.0.0.1";
 
+                        $fp  = "";
                         @$fp = stream_socket_client($_transport . "://" . $SERVER . ":" . $_port, $errno, $errstr, 10);
 

trunk/instant_messenger/js/im_preferences.js

@@ -37 +37 @@
                         select_org[0].selected = true;
                 }
-                XMLTools.request('$this.ldap_im.list_organizations_ldap','POST',handler_organizations);
+                XMLTools.request('$this.ldap_im.list_organizations_ldap','GET',handler_organizations);
         }
         
@@ -277 +277 @@
    {
                 var div_child = document.getElementById(pJid);
-                var name  = div_child.innerHTML.substr((div_child.innerHTML.indexOf('>') + 1 ),div_child.innerHTML.length);
                 var group = div_child.parentNode.id;
-                
+                var name  = div_child.firstChild;
+                        name = name.nextSibling.nodeValue;
+
                 if(pType)
                 {
@@ -471 +472 @@
                                 IM.im_time_ = this.LoadPreferences('ch_offline');
                         }
-                        XMLTools.request('$this.db_im.get_preferences','POST',handler_getPreferences);
+                        XMLTools.request('$this.db_im.get_preferences','GET',handler_getPreferences);
                 }
         }

trunk/instant_messenger/js/im_templates.js

@@ -45 +45 @@
                                                   '</adduser>';
                 
-                _this.conf_form("divAddUser",515,285,parse_XmlXsl(_XmlAddUser,'add_user.xsl'),":: " + IM.get_lang('Add New Contact') + " - Expresso ::");
+                _this.conf_form("divAddUser",525,295,parse_XmlXsl(_XmlAddUser,'add_user.xsl'),":: " + IM.get_lang('Add New Contact') + " - Expresso ::");
         }
         

trunk/instant_messenger/js/im_win.js

@@ -351 +351 @@
             if ( newH < 100) newH = 100;
             dd.elements[objName + "_im_window_fantom"].resizeTo(newW, newH);
+
+                if( document.getElementById(objName + "_chatMessages"))
+                {
+                                func.confEl(document.getElementById(objName + "_chatMessages"),"style","width:" + (newW - 105) +";height:" + (newH - 150) +";margin: 2px 0px 2px 2px; overflow:auto;");
+                                func.confEl(document.getElementById(objName + '_edita'),"style","width:" + (newW - 105) + ";height: 50px;margin: 3px 1px 0px 2px;float: left;");
+                        }
+
             dd.elements[objName + "_im_window_resize"].moveTo(dd.elements[objName + "_im_window_fantom"].x+dd.elements[objName + "_im_window_fantom"].w-dd.elements[objName + "_im_window_resize"].w-2, dd.elements[objName + "_im_window_fantom"].y+dd.elements[objName + "_im_window_fantom"].h-dd.elements[objName + "_im_window_resize"].h-2);
             var windowItem = windowItems[objName];
@@ -629 +636 @@
       {
          text = '';
-         text += '<div class="border" id="' + pId + '_chatMessages" style="width:220px; height:130px; margin: 2px 0px 2px 2px; overflow:auto;"></div>'
+         text += '<div class="border" id="' + pId + '_chatMessages" style="width:220px; height:130px; margin: 2px 0px 2px 2px; overflow:auto;"></div>';
          text += '<div style="float: left; position: relative; height:130px;">';
-         text += '   <div class="myAvatar">'
-         text += '      <img id="' + pId + '_avatar" alt="Display Picture" title="Display Picture" src="' + im_path + 'templates/default/images/photo.png" width="49" height="65" border="0" />'
-         text += '   </div>'
+         text += '   <div class="myAvatar">';
+         text += '      <img id="' + pId + '_avatar" alt="Display Picture" title="Display Picture" src="' + im_path + 'templates/default/images/photo.png" width="49" height="65" border="0" />';
+         text += '   </div>';
          text += '   <div id="' + pId + '_composing" class="composing"><img src="' + img_typing.src + '" /></div>';
          text += '</div>';
-         text += '<br style="clear:both;"/>'
-         text += '<dl>'
-         text += '   <dd class="small">'
-         text += '      &nbsp;<span id="selectEmotionsDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showEmotionSelection(\'' + pId + '\');" title="Select Imotions here!"><img src="' + im_path + 'templates/default/images/img/1.gif" width="15" height="15" alt="Select Imotions here!" style="vertical-align:  text-top;" /></span>'
-         text += '   </dd>'
-         text += '   <dd class="small">|</dd>'
-         text += '   <dd class="small">'
-         text += '      <span id="selectFontNameDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontNameSelection(\'' + pId + '\');" title="Select Font Name here!" style="height:19px;">'+IM.get_lang('Font')+'</span>'
-         text += '   </dd>'
-         text += '   <dd class="small">|</dd>'
-         text += '   <dd class="small">'
-         text += '      <span id="selectFontSizeDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontSizeSelection(\'' + pId + '\')" title="Select Font Size here!" style="height:19px;">'+IM.get_lang('Size')+'</span>'
-         text += '   </dd>'
-         text += '   <dd class="small">|</dd>'
-         text += '   <dd class="small">'
-         text += '      <span id="selectFontColorDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontColorSelection(\'' + pId + '\')" title="Select Font Color here!" style="height:19px;">'+IM.get_lang('Color')+'</span>'
-         text += '   </dd>'
-         text += '   <dd class="small">|</dd>'
-         text += '   <dd class="small">'
-         text += '      <span id="selectFontStyleDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontStyleSelection(\'' + pId + '\')" title="Select Font Color here!" style="height:19px;">'+IM.get_lang('Style')+'</span>'
-         text += '   </dd>'
-         text += '</dl>'
-         text += '<div id="' + pId + '_divEdita" style="margin: 0px 2px"><iframe name="' + pId.replace('@', '_at_').replace(/\./g, '_dot_') + '_edita" class="edit_message" id="' + pId + '_edita" frameborder="0" style="margin: 3px 1px 0px 2px; width:220px; height:50px; float:left;"></iframe></div>'
+         text += '<br style="clear:both;"/>';
+         text += '<dl>';
+         text += '   <dd class="small">';
+         text += '      &nbsp;<span id="selectEmotionsDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showEmotionSelection(\'' + pId + '\');" title="Select Imotions here!"><img src="' + im_path + 'templates/default/images/img/1.gif" width="15" height="15" alt="Select Imotions here!" style="vertical-align:  text-top;" /></span>';
+         text += '   </dd>';
+         text += '   <dd class="small">|</dd>';
+         text += '   <dd class="small">';
+         text += '      <span id="selectFontNameDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontNameSelection(\'' + pId + '\');" title="Select Font Name here!" style="height:19px;">'+IM.get_lang('Font')+'</span>';
+         text += '   </dd>';
+         text += '   <dd class="small">|</dd>';
+         text += '   <dd class="small">';
+         text += '      <span id="selectFontSizeDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontSizeSelection(\'' + pId + '\')" title="Select Font Size here!" style="height:19px;">'+IM.get_lang('Size')+'</span>';
+         text += '   </dd>';
+         text += '   <dd class="small">|</dd>';
+         text += '   <dd class="small">';
+         text += '      <span id="selectFontColorDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontColorSelection(\'' + pId + '\')" title="Select Font Color here!" style="height:19px;">'+IM.get_lang('Color')+'</span>';
+         text += '   </dd>';
+         text += '   <dd class="small">|</dd>';
+         text += '   <dd class="small">';
+         text += '      <span id="selectFontStyleDiv" class="des-small" onmouseover="selectDiv(this)" onmouseout="unselectDiv(this)" onclick="im_win.showFontStyleSelection(\'' + pId + '\')" title="Select Font Color here!" style="height:19px;">'+IM.get_lang('Style')+'</span>';
+         text += '   </dd>';
+         text += '</dl>';
+         text += '<div id="' + pId + '_divEdita" style="margin: 0px 2px"><iframe name="' + pId.replace('@', '_at_').replace(/\./g, '_dot_') + '_edita" class="edit_message" id="' + pId + '_edita" frameborder="0" style="margin: 3px 1px 0px 2px; width:220px; height:50px; float:left;"></iframe></div>';
          text += '<br/><a onclick="javascript:IM.sendMessage(\'' + pId + '\')" title="Send a message" style="float:left;margin: 0px 2px;"><img src="' + im_path + 'templates/default/images/img/skins/deathdart/send.gif" width="50" height="25" border=0 style="margin-top:3px"></a>';
          text += '<br style="clear:both" /><span id="' + pId + '_im_window_message" style="margin-left: 2px" />';