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

Fix for infopanel-menus.

Browse Source
This commit is contained in:
lonalore
2016-11-07 15:56:47 +01:00
parent 93c52da3e4
commit a69a3d7682
4 changed files with 120 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_admin/includes/flexpanel.php
View File

@@ -66,11 +66,16 @@ class adminstyle_flexpanel extends adminstyle_infopanel
// "Help" box. // "Help" box.
$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=site_info}{ADMIN_HELP}', true, $admin_sc); $tp->parseTemplate("{SETSTYLE=flexpanel}");
$panels['Area01'] .= $tp->parseTemplate('{ADMIN_HELP}', true, $admin_sc);
// "Latest" box. // "Latest" box.
$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=admin_menu}{ADMIN_LATEST=infopanel}', true, $admin_sc); $tp->parseTemplate("{SETSTYLE=flexpanel}");
$panels['Area01'] .= $tp->parseTemplate('{ADMIN_LATEST=infopanel}', true, $admin_sc);
// "Status" box. // "Status" box.
$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=admin_menu}{ADMIN_STATUS=infopanel}', true, $admin_sc); $tp->parseTemplate("{SETSTYLE=flexpanel}");
$panels['Area01'] .= $tp->parseTemplate('{ADMIN_STATUS=infopanel}', true, $admin_sc);
// --------------------- Personalized Panel ----------------------- // --------------------- Personalized Panel -----------------------
@@ -95,7 +100,9 @@ class adminstyle_flexpanel extends adminstyle_infopanel
); );
$user_pref['core-infopanel-mye107'] = vartrue($pref['core-infopanel-default'], $defArray); $user_pref['core-infopanel-mye107'] = vartrue($pref['core-infopanel-default'], $defArray);
} }
$tp->parseTemplate("{SETSTYLE=core-infopanel}");
$tp->parseTemplate("{SETSTYLE=flexpanel}");
$mainPanel = "<div id='core-infopanel_mye107'>"; $mainPanel = "<div id='core-infopanel_mye107'>";
$mainPanel .= "<div class='left'>"; $mainPanel .= "<div class='left'>";
foreach($this->iconlist as $key => $val) foreach($this->iconlist as $key => $val)
@@ -107,9 +114,11 @@ class adminstyle_flexpanel extends adminstyle_infopanel
} }
$mainPanel .= "</div></div>"; $mainPanel .= "</div></div>";
// Rendering the saved configuration. // Rendering the saved configuration.
$tp->parseTemplate("{SETSTYLE=core-infopanel}");
$tp->parseTemplate("{SETSTYLE=flexpanel}");
$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME)); $caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
$coreInfoPanelMyE107 = $ns->tablerender($caption, $mainPanel, "core-infopanel_mye107", true); $coreInfoPanelMyE107 = $ns->tablerender($caption, $mainPanel, "core-my-e107", true);
$panels['Area07'] .= $coreInfoPanelMyE107; $panels['Area07'] .= $coreInfoPanelMyE107;
@@ -119,17 +128,17 @@ class adminstyle_flexpanel extends adminstyle_infopanel
$newsTabs['pluginFeed'] = array('caption' => LAN_PLUGIN, 'text' => "<div id='e-adminfeed-plugin'></div>"); $newsTabs['pluginFeed'] = array('caption' => LAN_PLUGIN, 'text' => "<div id='e-adminfeed-plugin'></div>");
$newsTabs['themeFeed'] = array('caption' => LAN_THEMES, 'text' => "<div id='e-adminfeed-theme'></div>"); $newsTabs['themeFeed'] = array('caption' => LAN_THEMES, 'text' => "<div id='e-adminfeed-theme'></div>");
$coreInfoPanelNews = $ns->tablerender(LAN_LATEST_e107_NEWS, e107::getForm()->tabs($newsTabs, array('active' => 'coreFeed')), "core-infopanel_news", true); $coreInfoPanelNews = $ns->tablerender(LAN_LATEST_e107_NEWS, e107::getForm()->tabs($newsTabs, array('active' => 'coreFeed')), "core-e107-news", true);
$panels['Area08'] .= $coreInfoPanelNews; $panels['Area08'] .= $coreInfoPanelNews;
// --------------------- Website Status --------------------------- // --------------------- Website Status ---------------------------
$coreInfoPanelWebsiteStatus = $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(), "", true); $coreInfoPanelWebsiteStatus = $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(), "core-website-status", true);
$panels['Area08'] .= $coreInfoPanelWebsiteStatus; $panels['Area08'] .= $coreInfoPanelWebsiteStatus;
// --------------------- Latest Comments -------------------------- // --------------------- Latest Comments --------------------------
$panels['Area01'] .= $this->renderLatestComments(); // $panels['Area01'] .= $this->renderLatestComments(); // TODO
// --------------------- User Selected Menus ---------------------- // --------------------- User Selected Menus ----------------------
@@ -137,7 +146,16 @@ class adminstyle_flexpanel extends adminstyle_infopanel
{ {
foreach($user_pref['core-infopanel-menus'] as $val) foreach($user_pref['core-infopanel-menus'] as $val)
{ {
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); // Custom menu.
if(is_numeric($val))
{
$inc = e107::getMenu()->renderMenu($val, null, null, true);
}
else
{
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
}
$panels['Area01'] .= $inc; $panels['Area01'] .= $inc;
} }
} }

