mirror of
https://github.com/e107inc/e107.git
synced 2025-08-13 10:04:35 +02:00
Menu-Manager rewrite complete, debug mode only.
This commit is contained in:
@@ -100,6 +100,8 @@ class e_menuManager {
|
||||
|
||||
$menu_array = $this->parseheader($HEADER.$FOOTER, 'check');
|
||||
|
||||
|
||||
|
||||
if($menu_array)
|
||||
{
|
||||
sort($menu_array, SORT_NUMERIC);
|
||||
@@ -204,7 +206,7 @@ class e_menuManager {
|
||||
// $cnt = $sql->select("menus", "*", "menu_location > 0 AND menu_layout = '$curLayout' ORDER BY menu_name "); // calculate height to remove vertical scroll-bar.
|
||||
|
||||
// $text = "<object class='well' type='text/html' id='menu_iframe' data='".$url."' width='100%' style='overflow:auto;width: 100%; height: ".(($cnt*90)+600)."px; border: 0px' ></object>";
|
||||
$text = "<iframe class='well' id='menu_iframe' name='e-mm-iframe' src='".$url."' width='100%' scrolling='no' style='width: 100%; height: 100vh; border: 0px' ></iframe>";
|
||||
$text = "<iframe class='well' id='menu_iframe' name='e-mm-iframe' src='".$url."' width='100%' style='width: 100%; height: 90vh; border: 0px' ></iframe>";
|
||||
|
||||
return $text;
|
||||
}
|
||||
@@ -1141,9 +1143,8 @@ class e_menuManager {
|
||||
$tp = e107::getParser();
|
||||
|
||||
|
||||
|
||||
//FIXME - XHTML cleanup, front-end standards (elist, forms etc)
|
||||
echo "<div id='portal'>";
|
||||
|
||||
// echo "<div id='portal'>";
|
||||
$this->parseheader($HEADER); // $layouts_str;
|
||||
|
||||
$layout = ($this->curLayout);
|
||||
@@ -1275,7 +1276,7 @@ class e_menuManager {
|
||||
{
|
||||
echo "<div id='debug' style='margin-left:0px;border:1px solid silver; overflow:scroll;height:250px'> </div>";
|
||||
}
|
||||
echo "</div>";
|
||||
// echo "</div>";
|
||||
}
|
||||
|
||||
|
||||
@@ -1323,6 +1324,7 @@ class e_menuManager {
|
||||
//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
|
||||
function parseheader($LAYOUT, $check = FALSE)
|
||||
{
|
||||
|
||||
// $tmp = explode("\n", $LAYOUT);
|
||||
// Split up using the same function as the shortcode handler
|
||||
$tmp = preg_split('#(\{\S[^\x02]*?\S\})#', $LAYOUT, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
|
||||
@@ -1417,12 +1419,12 @@ class e_menuManager {
|
||||
// {
|
||||
// echo "[SiteLinks]";
|
||||
// }
|
||||
elseif(strstr($str, "NAVIGATION"))
|
||||
{
|
||||
$cust = preg_replace("/\W*\{NAVIGATION(.*?)(\+.*)?\}\W*/si", "\\1", $str);
|
||||
$tp->parseTemplate("{NAVIGATION".$cust."}",true);
|
||||
// elseif(strstr($str, "NAVIGATION"))
|
||||
// {
|
||||
// $cust = preg_replace("/\W*\{NAVIGATION(.*?)(\+.*)?\}\W*/si", "\\1", $str);
|
||||
// $tp->parseTemplate("{NAVIGATION".$cust."}",true);
|
||||
// echo "<span class='label label-info'>Navigation Area</span>";
|
||||
}
|
||||
// }
|
||||
elseif(strstr($str, "ALERT"))
|
||||
{
|
||||
//echo "[Navigation Area]";
|
||||
|
Reference in New Issue
Block a user