1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00

Merge branch 'master' into lib

This commit is contained in:
lonalore
2017-01-26 09:46:00 +01:00
247 changed files with 7633 additions and 2239 deletions

View File

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