42
e107_admin/includes/infopanel.php
View File

@@ -259,14 +259,21 @@ class adminstyle_infopanel
// --------------------- User Selected Menus ------------------- // --------------------- User Selected Menus -------------------
if (varset($pref['core-infopanel-menus'])) if(varset($user_pref['core-infopanel-menus']))
{ {
foreach ($pref['core-infopanel-menus'] as $val) foreach($user_pref['core-infopanel-menus'] as $val)
{ {
$id = $frm->name2id('core-infopanel_'.$val); // Custom menu.
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); if(is_numeric($val))
{
$inc = e107::getMenu()->renderMenu($val, null, null, true);
}
else
{
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
}
$text .= $inc; $text .= $inc;
// $text .= $ns->tablerender("", $inc, $id,true);
} }
} }
@@ -670,26 +677,33 @@ class adminstyle_infopanel
} }
$frm = e107::getForm(); $frm = e107::getForm();
$pref = e107::getPref(); global $user_pref;
$text = "<div style='padding-left:20px'>"; $text = "<div style='padding-left:20px'>";
$menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name'; $menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name';
$settings = varset($pref['core-infopanel-menus'],array()); $settings = varset($user_pref['core-infopanel-menus'],array());
if (e107::getDb()->gen($menu_qry)) if (e107::getDb()->gen($menu_qry))
{ {
while ($row = e107::getDb()->db_Fetch()) while ($row = e107::getDb()->db_Fetch())
{ {
// if(!is_numeric($row['menu_path'])) // Custom menu.
if(is_numeric($row['menu_path']))
{ {
$label = str_replace("_menu","",$row['menu_name']); $path_to_menu = $row['menu_path'];
$path_to_menu = $row['menu_path'].$row['menu_name'];
$checked = ($settings && in_array($path_to_menu, $settings)) ? true : false;
$text .= "\n<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>";
$text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked);
$text .= "</div>";
} }
// Plugin menu.
else
{
$path_to_menu = $row['menu_path'].$row['menu_name'];
}
$label = str_replace("_menu","",$row['menu_name']);
$checked = ($settings && in_array($path_to_menu, $settings)) ? true : false;
$text .= "\n<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>";
$text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked);
$text .= "</div>";
} }
} }

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

@@ -405,7 +405,7 @@ class admin_shortcodes
if(isset($params['nomenu'])) { return $select; } if(isset($params['nomenu'])) { return $select; }
if($select) { $text .= "<div class='center'>{$select}</div>"; } if($select) { $text .= "<div class='center'>{$select}</div>"; }
return $ns->tablerender(UTHEME_MENU_L2, $text, '', true); return $ns->tablerender(UTHEME_MENU_L2, $text, 'core-menu-lang', true);
} }
@@ -507,7 +507,7 @@ class admin_shortcodes
// $text .= "</div>"; // $text .= "</div>";
return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text; return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, 'core-menu-latest', TRUE) : $text;
} }
} }
@@ -1208,7 +1208,7 @@ class admin_shortcodes
// $text .= "\n\t\t\t\t\t</div>"; // $text .= "\n\t\t\t\t\t</div>";
return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, '', TRUE) : $text; return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, 'core-menu-status', TRUE) : $text;
} }
} }

146
e107_themes/bootstrap3/admin_theme.php
View File

