Changeset 21 for branches

Timestamp:

02/10/09 10:58:57 (3 years ago)

Author:

daris

Message:

portal: fixes for panels on all pages option

Location:

branches/portal_by_daris

Files:

• manifest.xml (modified) (4 diffs)
• panels.php (modified) (2 diffs)

branches/portal_by_daris/manifest.xml

@@ -60 +60 @@
                 ]]></hook>
 
+                <hook id="vt_qpost_output_start"><![CDATA[
+
+if ($forum_config['o_portal_panels_all_pages'] == 1)
+        echo '<div>'."\n\t".'<p></p>'."\n".'</div>';
+
+                ]]></hook>
+
                 <hook id="hd_head"><![CDATA[
 // hd_head hook could be executed from a function (like message), so we need to globalize language variable
@@ -84 +91 @@
 
 
-if (!defined('FORUM_PORTAL') && $forum_config['o_portal_panels_all_pages'] == 1 && strpos(FORUM_PAGE, 'admin-') === false && FORUM_PAGE != 'message')
+if (!defined('FORUM_PORTAL') && $forum_config['o_portal_panels_all_pages'] == 1 && strpos(FORUM_PAGE, 'profile-') === false && strpos(FORUM_PAGE, 'admin-') === false && FORUM_PAGE != 'message')
         define('FORUM_PORTAL', $ext_info['path'].'/');
 
@@ -91 +98 @@
         $forum_head['style_portal'] = '<link rel="stylesheet" type="text/css" media="screen" href="'. $ext_info['url'].'/style/style.css" />';
 
+        $tpl_main = str_replace('<!-- forum_crumbs_top -->', '', $tpl_main);
         $tpl_main = str_replace('<!-- forum_crumbs_end -->', '', $tpl_main);
-        
+
         // add portal_top before forum_main
-        $tpl_main = str_replace('<!-- forum_main_menu -->', '<!-- portal_top -->'."\n".'<!-- forum_main_menu -->', $tpl_main);
+        $tpl_main = str_replace('<div id="brd-main">', '<!-- forum_crumbs_top -->'."\n".'<!-- portal_top -->'."\n".'<div id="brd-main">', $tpl_main);
         
 /*      if (FORUM_PAGE == 'news' || FORUM_PAGE == 'pages')
@@ -100 +108 @@
         */
         // add portal_bottom before forum_stats
-        $tpl_main = str_replace('<!-- forum_qpost -->', '<!-- forum_qpost -->'."\n".'<!-- portal_bottom -->'."\n".'<!-- forum_crumbs_end -->', $tpl_main);
+        $tpl_main = str_replace('<!-- forum_info -->', "\n".'<!-- portal_bottom -->'."\n".'<!-- forum_crumbs_end -->'."\n".'<!-- forum_info -->', $tpl_main);
         
         

branches/portal_by_daris/panels.php

@@ -29 +29 @@
                 foreach ($panels as $cur_panel)
                 {
-                        if ($left_width == 0 && $location == 0 || $right_width == 0 && $location == 3 || FORUM_PAGE == 'pages' && $location == 3)
+                        if ($left_width == 0 && $location == 0 || $right_width == 0 && $location == 3 || FORUM_PAGE == 'pages' && $location == 3 || $forum_config['o_portal_panels_all_pages'] == 1 && $location == 3)
                                 continue;
                         
@@ -98 +98 @@
 
         $tpl_temp .= "\n".'<div style="clear: both"></div>';
-
         $tpl_main = str_replace('<!-- portal_bottom -->', $tpl_temp, $tpl_main);