mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Flexpanel status/latest menu render fixes.

Browse Source
This commit is contained in:
Cameron
2017-01-16 16:14:49 -08:00
parent 347c9f9af0
commit 2cca2373ed
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/debug_handler.php
View File

@@ -144,6 +144,9 @@ class e107_debug {
$aDVal = explode('.',$dVals); // support multiple values, OR'd together $aDVal = explode('.',$dVals); // support multiple values, OR'd together
$dVal = 0; $dVal = 0;
foreach ($aDVal as $curDVal) foreach ($aDVal as $curDVal)
{ {
if (isset($this->aDebugShortcuts[$curDVal])) if (isset($this->aDebugShortcuts[$curDVal]))
@@ -152,7 +155,7 @@ class e107_debug {
} }
else else
{ {
$dVal |= $curDVal; $dVal |= intval($curDVal);
} }
} }

4
e107_handlers/e107_class.php
View File

@@ -2778,9 +2778,11 @@ class e107
return false; return false;
} }
self::getMessage()->addDebug("Couldn't load language file: ".$path);
$path = str_replace(e_LANGUAGE, 'English', $path); $path = str_replace(e_LANGUAGE, 'English', $path);
self::getDebug()->log("Couldn't load language file: ".$path);
if(!is_readable($path)) if(!is_readable($path))
{ {
return false; return false;

11
e107_themes/bootstrap3/admin_theme.php
View File

@@ -104,6 +104,8 @@ class bootstrap3_admintheme
// echo "Style: ".$style; // echo "Style: ".$style;
echo "\n\n<!-- UniqueID: ".$data['uniqueId']." -->\n\n"; echo "\n\n<!-- UniqueID: ".$data['uniqueId']." -->\n\n";
echo "<!-- Style: ".$style." -->\n\n";
echo "<!-- Mode: ".$mode." -->";
$class = ''; $class = '';
if(is_string($mode) && $mode == 'admin_help') if(is_string($mode) && $mode == 'admin_help')
@@ -161,6 +163,13 @@ class bootstrap3_admintheme
'flexpanel' => 'panel-default', 'flexpanel' => 'panel-default',
); );
if($data['uniqueId'] === 'e-latest-list' || $data['uniqueId'] === 'e-status-list')
{
$style = 'lists';
}
switch(varset($style, 'admin_content')) switch(varset($style, 'admin_content'))
{ {
case 'flexpanel': case 'flexpanel':
@@ -188,7 +197,7 @@ class bootstrap3_admintheme
break; break;
case 'lists': case 'lists':
echo '<div class="panel panel-default"> echo '<div class="panel panel-default" id="' . $data['uniqueId'] . '">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">' . $caption . '</h3> <h3 class="panel-title">' . $caption . '</h3>
</div> </div>