mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Option added to set unique IDs for each tablerender() instance.

Browse Source
This commit is contained in:
Cameron
2016-11-08 19:01:26 -08:00
parent 593533298b
commit 1bed9da9ab
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
class2.php
View File

@@ -908,6 +908,7 @@ if (!class_exists('e107table', false))
private $themeClass = ''; private $themeClass = '';
private $adminThemeClass = ''; private $adminThemeClass = '';
public $frontend = null; public $frontend = null;
private $uniqueId = null;
function __construct() function __construct()
@@ -918,13 +919,23 @@ if (!class_exists('e107table', false))
/** /**
* @param $style * Set the style mode for use in tablestyle() method/function
* @param string $style
*/ */
function setStyle($style) public function setStyle($style)
{ {
$this->eSetStyle = $style; $this->eSetStyle = $style;
} }
/**
* Set a unique id for use in tablestyle() method/function
* @param string $id
*/
public function setUniqueId($id)
{
$this->uniqueId = $id;
}
/** /**
* @param $caption string caption text * @param $caption string caption text
@@ -948,6 +959,10 @@ if (!class_exists('e107table', false))
extract($result); extract($result);
} }
if ($return) if ($return)
{ {
if(!empty($text) && $this->eMenuArea) if(!empty($text) && $this->eMenuArea)
@@ -998,13 +1013,14 @@ if (!class_exists('e107table', false))
if(is_object(vartrue($thm))) if(is_object(vartrue($thm)))
{ {
$thm->tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle)); $thm->tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle));
} }
else else
{ {
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle)); tablestyle($caption, $text, $mode, array('uniqueId'=>$this->uniqueId, 'menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle));
} }
$this->uniqueId = null;
} }

5
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -507,7 +507,7 @@ class admin_shortcodes
// $text .= "</div>"; // $text .= "</div>";
$ns->setUniqueId('e-latest-list');
return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text; return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text;
} }
@@ -983,6 +983,7 @@ class admin_shortcodes
if ($pref['adminpwordchange'] && ((ADMINPWCHANGE+2592000) < time())) if ($pref['adminpwordchange'] && ((ADMINPWCHANGE+2592000) < time()))
{ {
$text = "<div style='mediumtext; text-align:center'>".ADLAN_102." <a href='".e_ADMIN."updateadmin.php'>".ADLAN_103.'</a></div>'; $text = "<div style='mediumtext; text-align:center'>".ADLAN_102." <a href='".e_ADMIN."updateadmin.php'>".ADLAN_103.'</a></div>';
$ns->setUniqueId('e-password-change');
return $ns -> tablerender(ADLAN_104, $text, '', true); return $ns -> tablerender(ADLAN_104, $text, '', true);
} }
} }
@@ -1208,7 +1209,7 @@ class admin_shortcodes
// $text .= "\n\t\t\t\t\t</div>"; // $text .= "\n\t\t\t\t\t</div>";
$ns->setUniqueId('e-status-list');
return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, '', TRUE) : $text; return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, '', TRUE) : $text;
} }
} }

2
e107_handlers/menu_class.php
View File

@@ -513,6 +513,7 @@ class e_menu
// if($template['noTableRender'] !==true) // XXX Deprecated - causes confusion while themeing. use {SETSTYLE=none} instead. // if($template['noTableRender'] !==true) // XXX Deprecated - causes confusion while themeing. use {SETSTYLE=none} instead.
// { // {
$ns->setUniqueId('cmenu-'.$page['menu_name']);
$ns->tablerender($caption, $text, 'cmenu-'.$page['menu_template']); $ns->tablerender($caption, $text, 'cmenu-'.$page['menu_template']);
// } // }
// else // else
@@ -524,6 +525,7 @@ class e_menu
else else
{ {
$text = $tp->toHTML($page['menu_text'], true, 'parse_sc, constants'); $text = $tp->toHTML($page['menu_text'], true, 'parse_sc, constants');
$ns->setUniqueId('cmenu-'.$page['menu_name']);
$ns->tablerender($caption, $text, 'cmenu'); $ns->tablerender($caption, $text, 'cmenu');
} }

3
e107_themes/bootstrap3/admin_theme.php
View File

@@ -102,6 +102,9 @@ class bootstrap3_admintheme
$style = $data['setStyle']; $style = $data['setStyle'];
// echo "Style: ".$style; // echo "Style: ".$style;
echo "\n\n<!-- UniqueID: ".$data['uniqueId']." -->\n\n";
$class = ''; $class = '';
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);