[Phpfreechat-svn] SF.net SVN: phpfreechat: [564] trunk/src
Status: Beta
Brought to you by:
kerphi
Menu
▾
▴
[Phpfreechat-svn] SF.net SVN: phpfreechat: [564] trunk/src
|
From: <ke...@us...> - 2006-06-12 15:38:41
|
Revision: 564 Author: kerphi Date: 2006-06-12 08:38:25 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/phpfreechat/?rev=564&view=rev Log Message: ----------- - remove useless ie7 script - fix problem with smiley box display - first step for IE6 display problems (chat area and nickname list are sometime hidden) Modified Paths: -------------- trunk/src/pfcglobalconfig.class.php trunk/src/phpfreechat.class.php trunk/themes/default/templates/chat.js.tpl.php trunk/themes/default/templates/pfcgui.js.tpl.php trunk/themes/default/templates/style.css.tpl.php Removed Paths: ------------- trunk/lib/IE7_0_9/ Modified: trunk/src/pfcglobalconfig.class.php =================================================================== --- trunk/src/pfcglobalconfig.class.php 2006-06-11 21:23:50 UTC (rev 563) +++ trunk/src/pfcglobalconfig.class.php 2006-06-12 15:38:25 UTC (rev 564) @@ -79,8 +79,6 @@ var $client_script_url = ""; // default is calculated from 'client_script_path' var $server_script_path = ""; var $server_script_url = ""; // default is calculated from 'server_script_path' - var $useie7 = true; // use IE7 lib : fix crappy IE display bugs - var $ie7path = ""; // default is dirname(__FILE__)."/../lib/IE7_0_9"; var $xajaxpath = ""; // default is dirname(__FILE__)."/../lib/xajax_0.2.3"; var $jspath = ""; // default is dirname(__FILE__)."/../lib/javascript"; var $usecsstidy = false; @@ -182,7 +180,6 @@ if ($this->debug) pxlog("pfcGlobalConfig::init()", "chatconfig", $this->getId()); if ($this->title == "") $this->title = _pfc("My Chat"); - if ($this->ie7path == "") $this->ie7path = dirname(__FILE__)."/../lib/IE7_0_9"; if ($this->xajaxpath == "") $this->xajaxpath = dirname(__FILE__)."/../lib/xajax_0.2.3"; if ($this->jspath == "") $this->jspath = dirname(__FILE__)."/../lib/javascript"; if ($this->csstidypath == "") $this->csstidypath = dirname(__FILE__)."/../lib/csstidy-1.1"; @@ -224,15 +221,6 @@ $this->errors = array_merge($this->errors, @install_file($this->xajaxpath."/xajax_js/xajax_uncompressed.js", $this->data_public_path."/xajax_js/xajax_uncompressed.js" )); // --- - // test ie7 lib - $dir = $this->ie7path; - if (!is_dir($dir)) - $this->errors[] = _pfc("%s doesn't exist, %s library can't be found", $dir, "IE7"); - if (!file_exists($dir."/ie7-core.js")) - $this->errors[] = _pfc("%s not found, %s library can't be found", "ie7-core.js", "IE7"); - $this->errors = array_merge($this->errors, @install_dir($this->ie7path, $this->data_public_path."/ie7/")); - - // --- // test client script // try to find the path into server configuration if ($this->client_script_path == "") Modified: trunk/src/phpfreechat.class.php =================================================================== --- trunk/src/phpfreechat.class.php 2006-06-11 21:23:50 UTC (rev 563) +++ trunk/src/phpfreechat.class.php 2006-06-12 15:38:25 UTC (rev 564) @@ -111,17 +111,6 @@ // print xajax javascript $output .= $this->xajax->getJavascript($c->data_public_url, NULL, $c->data_public_url."/xajax_js/xajax.js"); - // include microsoft IE6 patches - if ($c->useie7) - { - $ie7_path = $c->data_public_url."/ie7"; - $output .= "<!-- compliance patch for microsoft browsers -->\n"; - $output .= "<!--[if lt IE 7]>\n"; - $output .= " <script type=\"text/javascript\">IE7_PNG_SUFFIX = \".png\";</script>\n"; - $output .= " <script type=\"text/javascript\" src=\"".$ie7_path."/ie7-standard-p.js\"></script>\n"; - $output .= " <script type=\"text/javascript\" src=\"".$ie7_path."/ie7-recalc.js\"></script>\n"; - $output .= "<![endif]-->\n"; - } pfcI18N::SwitchOutputEncoding(); // display output Modified: trunk/themes/default/templates/chat.js.tpl.php =================================================================== --- trunk/themes/default/templates/chat.js.tpl.php 2006-06-11 21:23:50 UTC (rev 563) +++ trunk/themes/default/templates/chat.js.tpl.php 2006-06-12 15:38:25 UTC (rev 564) @@ -2,28 +2,12 @@ <?php include($c->getFilePathFromTheme('templates/chat-pre.js.tpl.php')); ?> -/* preload smileys */ -preloadImages( - <?php foreach ($smileys as $s_file => $s_str) { ?> - '<?php echo $s_file; ?>', - <?php } ?> - '' -); - /* create our client which will do all the work on the client side ! */ var pfc = new pfcClient(); <?php if ($connect_at_startup) { ?> pfc.connect_disconnect(); <?php } ?> -/* -pfc.refresh_loginlogout(); -pfc.refresh_nickmarker(); -pfc.refresh_clock(); -pfc.refresh_minimize_maximize(); -pfc.refresh_Smileys(); -pfc.refresh_WhosOnline(); -*/ <?php if ($debugxajax) { ?> xajax.DebugMessage = function(text) Modified: trunk/themes/default/templates/pfcgui.js.tpl.php =================================================================== --- trunk/themes/default/templates/pfcgui.js.tpl.php 2006-06-11 21:23:50 UTC (rev 563) +++ trunk/themes/default/templates/pfcgui.js.tpl.php 2006-06-12 15:38:25 UTC (rev 564) @@ -66,7 +66,7 @@ tabcontent.style.display = 'none'; } } - + // show the new selected tab tab_to_show.style.display = 'block'; // restore the scroll pos @@ -91,8 +91,8 @@ cc = document.createElement('div'); cc.setAttribute('id', '<?php echo $prefix; ?>chat_'+tabid); Element.addClassName(cc, '<?php echo $prefix; ?>chat'); - // I set the border style here because seting it in the CSS is not taken in account - //cc.style.borderRight = "1px solid #555"; + cc.style.display = "block"; // needed by IE6 to show the online div at startup (first loaded page) + this.chatcontent[tabid] = cc; return cc; }, @@ -107,7 +107,8 @@ Element.addClassName(oc, '<?php echo $prefix; ?>online'); // I set the border style here because seting it in the CSS is not taken in account oc.style.borderLeft = "1px solid #555"; - + oc.style.display = "block"; // needed by IE6 to show the online div at startup (first loaded page) + // Create a dummy div to add padding var div = document.createElement('div'); div.style.padding = "5px"; @@ -206,9 +207,9 @@ li_div.appendChild(a2); var div_content = document.createElement('div'); - div_content.style.display = 'none'; div_content.setAttribute('id', '<?php echo $prefix; ?>channel_content'+tabid); Element.addClassName(div_content, '<?php echo $prefix; ?>content'); + div_content.style.display = 'none'; var div_chat = this.getChatContentFromTabId(tabid); var div_online = this.getOnlineContentFromTabId(tabid); Modified: trunk/themes/default/templates/style.css.tpl.php =================================================================== --- trunk/themes/default/templates/style.css.tpl.php 2006-06-11 21:23:50 UTC (rev 563) +++ trunk/themes/default/templates/style.css.tpl.php 2006-06-12 15:38:25 UTC (rev 564) @@ -246,6 +246,7 @@ } div#<?php echo $prefix; ?>smileys { + display: none; /* will be shown by javascript routines */ background-color: #FFF; border: 1px solid #555; padding: 4px; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
