Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: OryNider <ory...@us...> - 2007-06-19 22:35:54
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19756/admin Modified Files: admin_album_cfg.php Log Message: This upgrade will add "Enable BBCode" option in Configuration Std and will make smartor "ready" for release. Index: admin_album_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_album_cfg.php 7 Jun 2007 20:13:05 -0000 1.1 --- admin_album_cfg.php 19 Jun 2007 22:34:18 -0000 1.2 *************** *** 267,270 **** --- 267,274 ---- 'SHOW_EXIF_DISABLED' => ($new['show_exif'] == 0) ? 'checked="checked"' : '', + 'BBCODE_ENABLED' => ($new['album_bbcode'] == 1) ? 'checked="checked"' : '', + 'BBCODE_DISABLED' => ($new['album_bbcode'] == 0) ? 'checked="checked"' : '', + + 'S_GUEST' => ALBUM_GUEST, 'S_USER' => ALBUM_USER, *************** *** 335,338 **** --- 339,343 ---- 'L_ENABLE_SEPIA_BW' => $lang['Enable_Sepia_BW'], 'L_SHOW_EXIF' => $lang['Show_EXIF_Info'], + 'L_ENABLE_BBCODE' => $lang['Enable_BBCode'], 'L_ALBUM_DEBUG_MODE' => $lang['Album_debug_mode'], |
|
From: OryNider <ory...@us...> - 2007-06-19 22:34:42
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19756 Removed Files: hierarchy_db_migrate.php Log Message: This upgrade will add "Enable BBCode" option in Configuration Std and will make smartor "ready" for release. --- hierarchy_db_migrate.php DELETED --- |
|
From: OryNider <ory...@us...> - 2007-06-19 21:01:00
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29254 Modified Files: mx_glance.php Log Message: With this update and fix At a Glance is ready for release :D Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_glance.php 12 Jun 2007 11:19:14 -0000 1.2 --- mx_glance.php 19 Jun 2007 21:00:57 -0000 1.3 *************** *** 141,148 **** // // GET THE LATEST NEWS TOPIC ! // if ( $glance_num_news ) { - $news_data = $db->sql_fetchrow($result); - /* if ( 1 ) --- 141,146 ---- // // GET THE LATEST NEWS TOPIC ! if ( $glance_num_news ) { /* if ( 1 ) *************** *** 182,186 **** --- 180,188 ---- mx_message_die(GENERAL_ERROR, "Could not query new news information", "", __LINE__, __FILE__, $sql); } + $latest_news = array(); + + //$news_data = $db->sql_fetchrow($result); + while ( $topic_row = $db->sql_fetchrow($result) ) { |
|
From: Jon O. <jon...@us...> - 2007-06-19 20:45:48
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22332 Added Files: navmenu_constants.php Log Message: Sorry, i forgot to add these files, while fixing the nav menu for IE --- NEW FILE: navmenu_constants.php --- <?php /** * * @package mxBB Portal Module - mx_navmenu * @version $Id: navmenu_constants.php,v 1.1 2007/06/19 20:45:42 jonohlsson Exp $ * @copyright (c) 2002-2006 [Martin, Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } // ------------------------------------------------------------------------- // Extend User Style with module lang and images // Usage: $mx_user->extend(LANG, IMAGES) // Switches: // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE // // Extend page with additional header or footer data // Examples: // $mx_page->add_css_file(); // Include style dependent *.css file, eg module_path/template_path/template/theme.css // $mx_page->add_js_file( 'includes/js.js' ); // Relative to module_root // $mx_page->add_header_text( 'header text' ); // $mx_page->add_footer_text( 'includes/test.txt', true ); // Relative to module_root // Note: Included text from file (last example), will evaluate $theme and $mx_block->info variables. // ------------------------------------------------------------------------- /* if (is_object($mx_page)) { } */ ?> |
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes/js In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22332/js Added Files: adv_CSS_hor.js adv_CSS_ver.js adv_hor.js adv_ver.js simple_CSS_hor.js simple_CSS_ver.js Log Message: Sorry, i forgot to add these files, while fixing the nav menu for IE --- NEW FILE: simple_CSS_hor.js --- <script type="text/javascript"> <!-- var ddm1 = new DropDownMenu1('menu' + '{$block_id}'); ddm1.type = "horizontal"; ddm1.delay.show = 0; ddm1.delay.hide = 100; ddm1.position.top = 1; ddm1.position.left = 0; ddm1.zIndex.visible = 1; if (!ddm1.browser.ie) { ddm1.browser.ie5 = false; }; ddm1.init(); //--> </script> --- NEW FILE: adv_CSS_ver.js --- <!-- Example of initializing: var menu = new XulMenu("id_of_the_menu"); menu.init(); Example of initializing and setting additional stuff: var menu1 = new XulMenu("menu1"); menu1.type = "horizontal"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow.gif"; menu1.arrow2 = "images/arrow-active.gif"; Note: arrow1 & arrow2 set only when you want the arrow image to change when element is active. If you don't want the arrow to change keep both variables empty. ---------------- API ---------------- Controlling the menu: show(id) hide(id) hideAll() hideHigherOrEqualLevels(n) id = id of the element n = level examples: 1) menu1.show("menu1-1"); 2) menu1.show("menu1-1"); menu1.show("menu1-1-2"); menu1.show("menu1-1-2-0"); menu1.hideHigherOrEqualLevels(2); Both examples show the same. --> <script type="text/javascript"> var menu1 = new XulMenu('menu' + '{$block_id}'); menu1.type = "vertical"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow1.gif"; menu1.arrow2 = "images/arrow2.gif"; menu1.init(); </script> --- NEW FILE: simple_CSS_ver.js --- <script type="text/javascript"> <!-- var ddm1 = new DropDownMenu1('menu' + '{$block_id}'); ddm1.type = "vertical"; ddm1.delay.show = 0; ddm1.delay.hide = 100; ddm1.position.top = 0; ddm1.position.left = 0; ddm1.zIndex.visible = 1; if (!ddm1.browser.ie) { ddm1.browser.ie5 = false; }; ddm1.init(); //--> </script> --- NEW FILE: adv_ver.js --- <script type="text/javascript"> var clickMenu1 = new ClickShowHideMenu('click-menu' + '{$block_id}'); clickMenu1.box1Hover = true; clickMenu1.box2Hover = true; clickMenu1.highlightActive = false; //clickMenu1.init_id = 0; // Initiate menu clickMenu1.init(); </script> --- NEW FILE: adv_CSS_hor.js --- <!-- Example of initializing: var menu = new XulMenu("id_of_the_menu"); menu.init(); Example of initializing and setting additional stuff: var menu1 = new XulMenu("menu1"); menu1.type = "horizontal"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow.gif"; menu1.arrow2 = "images/arrow-active.gif"; Note: arrow1 & arrow2 set only when you want the arrow image to change when element is active. If you don't want the arrow to change keep both variables empty. ---------------- API ---------------- Controlling the menu: show(id) hide(id) hideAll() hideHigherOrEqualLevels(n) id = id of the element n = level examples: 1) menu1.show("menu1-1"); 2) menu1.show("menu1-1"); menu1.show("menu1-1-2"); menu1.show("menu1-1-2-0"); menu1.hideHigherOrEqualLevels(2); Both examples show the same. --> <script type="text/javascript"> var menu1 = new XulMenu('menu' + '{$block_id}'); menu1.type = "horizontal"; menu1.arrow1 = "images/arrow1.gif"; menu1.arrow2 = "images/arrow2.gif"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.init(); </script> --- NEW FILE: adv_hor.js --- <script type="text/javascript"> var clickMenu1 = new ClickShowHideMenu('click-menu' + '{$block_id}'); clickMenu1.box1Hover = true; clickMenu1.box2Hover = true; clickMenu1.highlightActive = false; //clickMenu1.init_id = 0; // Initiate menu clickMenu1.init(); </script> |
|
From: Jon O. <jon...@us...> - 2007-06-19 20:44:31
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes/js In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21705/js Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/includes/js added to the repository |
|
From: Jon O. <jon...@us...> - 2007-06-19 20:42:04
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20184 Modified Files: mx_functions_phpbb.php Log Message: Bug 46. Validated includes for bbcode.php Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_functions_phpbb.php 4 Jun 2007 21:14:02 -0000 1.31 --- mx_functions_phpbb.php 19 Jun 2007 20:42:00 -0000 1.32 *************** *** 25,29 **** function mx_smilies_pass($message) { ! global $board_config; $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; --- 25,35 ---- function mx_smilies_pass($message) { ! global $board_config, $phpbb_root_path, $phpEx; ! ! if( !function_exists('smilies_pass') ) ! { ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); ! } ! $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; *************** *** 44,48 **** { global $board_config, $template, $phpbb_root_path, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); $smilies_path = $board_config['smilies_path']; --- 50,58 ---- { global $board_config, $template, $phpbb_root_path, $phpEx; ! ! if( !function_exists('generate_smilies') ) ! { ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); ! } $smilies_path = $board_config['smilies_path']; |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:53:23
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27971 Modified Files: mx_announce.tpl Log Message: Bug 42. Tpl fix Index: mx_announce.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/subSilver/mx_announce.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_announce.tpl 2 May 2006 23:22:17 -0000 1.1 --- mx_announce.tpl 19 Jun 2007 19:53:20 -0000 1.2 *************** *** 12,16 **** </a> <a href="{postrow.U_LAST_POST_URL}" class="topictitle"> ! <img src="{postrow.FOLDER_IMG}" width="19" height="18" alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" border="0" align="absmiddle" /></a> --- 12,16 ---- </a> <a href="{postrow.U_LAST_POST_URL}" class="topictitle"> ! <img src="{postrow.FOLDER_IMG}" alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" border="0" align="absmiddle" /></a> |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:48:42
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25059 Modified Files: mx_forum.tpl Log Message: Bug 41. Tpl bug Index: mx_forum.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/subSilver/mx_forum.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_forum.tpl 28 Apr 2007 19:39:41 -0000 1.2 --- mx_forum.tpl 19 Jun 2007 19:48:38 -0000 1.3 *************** *** 13,17 **** <!-- BEGIN forumrow --> <tr> ! <td class="row1" align="center" valign="middle" height="50"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /> --- 13,17 ---- <!-- BEGIN forumrow --> <tr> ! <td class="row1" align="center" valign="middle" height="50"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /> |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:42:29
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21746 Modified Files: mx_functions_core.php mx_functions_style.php Log Message: Bugs 45. Solved issue with custom page styles. Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** mx_functions_core.php 19 Jun 2007 18:30:42 -0000 1.46 --- mx_functions_core.php 19 Jun 2007 19:42:25 -0000 1.47 *************** *** 2542,2546 **** $this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] ); ! $this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? true : false ) : ( $this->info['override_user_style'] == 1 ? true : false ); $this->page_ov_header = !empty($this->info['page_header']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header']; --- 2542,2546 ---- $this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] ); ! $this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? 1 : 0 ) : ( $this->info['override_user_style'] == 1 ? 1 : 0 ); $this->page_ov_header = !empty($this->info['page_header']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header']; Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_functions_style.php 10 Jun 2007 21:26:40 -0000 1.15 --- mx_functions_style.php 19 Jun 2007 19:42:25 -0000 1.16 *************** *** 406,410 **** { $init_style = $mx_page->default_style == -1 ? $portal_config['default_style'] : $mx_page->default_style; ! $init_override = $mx_page->override_user_style == -1 ? $portal_config['override_user_style'] : $mx_page->override_user_style; } else --- 406,410 ---- { $init_style = $mx_page->default_style == -1 ? $portal_config['default_style'] : $mx_page->default_style; ! $init_override = intval($mx_page->override_user_style) == -1 ? $portal_config['override_user_style'] : $mx_page->override_user_style; } else *************** *** 430,434 **** // Setup style // ! if ( !$portal_config['override_user_style'] ) { if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 ) --- 430,434 ---- // Setup style // ! if ( !$init_override ) { if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 ) |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:10:49
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7400 Modified Files: mx_functions.php Log Message: Bug 44. Typho. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** mx_functions.php 30 Jan 2007 16:26:07 -0000 1.70 --- mx_functions.php 19 Jun 2007 19:10:44 -0000 1.71 *************** *** 424,428 **** { $selected = ( $row[$idfield] == $id ) ? ' selected="selected"' : ''; ! $column_list .= "<option value=\"$row[$idfield]\"$s>" . $row[$namefield] . "</option>\n"; } $column_list .= '</select>'; --- 424,428 ---- { $selected = ( $row[$idfield] == $id ) ? ' selected="selected"' : ''; ! $column_list .= "<option value=\"$row[$idfield]\"$selected>" . $row[$namefield] . "</option>\n"; } $column_list .= '</select>'; |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:04:44
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4597 Modified Files: overall_footer.tpl Log Message: Bug 38 MXBB_EXTRA style def moved to tpl file. Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_footer.tpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** overall_footer.tpl 19 Jun 2007 18:31:58 -0000 1.21 --- overall_footer.tpl 19 Jun 2007 19:04:33 -0000 1.22 *************** *** 16,20 **** The phpBB Group : 2002 & mxBB Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | {MXBB_EXTRA} </div> </td> --- 16,20 ---- The phpBB Group : 2002 & mxBB Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </td> |
|
From: Jon O. <jon...@us...> - 2007-06-19 19:03:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4119 Modified Files: page_tail.php Log Message: Bug 38 MXBB_EXTRA style def moved to tpl file. Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** page_tail.php 19 Jun 2007 18:30:44 -0000 1.30 --- page_tail.php 19 Jun 2007 19:03:48 -0000 1.31 *************** *** 24,28 **** $template->set_filenames(array( - //'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl' 'overall_footer' => empty($mx_page->page_ov_footer) || !file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $mx_page->page_ov_footer) ? ( empty($gen_simple_header) ? 'overall_footer.tpl' : 'simple_footer.tpl' ) : $mx_page->page_ov_footer )); --- 24,27 ---- *************** *** 42,46 **** $mxbb_footer_text = $lang['mx_about_title']; ! $mxbb_footer_text = '<a href="' . PORTAL_URL . 'index.' . $phpEx . '?sid=' . $userdata['session_id'] . '&mx_copy=true' . '" target="_blank" class="copyright">' . $mxbb_footer_text . '</a>'; // --- 41,45 ---- $mxbb_footer_text = $lang['mx_about_title']; ! $mxbb_footer_text_url = PORTAL_URL . 'index.' . $phpEx . '?sid=' . $userdata['session_id'] . '&mx_copy=true'; // *************** *** 96,99 **** --- 95,99 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'MXBB_EXTRA' => $mxbb_footer_text, + 'MXBB_EXTRA_URL' => $mxbb_footer_text_url, 'POWERED_BY' => $lang['Powered_by'], 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:32:08
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14490 Modified Files: overall_footer.tpl overall_header.tpl overall_header_navigation.tpl overall_noheader.tpl Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: overall_noheader.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_noheader.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** overall_noheader.tpl 25 Jan 2007 21:08:49 -0000 1.6 --- overall_noheader.tpl 19 Jun 2007 18:31:58 -0000 1.7 *************** *** 15,21 **** <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko --> - {MX_ADDITIONAL_CSS} - {MX_ICON_CSS} - <!-- BEGIN switch_enable_pm_popup --> <script language="Javascript" type="text/javascript"> --- 15,18 ---- *************** *** 31,35 **** <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> - </head> <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}" /> --- 28,31 ---- Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_footer.tpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** overall_footer.tpl 13 May 2007 20:33:35 -0000 1.20 --- overall_footer.tpl 19 Jun 2007 18:31:58 -0000 1.21 *************** *** 23,26 **** --- 23,27 ---- <!-- This displays generation info at the bottom of the page --> {EXECUTION_STATS} + {MX_ADDITIONAL_FOOTER_TEXT} </body> </html> \ No newline at end of file Index: overall_header_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header_navigation.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** overall_header_navigation.tpl 7 May 2007 19:29:40 -0000 1.5 --- overall_header_navigation.tpl 19 Jun 2007 18:31:58 -0000 1.6 *************** *** 17,21 **** <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko --> ! {MX_ADDITIONAL_CSS} {MX_ICON_CSS} --- 17,21 ---- <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko --> ! {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} *************** *** 61,64 **** --- 61,66 ---- <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> + {MX_ADDITIONAL_JS_FILES} + {MX_ADDITIONAL_HEADER_TEXT} </head> Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header.tpl,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** overall_header.tpl 7 May 2007 19:26:10 -0000 1.28 --- overall_header.tpl 19 Jun 2007 18:31:58 -0000 1.29 *************** *** 17,21 **** <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko --> ! {MX_ADDITIONAL_CSS} {MX_ICON_CSS} --- 17,21 ---- <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko --> ! {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} *************** *** 62,65 **** --- 62,67 ---- <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> + {MX_ADDITIONAL_JS_FILES} + {MX_ADDITIONAL_HEADER_TEXT} </head> |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:31:49
|
Update of /cvsroot/mxbb/core/modules/mx_shared/mygosumenu/1.4 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14377/1.4 Modified Files: XulMenu.js Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: XulMenu.js =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/mygosumenu/1.4/XulMenu.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XulMenu.js 5 Apr 2006 21:05:32 -0000 1.1 --- XulMenu.js 19 Jun 2007 18:31:44 -0000 1.2 *************** *** 10,14 **** function XulMenu(id) { ! this.type = "horizontal"; this.position = { --- 10,14 ---- function XulMenu(id) { ! this.type = "horizontal"; this.position = { *************** *** 35,39 **** if (this.type != "horizontal" && this.type != "vertical") { return alert("XulMenu.init() failed. Unknown menu type: '"+this.type+"'"); } document.onmousedown = click; ! if (this.browser.ie && this.browser.ie5) { this.fixWrap(); } this.fixSections(); this.parse(document.getElementById(this.id).childNodes, this.tree, this.id); --- 35,39 ---- if (this.type != "horizontal" && this.type != "vertical") { return alert("XulMenu.init() failed. Unknown menu type: '"+this.type+"'"); } document.onmousedown = click; ! if (this.browser.ie) { this.fixWrap(); } this.fixSections(); this.parse(document.getElementById(this.id).childNodes, this.tree, this.id); *************** *** 87,91 **** for (var i = 0; i < nodes.length; i++) { if (nodes[i].nodeType == 1 && /item/.test(nodes[i].className) && nodes[i].currentStyle) { ! if (this.browser.ie5) { nodes[i].style.width = (maxWidth) + "px"; } else { --- 87,91 ---- for (var i = 0; i < nodes.length; i++) { if (nodes[i].nodeType == 1 && /item/.test(nodes[i].className) && nodes[i].currentStyle) { ! if (this.browser.ie) { nodes[i].style.width = (maxWidth) + "px"; } else { *************** *** 122,126 **** if (this.type == "horizontal") { box2.style.top = (box1.offsetTop + box1.offsetHeight + this.position.level1.top) + "px"; ! if (this.browser.ie5) { box2.style.left = (this.position.level1.left) + "px"; } else { --- 122,126 ---- if (this.type == "horizontal") { box2.style.top = (box1.offsetTop + box1.offsetHeight + this.position.level1.top) + "px"; ! if (this.browser.ie) { box2.style.left = (this.position.level1.left) + "px"; } else { *************** *** 129,133 **** } else if (this.type == "vertical") { box2.style.top = (box1.offsetTop + this.position.level1.top) + "px"; ! if (this.browser.ie5) { box2.style.left = (box1.offsetWidth + this.position.level1.left) + "px"; } else { --- 129,133 ---- } else if (this.type == "vertical") { box2.style.top = (box1.offsetTop + this.position.level1.top) + "px"; ! if (this.browser.ie) { box2.style.left = (box1.offsetWidth + this.position.level1.left) + "px"; } else { |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:31:48
|
Update of /cvsroot/mxbb/core/modules/mx_shared/mygosumenu/1.0 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14377/1.0 Modified Files: DropDownMenu1.js Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: DropDownMenu1.js =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/mygosumenu/1.0/DropDownMenu1.js,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DropDownMenu1.js 5 Apr 2006 21:05:30 -0000 1.1 --- DropDownMenu1.js 19 Jun 2007 18:31:44 -0000 1.2 *************** *** 42,46 **** if (!document.getElementById(this.id)) { return alert("DropDownMenu1.init() failed. Element '"+ this.id +"' does not exist."); } if (this.type != "horizontal" && this.type != "vertical") { return alert("DropDownMenu1.init() failed. Unknown menu type: '"+this.type+"'"); } ! if (this.browser.ie && this.browser.ie5) { fixWrap(); } fixSections(); parse(document.getElementById(this.id).childNodes, this.tree, this.id); --- 42,46 ---- if (!document.getElementById(this.id)) { return alert("DropDownMenu1.init() failed. Element '"+ this.id +"' does not exist."); } if (this.type != "horizontal" && this.type != "vertical") { return alert("DropDownMenu1.init() failed. Unknown menu type: '"+this.type+"'"); } ! if (this.browser.ie) { fixWrap(); } fixSections(); parse(document.getElementById(this.id).childNodes, this.tree, this.id); *************** *** 52,56 **** var sections = new Array(); var widths = new Array(); ! for (var i = 0; i < arr.length; i++) { if (arr[i].className == "section") { --- 52,56 ---- var sections = new Array(); var widths = new Array(); ! for (var i = 0; i < arr.length; i++) { if (arr[i].className == "section") { *************** *** 94,98 **** for (var i = 0; i < nodes.length; i++) { if (nodes[i].nodeType == 1 && /item2/.test(nodes[i].className) && nodes[i].currentStyle) { ! if (self.browser.ie5) { nodes[i].style.width = (maxWidth) + "px"; } else { --- 94,98 ---- for (var i = 0; i < nodes.length; i++) { if (nodes[i].nodeType == 1 && /item2/.test(nodes[i].className) && nodes[i].currentStyle) { ! if (self.browser.ie) { nodes[i].style.width = (maxWidth) + "px"; } else { *************** *** 133,137 **** if ("horizontal" == self.type) { box2.style.top = box1.offsetTop + box1.offsetHeight + self.position.top + "px"; ! if (self.browser.ie5) { box2.style.left = self.position.left + "px"; } else { --- 133,137 ---- if ("horizontal" == self.type) { box2.style.top = box1.offsetTop + box1.offsetHeight + self.position.top + "px"; ! if (self.browser.ie) { box2.style.left = self.position.left + "px"; } else { *************** *** 140,144 **** } else if ("vertical" == self.type) { box2.style.top = box1.offsetTop + self.position.top + "px"; ! if (self.browser.ie5) { box2.style.left = box1.offsetWidth + self.position.left + "px"; } else { --- 140,144 ---- } else if ("vertical" == self.type) { box2.style.top = box1.offsetTop + self.position.top + "px"; ! if (self.browser.ie) { box2.style.left = box1.offsetWidth + self.position.left + "px"; } else { |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:31:33
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13496 Modified Files: mx_menu_nav.php Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_menu_nav.php 11 May 2007 21:09:31 -0000 1.20 --- mx_menu_nav.php 19 Jun 2007 18:31:00 -0000 1.21 *************** *** 24,27 **** --- 24,28 ---- // Includes // + include_once( $module_root_path . 'includes/navmenu_constants.' . $phpEx ); include_once( $module_root_path . 'includes/navmenu_functions.' . $phpEx ); *************** *** 70,91 **** case 'Advanced': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl'); break; - case 'Simple_CSS_menu': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl'); break; case 'Advanced_CSS_menu': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl'); break; - - //????? case 'Simple_x': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl'); break; - case 'Overall_navigation': $template_tmp = array('body' => 'mx_menu_overall_standard.tpl'); break; - default: $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); --- 71,93 ---- case 'Advanced': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl'); + $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js'; + $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); break; case 'Simple_CSS_menu': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl'); + $kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js'; + $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); break; case 'Advanced_CSS_menu': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl'); + $kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js'; + $mx_page->add_footer_text( 'includes/js/' . $kick_js, true ); break; case 'Simple_x': $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl'); break; case 'Overall_navigation': $template_tmp = array('body' => 'mx_menu_overall_standard.tpl'); break; default: $template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl'); |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:31:13
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13496/templates/subSilver Modified Files: mx_menu_advanced_CSS_hor.tpl mx_menu_advanced_CSS_ver.tpl mx_menu_advanced_hor.tpl mx_menu_advanced_ver.tpl mx_menu_simple_CSS_hor.tpl mx_menu_simple_CSS_ver.tpl Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: mx_menu_advanced_hor.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_advanced_hor.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_menu_advanced_hor.tpl 29 May 2006 15:37:04 -0000 1.2 --- mx_menu_advanced_hor.tpl 19 Jun 2007 18:31:00 -0000 1.3 *************** *** 13,19 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; --- 13,18 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 28,34 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; --- 27,32 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 43,49 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid none solid; cursor: default; position: relative; --- 41,46 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 58,64 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid none solid; cursor: default; position: relative; --- 55,60 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 70,81 **** } .click-menu .section { ! background-color: {T_TR_COLOR1}; font-family: {T_FONTFACE1}; font-size: 12px; line-height: 15px; padding: 5px 5px 6px 5px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: none solid solid solid; display: none; } --- 66,76 ---- } .click-menu .section { ! background: {T_TR_COLOR1}; font-family: {T_FONTFACE1}; font-size: 12px; line-height: 15px; padding: 5px 5px 6px 5px; ! border: 0px {T_TH_COLOR1}; ! border-style: none solid solid solid; display: none; } *************** *** 107,120 **** <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left"> ! ! <table cellspacing="0" cellpadding="0" id="click-menu{MENU_ID}" class="click-menu"> ! <tr> <!-- BEGIN catrow --> ! <td class="row1" align="left" width="{CAT_WIDTH}" valign="top"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> ! <td class="cat" style="border:none;"> <div class="box1"><span class="nav"> {catrow.CATEGORY}</span></div> </td> --- 102,113 ---- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left" class="row1"> ! <table cellspacing="1" cellpadding="0" id="click-menu{MENU_ID}" class="click-menu"> <tr> <!-- BEGIN catrow --> ! <td align="left" width="{CAT_WIDTH}" valign="top"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> ! <td style="border:none;"> <div class="box1"><span class="nav"> {catrow.CATEGORY}</span></div> </td> *************** *** 126,153 **** <!-- END modulerow --> </div> - </td> <!-- END catrow --> </tr> - </table> - </td> </tr> ! </table> ! ! <!-- ! this.box1Hover = true; ! this.box2Hover = true; ! this.highlightActive = false; ! --> ! ! <script type="text/javascript"> ! var clickMenu1 = new ClickShowHideMenu('click-menu' + '{MENU_ID}'); ! clickMenu1.box1Hover = true; ! clickMenu1.box2Hover = true; ! clickMenu1.highlightActive = false; ! //clickMenu1.init_id = 0; // Initiate menu ! clickMenu1.init(); ! ! </script> \ No newline at end of file --- 119,127 ---- <!-- END modulerow --> </div> </td> <!-- END catrow --> </tr> </table> </td> </tr> ! </table> \ No newline at end of file Index: mx_menu_advanced_ver.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_advanced_ver.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_menu_advanced_ver.tpl 29 May 2006 15:37:04 -0000 1.2 --- mx_menu_advanced_ver.tpl 19 Jun 2007 18:31:01 -0000 1.3 *************** *** 13,19 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; --- 13,18 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 28,34 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; --- 27,32 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 43,49 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid none solid; cursor: default; position: relative; --- 41,46 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 58,64 **** font-family: {T_FONTFACE1}; padding: 6px 21px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid none solid; cursor: default; position: relative; --- 55,60 ---- font-family: {T_FONTFACE1}; padding: 6px 21px; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; cursor: default; position: relative; *************** *** 70,81 **** } .click-menu .section { ! background-color: {T_TR_COLOR1}; font-family: {T_FONTFACE1}; font-size: 12px; line-height: 15px; padding: 5px 5px 6px 5px; ! border-width: 0px; ! border-color: {T_TH_COLOR1}; ! border-style: none solid solid solid; display: none; } --- 66,76 ---- } .click-menu .section { ! background: {T_TR_COLOR1}; font-family: {T_FONTFACE1}; font-size: 12px; line-height: 15px; padding: 5px 5px 6px 5px; ! border: 0px {T_TH_COLOR1}; ! border-style: none solid solid solid; display: none; } *************** *** 107,119 **** <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center"> ! ! <table width="100%" cellspacing="0" cellpadding="0" id="click-menu{MENU_ID}" class="click-menu"> <!-- BEGIN catrow --> <tr> ! <td class="row1" align="left"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> ! <td class="cat" style="border:none;"> <div class="box1"><span class="nav"> {catrow.CATEGORY}</span></div> </td> --- 102,113 ---- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center" class="row1"> ! <table width="100%" cellspacing="1" cellpadding="0" id="click-menu{MENU_ID}" class="click-menu"> <!-- BEGIN catrow --> <tr> ! <td align="left"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> ! <td style="border:none;"> <div class="box1"><span class="nav"> {catrow.CATEGORY}</span></div> </td> *************** *** 125,151 **** <!-- END modulerow --> </div> - </td> </tr> <!-- END catrow --> </table> - </td> </tr> ! </table> ! ! <!-- ! this.box1Hover = true; ! this.box2Hover = true; ! this.highlightActive = false; ! --> ! ! <script type="text/javascript"> ! var clickMenu1 = new ClickShowHideMenu('click-menu' + '{MENU_ID}'); ! clickMenu1.box1Hover = true; ! clickMenu1.box2Hover = true; ! clickMenu1.highlightActive = false; ! //clickMenu1.init_id = 0; // Initiate menu ! clickMenu1.init(); ! ! </script> \ No newline at end of file --- 119,127 ---- <!-- END modulerow --> </div> </td> </tr> <!-- END catrow --> </table> </td> </tr> ! </table> \ No newline at end of file Index: mx_menu_simple_CSS_hor.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_simple_CSS_hor.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_menu_simple_CSS_hor.tpl 10 Dec 2006 18:50:01 -0000 1.1 --- mx_menu_simple_CSS_hor.tpl 19 Jun 2007 18:31:01 -0000 1.2 *************** *** 8,19 **** .ddm1 .item1-active, .ddm1 .item1-active:hover { ! padding: 3px 8px 4px 8px; text-decoration: none; display: block; position: relative; } .ddm1 .item1 { color: {T_BODY_LINK}; ! border: 1px {T_TR_COLOR2}; } .ddm1 .item1:hover, --- 8,23 ---- .ddm1 .item1-active, .ddm1 .item1-active:hover { ! background: {T_TR_COLOR1}; ! padding: 5px 6px 5px 6px; text-decoration: none; display: block; position: relative; + white-space: nowrap; } .ddm1 .item1 { + text-align: left; color: {T_BODY_LINK}; ! border: 1px {T_TR_COLOR1}; ! border-style: solid solid solid solid; } .ddm1 .item1:hover, *************** *** 27,36 **** .ddm1 .item2, .ddm1 .item2:hover { ! padding: 3px 8px 4px 8px; text-decoration: none; display: block; white-space: nowrap; } .ddm1 .item2 { color: {T_BODY_LINK}; } --- 31,44 ---- .ddm1 .item2, .ddm1 .item2:hover { ! background: {T_TR_COLOR1}; ! padding: 5px 6px 5px 6px; text-decoration: none; display: block; white-space: nowrap; + border: 1px {T_TR_COLOR1}; + border-style: solid solid solid solid; } .ddm1 .item2 { + text-align: left; color: {T_BODY_LINK}; } *************** *** 38,41 **** --- 46,51 ---- background: {T_TR_COLOR2}; color: {T_BODY_VLINK}; + border: 1px {T_TH_COLOR1}; + border-style: solid solid solid solid; } .ddm1 .section { *************** *** 60,64 **** <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left"> <table cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="ddm1"> --- 70,74 ---- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left" class="row1"> <table cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="ddm1"> *************** *** 69,73 **** <div class="section"> <!-- BEGIN modulerow --> ! {catrow.modulerow.U_MENU_ICON}<a class="item2" href="{catrow.modulerow.U_MENU_MODULE}" target="{catrow.modulerow.U_LINK_TARGET}">{catrow.modulerow.MENU_NAME}</a> <!-- END modulerow --> </div> --- 79,83 ---- <div class="section"> <!-- BEGIN modulerow --> ! <a class="item2" href="{catrow.modulerow.U_MENU_MODULE}" target="{catrow.modulerow.U_LINK_TARGET}">{catrow.modulerow.U_MENU_ICON} {catrow.modulerow.MENU_NAME}</a> <!-- END modulerow --> </div> *************** *** 79,123 **** </td> </tr> ! </table> ! ! <!-- ! /* Type of the menu: "horizontal" or "vertical" */ ! this.type = "horizontal"; ! ! /* Delay (in miliseconds >= 0): show-hide menu */ ! this.delay = { ! "show": 0, ! "hide": 300 ! } ! /* Change the default position of sub-menu by Y pixels from top and X pixels from left ! * Negative values are allowed */ ! this.position = { ! "top": 0, ! "left": 0 ! } ! /* Z-index property for .section */ ! this.zIndex = { ! "visible": 1, ! "hidden": -1 ! }; ! ! // Browser detection ! this.browser = { ! "ie": Boolean(document.body.currentStyle), ! "ie5": (navigator.appVersion.indexOf("MSIE 5.5") != -1 || navigator.appVersion.indexOf("MSIE 5.0") != -1) ! }; ! if (!this.browser.ie) { this.browser.ie5 = false; } ! --> ! ! <script type="text/javascript"> ! <!-- ! var ddm1 = new DropDownMenu1('menu' + '{MENU_ID}'); ! ddm1.type = "horizontal"; ! ddm1.delay.show = 0; ! ddm1.delay.hide = 100; ! ddm1.position.top = 1; ! ddm1.position.left = 0; ! ddm1.init(); ! ! //--> ! </script> \ No newline at end of file --- 89,91 ---- </td> </tr> ! </table> \ No newline at end of file Index: mx_menu_simple_CSS_ver.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_simple_CSS_ver.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_menu_simple_CSS_ver.tpl 10 Dec 2006 18:50:01 -0000 1.1 --- mx_menu_simple_CSS_ver.tpl 19 Jun 2007 18:31:01 -0000 1.2 *************** *** 8,12 **** .ddm1 .item1-active, .ddm1 .item1-active:hover { ! padding: 3px 8px 4px 8px; text-decoration: none; display: block; --- 8,13 ---- .ddm1 .item1-active, .ddm1 .item1-active:hover { ! background: {T_TR_COLOR1}; ! padding: 5px 6px 5px 6px; text-decoration: none; display: block; *************** *** 15,20 **** } .ddm1 .item1 { color: {T_BODY_LINK}; ! border: 1px {T_TR_COLOR2}; } .ddm1 .item1:hover, --- 16,23 ---- } .ddm1 .item1 { + text-align: left; color: {T_BODY_LINK}; ! border: 1px {T_TR_COLOR1}; ! border-style: solid solid solid solid; } .ddm1 .item1:hover, *************** *** 35,45 **** .ddm1 .item2, .ddm1 .item2:hover { ! padding: 3px 8px 4px 8px; text-decoration: none; display: block; white-space: nowrap; ! border: 1px {T_TR_COLOR2}; } .ddm1 .item2 { color: {T_BODY_LINK}; } --- 38,51 ---- .ddm1 .item2, .ddm1 .item2:hover { ! background: {T_TR_COLOR1}; ! padding: 5px 6px 5px 6px; text-decoration: none; display: block; white-space: nowrap; ! border: 1px {T_TR_COLOR1}; ! border-style: solid solid solid solid; } .ddm1 .item2 { + text-align: left; color: {T_BODY_LINK}; } *************** *** 72,76 **** <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center"> <table width="100%" cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="ddm1"> --- 78,82 ---- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center" class="row1"> <table width="100%" cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="ddm1"> *************** *** 91,135 **** </td> </tr> ! </table> ! ! <!-- ! /* Type of the menu: "horizontal" or "vertical" */ ! this.type = "horizontal"; ! ! /* Delay (in miliseconds >= 0): show-hide menu */ ! this.delay = { ! "show": 0, ! "hide": 300 ! } ! /* Change the default position of sub-menu by Y pixels from top and X pixels from left ! * Negative values are allowed */ ! this.position = { ! "top": 0, ! "left": 0 ! } ! /* Z-index property for .section */ ! this.zIndex = { ! "visible": 1, ! "hidden": -1 ! }; ! ! // Browser detection ! this.browser = { ! "ie": Boolean(document.body.currentStyle), ! "ie5": (navigator.appVersion.indexOf("MSIE 5.5") != -1 || navigator.appVersion.indexOf("MSIE 5.0") != -1) ! }; ! if (!this.browser.ie) { this.browser.ie5 = false; } ! --> ! ! <script type="text/javascript"> ! <!-- ! var ddm1 = new DropDownMenu1('menu' + '{MENU_ID}'); ! ddm1.type = "vertical"; ! ddm1.delay.show = 0; ! ddm1.delay.hide = 100; ! ddm1.position.top = 0; ! ddm1.position.left = 5; ! ddm1.init(); ! ! //--> ! </script> \ No newline at end of file --- 97,99 ---- </td> </tr> ! </table> \ No newline at end of file Index: mx_menu_advanced_CSS_ver.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_advanced_CSS_ver.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_menu_advanced_CSS_ver.tpl 10 Dec 2006 18:50:01 -0000 1.1 --- mx_menu_advanced_CSS_ver.tpl 19 Jun 2007 18:31:00 -0000 1.2 *************** *** 1,4 **** --- 1,12 ---- + <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/ie5.js"></script> + <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> + <style type="text/css"> <!-- + #bar { + background: #{T_TR_COLOR1}; + cursor: default; + } + .XulMenu { font-family: {T_FONTFACE1}; *************** *** 10,13 **** --- 18,22 ---- .XulMenu .button-active, .XulMenu .button-active:hover { + text-align: left; line-height: normal; padding: 5px 6px 4px 6px; *************** *** 31,35 **** position: absolute; top: 4px; ! right: 1px; border: 0; } --- 40,44 ---- position: absolute; top: 4px; ! right: 2px; border: 0; } *************** *** 40,45 **** --- 49,57 ---- background: {T_TR_COLOR1}; line-height: normal; + text-align: left; padding: 3px 20px 3px 20px; color: #000000; + border: 1px {T_TR_COLOR1}; + border-style: solid solid solid solid; text-decoration: none; cursor: default; *************** *** 53,61 **** background: {T_TR_COLOR2}; color: {T_FONTFACE1}; } .XulMenu .section { background: {T_TR_COLOR1}; ! border: 1px solid; ! border-color: #F1EFE2 #716F64 #716F64 #F1EFE2; padding: 2px 1px 1px 2px; position: absolute; --- 65,75 ---- background: {T_TR_COLOR2}; color: {T_FONTFACE1}; + border: 1px {T_TH_COLOR1}; + border-style: solid solid solid solid; } .XulMenu .section { background: {T_TR_COLOR1}; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; padding: 2px 1px 1px 2px; position: absolute; *************** *** 74,91 **** </style> ! <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/ie5.js"></script> ! <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> ! ! <div id="bar"> ! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center"> ! <table width="100%" cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <!-- BEGIN catrow --> <tr> - <td> ! <a class="button" href="javascript:void(0)">{catrow.CATEGORY_NAME}<img src="{MX_ROOT_PATH}modules/mx_navmenu/templates/subSilver/images/arrow_right.gif" width="10" height="12" alt="" /></a> <div class="section"> <!-- BEGIN modulerow --> --- 88,100 ---- </style> ! <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="center" class="row1"> ! <div id="bar"> <table width="100%" cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <!-- BEGIN catrow --> <tr> <td> ! <a class="button" href="javascript:void(0)">{catrow.CATEGORY_NAME}<img class="arrow" src="{MX_ROOT_PATH}modules/mx_navmenu/templates/subSilver/images/arrow_right.gif" width="10" height="12" alt="" /></a> <div class="section"> <!-- BEGIN modulerow --> *************** *** 94,161 **** </div> </td> - </tr> <!-- END catrow --> </table> ! </td> </tr> ! </table> ! </div> ! ! <!-- ! Example of initializing: ! var menu = new XulMenu("id_of_the_menu"); ! menu.init(); ! ! Example of initializing and setting additional stuff: ! var menu1 = new XulMenu("menu1"); ! menu1.type = "horizontal"; ! menu1.position.level1.top = 0; ! menu1.position.level1.left = 0; ! menu1.position.levelX.top = 0; ! menu1.position.levelX.left = 0; ! menu1.arrow1 = "images/arrow.gif"; ! menu1.arrow2 = "images/arrow-active.gif"; ! ! Note: ! arrow1 & arrow2 set only when you want the arrow image to change when ! element is active. If you don't want the arrow to change keep both variables empty. ! ! ---------------- ! API ! ---------------- ! ! Controlling the menu: ! ! show(id) ! hide(id) ! hideAll() ! hideHigherOrEqualLevels(n) ! ! id = id of the element ! n = level ! ! examples: ! ! 1) ! menu1.show("menu1-1"); ! ! 2) ! menu1.show("menu1-1"); ! menu1.show("menu1-1-2"); ! menu1.show("menu1-1-2-0"); ! menu1.hideHigherOrEqualLevels(2); ! ! Both examples show the same. ! --> ! ! <script type="text/javascript"> ! var menu1 = new XulMenu('menu' + '{MENU_ID}'); ! menu1.type = "vertical"; ! menu1.arrow1 = "images/arrow1.gif"; ! menu1.arrow2 = "images/arrow2.gif"; ! menu1.position.level1.top = 0; ! menu1.position.level1.left = 0; ! menu1.init(); ! </script> \ No newline at end of file --- 103,111 ---- </div> </td> </tr> <!-- END catrow --> </table> ! </div> </td> </tr> ! </table> \ No newline at end of file Index: mx_menu_advanced_CSS_hor.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/mx_menu_advanced_CSS_hor.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_menu_advanced_CSS_hor.tpl 10 Dec 2006 18:50:01 -0000 1.1 --- mx_menu_advanced_CSS_hor.tpl 19 Jun 2007 18:31:00 -0000 1.2 *************** *** 1,4 **** --- 1,9 ---- <style type="text/css"> <!-- + #bar { + background: #{T_TR_COLOR1}; + cursor: default; + } + .XulMenu { font-family: {T_FONTFACE1}; *************** *** 10,13 **** --- 15,19 ---- .XulMenu .button-active, .XulMenu .button-active:hover { + text-align: left; line-height: normal; padding: 5px 6px 4px 6px; *************** *** 33,38 **** --- 39,47 ---- background: {T_TR_COLOR1}; line-height: normal; + text-align: left; padding: 3px 30px 3px 20px; color: #000000; + border: 1px {T_TR_COLOR1}; + border-style: solid solid solid solid; text-decoration: none; cursor: default; *************** *** 46,54 **** background: {T_TR_COLOR2}; color: {T_FONTFACE1}; } .XulMenu .section { background: {T_TR_COLOR1}; ! border: 1px solid; ! border-color: #F1EFE2 #716F64 #716F64 #F1EFE2; padding: 2px 1px 1px 2px; position: absolute; --- 55,65 ---- background: {T_TR_COLOR2}; color: {T_FONTFACE1}; + border: 1px {T_TH_COLOR1}; + border-style: solid solid solid solid; } .XulMenu .section { background: {T_TR_COLOR1}; ! border: 1px {T_TH_COLOR1}; ! border-style: solid solid solid solid; padding: 2px 1px 1px 2px; position: absolute; *************** *** 70,78 **** <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> ! <div id="bar"> <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left"> ! <table cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <tr> --- 81,89 ---- <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> ! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> ! <td align="left" class="row1"> ! <div id="bar"> <table cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <tr> *************** *** 89,150 **** </tr> </table> ! </td> </tr> ! </table> ! </div> ! ! <!-- ! Example of initializing: ! var menu = new XulMenu("id_of_the_menu"); ! menu.init(); ! ! Example of initializing and setting additional stuff: ! var menu1 = new XulMenu("menu1"); ! menu1.type = "horizontal"; ! menu1.position.level1.top = 0; ! menu1.position.level1.left = 0; ! menu1.position.levelX.top = 0; ! menu1.position.levelX.left = 0; ! menu1.arrow1 = "images/arrow.gif"; ! menu1.arrow2 = "images/arrow-active.gif"; ! ! Note: ! arrow1 & arrow2 set only when you want the arrow image to change when ! element is active. If you don't want the arrow to change keep both variables empty. ! ! ---------------- ! API ! ---------------- ! ! Controlling the menu: ! ! show(id) ! hide(id) ! hideAll() ! hideHigherOrEqualLevels(n) ! ! id = id of the element ! n = level ! ! examples: ! ! 1) ! menu1.show("menu1-1"); ! ! 2) ! menu1.show("menu1-1"); ! menu1.show("menu1-1-2"); ! menu1.show("menu1-1-2-0"); ! menu1.hideHigherOrEqualLevels(2); ! ! Both examples show the same. ! --> ! ! <script type="text/javascript"> ! var menu1 = new XulMenu('menu' + '{MENU_ID}'); ! menu1.type = "horizontal"; ! menu1.arrow1 = "images/arrow1.gif"; ! menu1.arrow2 = "images/arrow2.gif"; ! menu1.init(); ! </script> \ No newline at end of file --- 100,105 ---- </tr> </table> ! </div> </td> </tr> ! </table> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-06-19 18:31:06
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13221 Modified Files: mx_functions_core.php page_header.php page_tail.php Log Message: The navigation menu is updated, to support also IE New core methods for adding header and footer text/files Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** page_header.php 5 May 2007 20:12:58 -0000 1.42 --- page_header.php 19 Jun 2007 18:30:43 -0000 1.43 *************** *** 211,222 **** // ! // Dump out additional css styles (defined by modules) // ! $mx_addional_css = ''; if ( count($mx_page->mxbb_css_addup) > 0 ) { foreach($mx_page->mxbb_css_addup as $key => $mx_css_path) { ! $mx_addional_css .= '<link rel="stylesheet" href="'. PORTAL_URL . $mx_css_path . TEMPLATE_ROOT_PATH . $theme['head_stylesheet'] . '" type="text/css" >'; } } --- 211,246 ---- // ! // Generate list of additional css files to include (defined by modules) // ! $mx_addional_css_files = ''; if ( count($mx_page->mxbb_css_addup) > 0 ) { foreach($mx_page->mxbb_css_addup as $key => $mx_css_path) { ! $mx_addional_css_files .= "\n".'<link rel="stylesheet" href="'. PORTAL_URL . $mx_css_path . '" type="text/css" >'; ! } ! } ! ! // ! // Generate list of additional js files to include (defined by modules) ! // ! $mx_addional_js_files = ''; ! if ( count($mx_page->mxbb_js_addup) > 0 ) ! { ! foreach($mx_page->mxbb_js_addup as $key => $mx_js_path) ! { ! $mx_addional_js_files .= "\n".'<script language="javascript" type="text/javascript" src="'. PORTAL_URL . $mx_js_path . '"></script>'; ! } ! } ! ! // ! // Generate additional header code (defined by modules) ! // ! $mx_addional_header_text = ''; ! if ( count($mx_page->mxbb_header_addup) > 0 ) ! { ! foreach($mx_page->mxbb_header_addup as $key => $mx_header_text) ! { ! $mx_addional_header_text .= "\n"."\n".$mx_header_text; } } *************** *** 359,363 **** 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ADDITIONAL_CSS' => $mx_addional_css, 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], //- mxBB --- 383,389 ---- 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ADDITIONAL_CSS_FILES' => $mx_addional_css_files, ! 'MX_ADDITIONAL_JS_FILES' => $mx_addional_js_files, ! 'MX_ADDITIONAL_HEADER_TEXT' => $mx_addional_header_text, 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], //- mxBB Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** page_tail.php 13 May 2007 20:33:04 -0000 1.29 --- page_tail.php 19 Jun 2007 18:30:44 -0000 1.30 *************** *** 79,82 **** --- 79,94 ---- } + // + // Generate additional footer code (defined by modules) + // + $mx_addional_footer_text = ''; + if ( count($mx_page->mxbb_footer_addup) > 0 ) + { + foreach($mx_page->mxbb_footer_addup as $key => $mx_footer_text) + { + $mx_addional_footer_text .= "\n"."\n".$mx_footer_text; + } + } + $template->assign_vars(array( 'U_PORTAL_ROOT_PATH' => PORTAL_URL, *************** *** 88,91 **** --- 100,104 ---- 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'ADMIN_LINK' => $admin_link, + 'MX_ADDITIONAL_FOOTER_TEXT' => $mx_addional_footer_text, 'EXECUTION_STATS' => (defined('DEBUG')) ? $debug_output : '' )); Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** mx_functions_core.php 10 Jun 2007 21:23:35 -0000 1.45 --- mx_functions_core.php 19 Jun 2007 18:30:42 -0000 1.46 *************** *** 2659,2663 **** /** ! * Add css. * * Build up what css files to include in overall_header. --- 2659,2663 ---- /** ! * Add css file. * * Build up what css files to include in overall_header. *************** *** 2666,2672 **** * @param string $path */ ! function add_css($path = '') { ! $this->mxbb_css_addup[] = $path; } --- 2666,2776 ---- * @param string $path */ ! function add_css_file() { ! global $mx_block, $theme; ! ! $style_path = $theme['template_name'] . '/'; ! if ( file_exists($mx_block->module_root_path . 'templates/' . $style_path . $theme['head_stylesheet']) ) ! { ! $this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $style_path . $theme['head_stylesheet']; ! } ! else ! { ! $this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/subSilver/' . $theme['head_stylesheet']; ! } ! } ! ! /** ! * Add js file. ! * ! * Build up what js files to include in overall_header. ! * ! * @access public ! * @param string $path ! */ ! function add_js_file($path = '') ! { ! $this->mxbb_js_addup[] = $mx_block->module_root_path . $path; ! } ! ! /** ! * Add header text. ! * ! * Build up additional header text. ! * ! * @access public ! * @param string $text ! * @param boolean $read_file ! */ ! function add_header_text($text = '', $read_file = false) ! { ! // Provide these variables to be evaluated in the file ! global $mx_block, $theme; ! ! if ($read_file) ! { ! if (file_exists($mx_block->module_root_path . $text)) ! { ! $data = file_get_contents($mx_block->module_root_path . $text); ! ! foreach ($theme as $key => $value) ! { ! $data = str_replace('$theme[\''.$key.'\']', $value, $data); ! } ! ! $this->mxbb_footer_addup[] = $data; ! } ! else ! { ! echo('Warning: Your module is trying to load a file ('.$mx_block->module_root_path . $text .') that doesn\'t exist)'); ! } ! } ! else ! { ! $this->mxbb_header_addup[] = $text; ! } ! } ! ! /** ! * Add footer text. ! * ! * Build up additional footer text. ! * ! * @access public ! * @param string $text ! * @param boolean $read_file ! */ ! function add_footer_text($text = '', $read_file = false) ! { ! // Provide these variables to be evaluated in the file ! global $mx_block, $theme; ! ! if ($read_file) ! { ! if (file_exists($mx_block->module_root_path . $text)) ! { ! $data = file_get_contents($mx_block->module_root_path . $text); ! ! foreach ($theme as $key => $value) ! { ! $data = str_replace('$theme[\''.$key.'\']', $value, $data); ! } ! ! foreach ($mx_block->block_info as $key => $value) ! { ! $data = str_replace('{$'.$key . '}', $value, $data); ! } ! ! $this->mxbb_footer_addup[] = $data; ! } ! else ! { ! echo('Warning: Your module is trying to load a file ('.$mx_block->module_root_path . $text .') that doesn\'t exist)'); ! } ! } ! else ! { ! $this->mxbb_footer_addup[] = $text; ! } } |
|
From: OryNider <ory...@us...> - 2007-06-19 01:45:42
|
Update of /cvsroot/mxbb/mx_pjirc/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17576/templates/subSilver Modified Files: pjirc_chat.tpl Log Message: Added to aplet module_path, so this is ready for 2.8.0 :) Index: pjirc_chat.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/templates/subSilver/pjirc_chat.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pjirc_chat.tpl 7 Jun 2007 00:11:32 -0000 1.1 --- pjirc_chat.tpl 19 Jun 2007 01:45:37 -0000 1.2 *************** *** 26,30 **** <tr> <td align="center" class="row1" width="100%"> ! <applet codebase="pjirc" name="pjirc" code="IRCApplet.class" archive="irc.jar,pixx.jar,config.jar,javabot.jar" width=780 height=400> <param name="CABINETS" value="irc.cab,securedirc.cab,pixx.cab,config.cab,javabot.cab" /> <param name="plugin1" value="config.Config" /> --- 26,30 ---- <tr> <td align="center" class="row1" width="100%"> ! <applet codebase="{MODULE_PATH}pjirc" name="pjirc" code="IRCApplet.class" archive="irc.jar,pixx.jar,config.jar,javabot.jar" width=780 height=400> <param name="CABINETS" value="irc.cab,securedirc.cab,pixx.cab,config.cab,javabot.cab" /> <param name="plugin1" value="config.Config" /> |
|
From: OryNider <ory...@us...> - 2007-06-19 01:45:42
|
Update of /cvsroot/mxbb/mx_pjirc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17576 Modified Files: pjirc_chat.php Log Message: Added to aplet module_path, so this is ready for 2.8.0 :) Index: pjirc_chat.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pjirc_chat.php 7 Jun 2007 00:08:33 -0000 1.1 --- pjirc_chat.php 19 Jun 2007 01:45:37 -0000 1.2 *************** *** 21,26 **** define('IN_PORTAL', 1); ! error_reporting( E_ALL ); ! ini_set( 'display_errors', '1' ); $mx_root_path = "../../"; --- 21,26 ---- define('IN_PORTAL', 1); ! //error_reporting( E_ALL ); ! //ini_set( 'display_errors', '1' ); $mx_root_path = "../../"; *************** *** 71,74 **** --- 71,75 ---- 'LANG' => $board_config['default_lang'], 'HELP' => $help, + 'MODULE_PATH' => $module_root_path, //GUI_SETTING |
|
From: OryNider <ory...@us...> - 2007-06-19 01:39:12
|
Update of /cvsroot/mxbb/mx_smartor/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14793 Modified Files: welcome_body.tpl Log Message: guest avatar was commented for now, this could be a future feature but not for 2.8 gold ;) Index: welcome_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/templates/subSilver/welcome_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** welcome_body.tpl 14 Jun 2007 16:56:10 -0000 1.4 --- welcome_body.tpl 19 Jun 2007 01:39:06 -0000 1.5 *************** *** 12,16 **** <span class="gen">{L_WELCOME_USER}<br /> <br />{L_WELCOME_MSG}</span> <!-- BEGIN welcome_user_logged_out --> ! {AVATAR_IMG} <div align="center"> <form action="{S_LOGIN_ACTION}" method="post" style="margin-bottom:0px;"> --- 12,16 ---- <span class="gen">{L_WELCOME_USER}<br /> <br />{L_WELCOME_MSG}</span> <!-- BEGIN welcome_user_logged_out --> ! <!-- {AVATAR_IMG} --> <div align="center"> <form action="{S_LOGIN_ACTION}" method="post" style="margin-bottom:0px;"> *************** *** 67,71 **** <!-- END welcome_user_logged_out --> <!-- BEGIN welcome_user_logged_in --> ! {AVATAR_IMG} <span class="gensmall"> <br /> <br /> --- 67,71 ---- <!-- END welcome_user_logged_out --> <!-- BEGIN welcome_user_logged_in --> ! {AVATAR_IMG} <span class="gensmall"> <br /> <br /> |
|
From: OryNider <ory...@us...> - 2007-06-14 16:56:14
|
Update of /cvsroot/mxbb/mx_smartor/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21553 Modified Files: welcome_body.tpl Log Message: Added new option to welcome block to see how many pictures are in personal gallery with url. Index: welcome_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/templates/subSilver/welcome_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** welcome_body.tpl 14 Jun 2007 10:13:08 -0000 1.3 --- welcome_body.tpl 14 Jun 2007 16:56:10 -0000 1.4 *************** *** 113,116 **** --- 113,120 ---- href="{U_PRIVATE_MSGS}" class="gensmall">{L_PRIVATE_MSGS}</a> <!-- END welcome_user_logged_in --> + <!-- BEGIN switch_total_pics --> + <br /><img src="{IMG_ICON_DOT}" border="0" width="5" height="5" /> <a + href="{U_YOUR_PERSONAL_GALLERY}" class="gensmall">{L_TOTAL_PICS}</a> + <!-- END switch_total_pics --> <!-- BEGIN welcome_user_logged_out --> <!-- BEGIN welcome_old --> |
|
From: OryNider <ory...@us...> - 2007-06-14 16:56:01
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21143 Modified Files: welcome.php Log Message: Added new option to welcome block to see how many pictures are in personal gallery with url. Index: welcome.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** welcome.php 14 Jun 2007 10:13:08 -0000 1.3 --- welcome.php 14 Jun 2007 16:55:58 -0000 1.4 *************** *** 88,92 **** // ------------------------------------ ! $sql = "SELECT username FROM ". USERS_TABLE ." WHERE user_id = $user_id"; --- 88,92 ---- // ------------------------------------ ! $sql = "SELECT * FROM ". USERS_TABLE ." WHERE user_id = $user_id"; *************** *** 100,116 **** $username = $row['username']; if( empty($username) ) { $username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] ); } - - // -------------------------------------------------------------------------------- - // Block Procedure - // -------------------------------------------------------------------------------- - - - // ------------------------------------ // Check Permissions --- 100,117 ---- $username = $row['username']; + $user_avatar_type = $row['user_avatar_type']; + $user_allowavatar = $row['user_allowavatar']; + $user_avatar = $row['user_avatar']; + $user_lastvisit = $row['user_lastvisit']; if( empty($username) ) { $username = ( !empty($userdata['username']) ? $userdata['username'] : $lang['Guest'] ); + $user_avatar_type = ( !empty($userdata['user_avatar_type']) ? $userdata['user_avatar_type'] : '' ); + $user_allowavatar = ( !empty($userdata['user_allowavatar']) ? $userdata['user_allowavatar'] : '' ); + $user_avatar = ( !empty($userdata['user_avatar']) ? $userdata['user_avatar'] : '' ); + $user_lastvisit = ( !empty($userdata['user_lastvisit']) ? $userdata['user_lastvisit'] : '' ); } // ------------------------------------ // Check Permissions *************** *** 166,176 **** { $avatar_img = '<img src="' . this_smartor_mxurl("smartor_mode=random_personal_thumbnail&user_id=". $user_id, TRUE) . '" alt="" border="0" />'; } ! elseif ( $userdata['user_avatar_type'] && $userdata['user_allowavatar'] ) { ! switch( $userdata['user_avatar_type'] ) { case USER_AVATAR_UPLOAD: ! $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$userdata['user_avatar'].'" alt="" border="0" />' : ''; break; case USER_AVATAR_REMOTE: --- 167,178 ---- { $avatar_img = '<img src="' . this_smartor_mxurl("smartor_mode=random_personal_thumbnail&user_id=". $user_id, TRUE) . '" alt="" border="0" />'; + $template->assign_block_vars('switch_total_pics', array()); } ! elseif ( $user_avatar_type && $user_allowavatar ) { ! switch( $user_avatar_type ) { case USER_AVATAR_UPLOAD: ! $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; break; case USER_AVATAR_REMOTE: *************** *** 183,190 **** } } ! $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$userdata['user_avatar'].'"'.$img_width.' alt="" border="0" />' : ''; break; case USER_AVATAR_GALLERY: ! $avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$userdata['user_avatar'].'" alt="" border="0" />' : ''; break; } --- 185,192 ---- } } ! $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '<img src="'.$user_avatar.'"'.$img_width.' alt="" border="0" />' : ''; break; case USER_AVATAR_GALLERY: ! $avatar_img = ( $board_config['allow_avatar_local'] ) ? '<img src="'.PHPBB_URL.$board_config['avatar_gallery_path'].'/'.$user_avatar.'" alt="" border="0" />' : ''; break; } *************** *** 227,231 **** if( $userdata['session_logged_in'] ) { ! $s_last_visit = create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']); if( $view_postcount ) --- 229,233 ---- if( $userdata['session_logged_in'] ) { ! $s_last_visit = create_date($board_config['default_dateformat'], $user_lastvisit, $board_config['board_timezone']); if( $view_postcount ) *************** *** 300,304 **** } } ! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&".$userdata['user_id']).'">'.$username.'</a>' : $lang['Guest']; if( $report_page == 0 ) --- 302,306 ---- } } ! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&".$user_id).'">'.$username.'</a>' : $lang['Guest']; if( $report_page == 0 ) *************** *** 352,355 **** --- 354,360 ---- 'U_MARK_READ' => append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"), + 'L_TOTAL_PICS' => sprintf($lang['Total_Personal_Pics'], $total_pics), + 'U_YOUR_PERSONAL_GALLERY' => append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)), + 'L_PRIVATE_MSGS' => $lang['Private_Messages'].' ('.$userdata['user_new_privmsg'].')', 'U_PRIVATE_MSGS' => append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'), |
|
From: OryNider <ory...@us...> - 2007-06-14 16:56:01
|
Update of /cvsroot/mxbb/mx_smartor/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21143/language/lang_english Modified Files: lang_main_album.php Log Message: Added new option to welcome block to see how many pictures are in personal gallery with url. Index: lang_main_album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/language/lang_english/lang_main_album.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lang_main_album.php 13 Jun 2007 18:46:44 -0000 1.8 --- lang_main_album.php 14 Jun 2007 16:55:57 -0000 1.9 *************** *** 310,313 **** --- 310,314 ---- $lang['Posts_since_last_visit'] = "Posts since last visit"; $lang['View_latest'] = "View latest"; + $lang['Total_Personal_Pics'] = "You have <b>%d</b> personal pictures."; ?> \ No newline at end of file |
2 messages has been excluded from this view by a project administrator.