@@ -101,10 +101,12 @@ class bootstrap3_admintheme
$style = $data['setStyle']; $style = $data['setStyle'];
// echo "Style: ".$style;
$class = ''; $class = '';
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); if(is_string($mode) && $mode == 'admin_help')
{
$class = ' ' . str_replace('_', '-', $mode);
}
if($mode == 'e_help') if($mode == 'e_help')
{ {
@@ -113,70 +115,30 @@ class bootstrap3_admintheme
if($mode == 'core-infopanel_latest' || $mode == 'core-infopanel_status') if($mode == 'core-infopanel_latest' || $mode == 'core-infopanel_status')
{ {
//return; echo '<!-- Start Mode: ' . $mode . ' -->
echo ' <div class="well" style="padding:10px;min-height:220px;">
<!-- Start Mode: '.$mode.' --> <div class="nav-header">' . $caption . '</div>
<div class="well" style="padding:10px;min-height:220px;" >
<div class="nav-header">'.$caption.'</div>
<!-- Content Start --> <!-- Content Start -->
'.$text.' ' . $text . '
<!-- Content End --> <!-- Content End -->
</div> </div>
<!-- End Mode: ' . $mode . ' -->
<!-- End Mode: '.$mode.' -->
'; ';
return; return;
} }
if($mode == 'personalize') if($mode == 'personalize')
{ {
/*echo '
<!-- Mode: '.$mode.' -->
<div class="well" style="padding:10px">
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
<!-- End Mode: '.$mode.' -->
';*/
$style = 'admin_menu'; $style = 'admin_menu';
// return;
} }
/*
if($style == 'core-infopanel')
{
echo '
<!-- Start Style: '.$style.' -->
<li class="span12 col-md-12">
<div class="well" >
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
</li>
<!-- End Style: '.$style.' -->
';
return;
}
*/
if(deftrue('e_IFRAME')) if(deftrue('e_IFRAME'))
{ {
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' and iFrame active --> echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' and iFrame active -->
<div class="block"> <div class="block">
<div class="block-text"> <div class="block-text">
'.$text.' ' . $text . '
</div> </div>
</div> </div>
'; ';
@@ -189,80 +151,60 @@ class bootstrap3_admintheme
$style = 'no_caption'; $style = 'no_caption';
} }
$panelType = array('core-infopanel'=>'panel-default','admin_menu'=>'panel-primary', 'site_info'=>'panel-default'); $panelType = array(
'core-infopanel' => 'panel-default',
'admin_menu' => 'panel-primary',
'site_info' => 'panel-default',
'flexpanel' => 'panel-default',
);
switch(varset($style, 'admin_content')) switch(varset($style, 'admin_content'))
{ {
case 'core-infopanel' : case 'flexpanel':
case 'admin_menu' : echo '<div class="panel ' . $panelType[$style] . '" id="' . $mode . '">
case 'site_info' :
echo '<div class="panel '.$panelType[$style].'">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">'.$caption.'</h3> <h3 class="panel-title">' . $caption . '</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
'.$text.' ' . $text . '
</div> </div>
</div>'; </div>';
break;
/* case 'core-infopanel':
echo ' case 'admin_menu':
<div class="well sidebar-nav" > case 'site_info':
<div class="nav-header">'.$caption.'</div> echo '<div class="panel ' . $panelType[$style] . '">
'.$text.' <div class="panel-heading">
</div> <h3 class="panel-title">' . $caption . '</h3>
'; </div>
**/ <div class="panel-body">
break; ' . $text . '
</div>
</div>';
break;
/*case 'site_info' : case 'no_caption':
echo ' echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' -->
<div class="panel panel-primary" >
<div class="panel-heading">'.$caption.'</div>
<p style="padding:10px">
'.$text.'
</p>
</div>
';
break;*/
/*
case 'admin_content':
echo '
<div class="block"> <div class="block">
<h2 class="caption">'.$caption.'</h2>
<div class="block-text"> <div class="block-text">
'.$text.' ' . $text . '
</div> </div>
</div> </div>
'; ';
break; break;
*/
case 'no_caption' :
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' -->
<div class="block">
<div class="block-text">
'.$text.'
</div>
</div>
';
break;
default: default:
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' --> echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' -->
<div class="block"> <div class="block">
<h4 class="caption">'.$caption.'</h4> <h4 class="caption">' . $caption . '</h4>
<div class="block-text"> <div class="block-text">
'.$text.' ' . $text . '
</div> </div>
</div> </div>
'; ';
break; break;
} }
} }
} }