mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 04:10:38 +02:00
theming options added
This commit is contained in:
40
class2.php
40
class2.php
@@ -9,9 +9,9 @@
|
|||||||
* General purpose file
|
* General purpose file
|
||||||
*
|
*
|
||||||
* $Source: /cvs_backup/e107_0.8/class2.php,v $
|
* $Source: /cvs_backup/e107_0.8/class2.php,v $
|
||||||
* $Revision: 1.124 $
|
* $Revision: 1.125 $
|
||||||
* $Date: 2009-08-10 21:59:11 $
|
* $Date: 2009-08-14 15:57:44 $
|
||||||
* $Author: marj_nl_fr $
|
* $Author: e107coders $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
//
|
//
|
||||||
@@ -882,14 +882,18 @@ if (!class_exists('e107table'))
|
|||||||
{
|
{
|
||||||
class e107table
|
class e107table
|
||||||
{
|
{
|
||||||
|
|
||||||
|
public $eMenuCount = 0;
|
||||||
|
public $eMenuArea;
|
||||||
|
|
||||||
function tablerender($caption, $text, $mode = 'default', $return = false)
|
function tablerender($caption, $text, $mode = 'default', $return = false)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
# Render style table
|
# Render style table
|
||||||
# - parameter #1: string $caption, caption text
|
# - parameter #1: string $caption, caption text
|
||||||
# - parameter #2: string $text, body text
|
# - parameter #2: string $text, body text
|
||||||
# - return null
|
# - return null
|
||||||
# - scope public
|
# - scope public
|
||||||
*/
|
*/
|
||||||
$override_tablerender = e107::getSingleton('override', e_HANDLER.'override_class.php')->override_check('tablerender');
|
$override_tablerender = e107::getSingleton('override', e_HANDLER.'override_class.php')->override_check('tablerender');
|
||||||
|
|
||||||
@@ -906,15 +910,25 @@ if (!class_exists('e107table'))
|
|||||||
|
|
||||||
if ($return)
|
if ($return)
|
||||||
{
|
{
|
||||||
|
if(!empty($text) && $this->eMenuArea)
|
||||||
|
{
|
||||||
|
$this->eMenuCount++;
|
||||||
|
}
|
||||||
ob_start();
|
ob_start();
|
||||||
tablestyle($caption, $text, $mode);
|
tablestyle($caption, $text, $mode, $this->eMenuCount);
|
||||||
$ret=ob_get_contents();
|
$ret=ob_get_contents();
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tablestyle($caption, $text, $mode);
|
if(!empty($text) && $this->eMenuArea)
|
||||||
|
{
|
||||||
|
$this->eMenuCount++;
|
||||||
|
}
|
||||||
|
tablestyle($caption, $text, $mode, $this->eMenuCount);
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1154,20 +1168,28 @@ if(!isset($_E107['no_menus']))
|
|||||||
$eMenuList = array();
|
$eMenuList = array();
|
||||||
$eMenuActive = array();
|
$eMenuActive = array();
|
||||||
$eMenuArea = array();
|
$eMenuArea = array();
|
||||||
|
// $eMenuOrder = array();
|
||||||
|
|
||||||
if(!is_array($menu_data))
|
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))
|
if ($sql->db_Select_gen($menu_qry))
|
||||||
{
|
{
|
||||||
|
$c = 1;
|
||||||
while ($row = $sql->db_Fetch())
|
while ($row = $sql->db_Fetch())
|
||||||
{
|
{
|
||||||
|
$c = ($prevloc != $row['menu_location']) ? 1 : $c;
|
||||||
$eMenuList[$row['menu_location']][] = $row;
|
$eMenuList[$row['menu_location']][] = $row;
|
||||||
$eMenuArea[$row['menu_location']][$row['menu_name']] = 1;
|
$eMenuArea[$row['menu_location']][$row['menu_name']] = 1;
|
||||||
$eMenuActive[$row['menu_name']] = $row['menu_name'];
|
$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_area'] = $eMenuArea;
|
||||||
|
// $menu_data['menu_order'] = $eMenuOrder;
|
||||||
$menu_data['menu_list'] = $eMenuList;
|
$menu_data['menu_list'] = $eMenuList;
|
||||||
$menu_data['menu_active'] = $eMenuActive;
|
$menu_data['menu_active'] = $eMenuActive;
|
||||||
$menu_data = $eArrayStorage->WriteArray($menu_data, false);
|
$menu_data = $eArrayStorage->WriteArray($menu_data, false);
|
||||||
@@ -1180,9 +1202,11 @@ if(!isset($_E107['no_menus']))
|
|||||||
$eMenuArea = $menu_data['menu_area'];
|
$eMenuArea = $menu_data['menu_area'];
|
||||||
$eMenuList = $menu_data['menu_list'];
|
$eMenuList = $menu_data['menu_list'];
|
||||||
$eMenuActive = $menu_data['menu_active'];
|
$eMenuActive = $menu_data['menu_active'];
|
||||||
|
// $eMenuOrder = $menu_data['menu_order'];
|
||||||
unset($menu_data);
|
unset($menu_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?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)
|
function menu_shortcode($parm)
|
||||||
{
|
{
|
||||||
@@ -19,6 +19,8 @@ function menu_shortcode($parm)
|
|||||||
ob_start();
|
ob_start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e107::getRender()->eMenuArea = $tmp[0];
|
||||||
|
|
||||||
foreach($eMenuList[$tmp[0]] as $row)
|
foreach($eMenuList[$tmp[0]] as $row)
|
||||||
{
|
{
|
||||||
$show_menu = TRUE;
|
$show_menu = TRUE;
|
||||||
@@ -121,6 +123,9 @@ function menu_shortcode($parm)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e107::getRender()->eMenuCount = 0;
|
||||||
|
e107::getRender()->eMenuArea = null;
|
||||||
|
|
||||||
if ($buffer_output)
|
if ($buffer_output)
|
||||||
{
|
{
|
||||||
$ret = ob_get_contents();
|
$ret = ob_get_contents();
|
||||||
|
Reference in New Issue
Block a user