mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 11:20:25 +02:00
Code Issues Releases Wiki Activity

theming options added

Browse Source
This commit is contained in:
CaMer0n
2009-08-14 15:57:45 +00:00
parent 01267852c3
commit 12fca5e138
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
class2.php
View File

@@ -9,9 +9,9 @@
* General purpose file
*
* $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.124 $
* $Date: 2009-08-10 21:59:11 $
* $Author: marj_nl_fr $
* $Revision: 1.125 $
* $Date: 2009-08-14 15:57:44 $
* $Author: e107coders $
*
*/
//
@@ -882,14 +882,18 @@ if (!class_exists('e107table'))
{
class e107table
{
public $eMenuCount = 0;
public $eMenuArea;
function tablerender($caption, $text, $mode = 'default', $return = false)
{
/*
# Render style table
# - parameter #1: string $caption, caption text
# - parameter #2: string $text, body text
# - return null
# - scope public
# - return null
# - scope public
*/
$override_tablerender = e107::getSingleton('override', e_HANDLER.'override_class.php')->override_check('tablerender');
@@ -906,15 +910,25 @@ if (!class_exists('e107table'))
if ($return)
{
if(!empty($text) && $this->eMenuArea)
{
$this->eMenuCount++;
}
ob_start();
tablestyle($caption, $text, $mode);
tablestyle($caption, $text, $mode, $this->eMenuCount);
$ret=ob_get_contents();
ob_end_clean();
return $ret;
}
else
{
tablestyle($caption, $text, $mode);
if(!empty($text) && $this->eMenuArea)
{
$this->eMenuCount++;
}
tablestyle($caption, $text, $mode, $this->eMenuCount);
return '';
}
}
@@ -1154,20 +1168,28 @@ if(!isset($_E107['no_menus']))
$eMenuList = array();
$eMenuActive = array();
$eMenuArea = array();
// $eMenuOrder = array();
if(!is_array($menu_data))
{
$menu_qry = 'SELECT * FROM #menus WHERE menu_location > 0 AND menu_class IN ('.USERCLASS_LIST.') AND menu_layout = "'.$menu_layout_field.'" ORDER BY menu_order';
$menu_qry = 'SELECT * FROM #menus WHERE menu_location > 0 AND menu_class IN ('.USERCLASS_LIST.') AND menu_layout = "'.$menu_layout_field.'" ORDER BY menu_location,menu_order';
if ($sql->db_Select_gen($menu_qry))
{
$c = 1;
while ($row = $sql->db_Fetch())
{
$c = ($prevloc != $row['menu_location']) ? 1 : $c;
$eMenuList[$row['menu_location']][] = $row;
$eMenuArea[$row['menu_location']][$row['menu_name']] = 1;
$eMenuActive[$row['menu_name']] = $row['menu_name'];
// $eMenuOrder[$row['menu_location']][$row['menu_name']] = $c;
// $c++;
// $prevloc = $row['menu_location'];
}
}
$menu_data['menu_area'] = $eMenuArea;
// $menu_data['menu_order'] = $eMenuOrder;
$menu_data['menu_list'] = $eMenuList;
$menu_data['menu_active'] = $eMenuActive;
$menu_data = $eArrayStorage->WriteArray($menu_data, false);
@@ -1180,9 +1202,11 @@ if(!isset($_E107['no_menus']))
$eMenuArea = $menu_data['menu_area'];
$eMenuList = $menu_data['menu_list'];
$eMenuActive = $menu_data['menu_active'];
// $eMenuOrder = $menu_data['menu_order'];
unset($menu_data);
}
}

7
e107_files/shortcode/menu.php
View File

@@ -1,5 +1,5 @@
<?php
/* $Id: menu.php,v 1.2 2009-02-05 11:54:59 secretr Exp $ */
/* $Id: menu.php,v 1.3 2009-08-14 15:57:45 e107coders Exp $ */
function menu_shortcode($parm)
{
@@ -19,6 +19,8 @@ function menu_shortcode($parm)
ob_start();
}
e107::getRender()->eMenuArea = $tmp[0];
foreach($eMenuList[$tmp[0]] as $row)
{
$show_menu = TRUE;
@@ -121,6 +123,9 @@ function menu_shortcode($parm)
}
}
e107::getRender()->eMenuCount = 0;
e107::getRender()->eMenuArea = null;
if ($buffer_output)
{
$ret = ob_get_contents();