From: Dariush M. <dm...@us...> - 2005-11-30 16:36:46
|
Update of /cvsroot/gallery/integration/gallery2/phpBB2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29966 Modified Files: ChangeLog Readme.html gallery2.php Log Message: 2005-11-30 Dariush Molavi <da...@nu...> * Fix: Moved Gallery's CSS and javascript to overall_header.tpl (Scott Gregory). This should fix the funky font issues. Index: Readme.html =================================================================== RCS file: /cvsroot/gallery/integration/gallery2/phpBB2/Readme.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Readme.html 29 Nov 2005 18:21:47 -0000 1.8 +++ Readme.html 30 Nov 2005 16:36:38 -0000 1.9 @@ -439,6 +439,17 @@ # #-----[ FIND ]------------------------------------------ +# +<link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css"> + +# +#-----[ AFTER, ADD ]------------------------------------------ +# +{GALLERY2_CSS} +{GALLERY2_JAVASCRIPT} + +# +#-----[ FIND ]------------------------------------------ # <img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a>&nbsp; Index: gallery2.php =================================================================== RCS file: /cvsroot/gallery/integration/gallery2/phpBB2/gallery2.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gallery2.php 3 Nov 2005 14:40:32 -0000 1.2 +++ gallery2.php 30 Nov 2005 16:36:38 -0000 1.3 @@ -29,7 +29,7 @@ define('IN_PHPBB', true); $phpbb_root_path = './'; include($phpbb_root_path . 'extension.inc'); -include($phpbb_root_path . 'common.'.$phpEx); +include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'g2helper.inc'); // @@ -41,52 +41,46 @@ // End session management // - -$template->set_filenames(array( 'body' => 'gallery2.tpl')); - $g2h = new g2helper($db); $g2h->init($userdata); - GalleryCapabilities::set('showSidebarBlocks', true); $g2data = GalleryEmbed::handleRequest(); -if ($g2data['isDone']) { - exit; // Gallery 2 has already sent output (redirect or binary data) -} +if ($g2data['isDone']) exit; +// Gallery 2 has already sent output (redirect or binary data) // // Lets build a page ... // -$page_title = "Gallery 2"; -include($phpbb_root_path . 'includes/page_header.'.$phpEx); - -// Use $g2data['headHtml'] and $g2data['bodyHtml'] -// to display Gallery 2 content inside embedding application -// if you don't want to use $g2data['headHtml'] directly, you can get the css, -// javascript and page title separately by calling... -if (isset($g2data['headHtml'])) { +if (isset($g2data['headHtml'])) { list($title, $css, $javascript) = GalleryEmbed::parseHead($g2data['headHtml']); } -foreach($css as $stylesheet) { - $links .= $stylesheet."\n"; +$page_title = $title; + +foreach ($css as $stylesheet) { + $links .= $stylesheet . "\n"; } -foreach($javascript as $js) { - $jlink .= $js."\n"; +foreach ($javascript as $js) { + $jlink .= $js . "\n"; } $bodyHtml = $g2data['bodyHtml']; +$template->set_filenames(array('body' => 'gallery2.tpl')); + $template->assign_vars(array( - 'BODY' => $bodyHtml, - 'CSS' => $links, - 'JAVASCRIPT' => $jlink)); + 'GALLERY2_BODY' => $bodyHtml, + 'GALLERY2_CSS' => $links, + 'GALLERY2_JAVASCRIPT' => $jlink)); + +include($phpbb_root_path . 'includes/page_header.' . $phpEx); $template->pparse('body'); -include($phpbb_root_path . 'includes/page_tail.'.$phpEx); +include($phpbb_root_path . 'includes/page_tail.' . $phpEx); -?> +?> \ No newline at end of file Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/integration/gallery2/phpBB2/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChangeLog 29 Nov 2005 18:21:47 -0000 1.11 +++ ChangeLog 30 Nov 2005 16:36:38 -0000 1.12 @@ -1,3 +1,7 @@ +2005-11-30 Dariush Molavi <da...@nu...> + * Fix: Moved Gallery's CSS and javascript to overall_header.tpl + (Scott Gregory). This should fix the funky font issues. + 2005-11-29 Dariush Molavi <da...@nu...> * Update: Added notices in Readme regarding integrated rewrites and suggested Gallery 2 installation locations. |