mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-01 18:32:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into lib

Browse Source
This commit is contained in:
lonalore
2017-01-26 09:46:00 +01:00
parent 8b7631995e 5c3ce83168
commit 7ef1d13b35
247 changed files with 7633 additions and 2239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_themes/bootstrap3/admin_dark.css
View File

@@ -66,6 +66,9 @@ select:invalid:focus {
box-shadow: 0px 1px 1px 0px rgba(255, 0, 0, 0.75) inset;
}
.admin-icon-debug i { color: #f89406; margin-right:10px; cursor:help}
/*
.bootstrap-select, bootstrap-select button

2
e107_themes/bootstrap3/admin_style.css
View File

@@ -1305,7 +1305,7 @@ td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717);
.navbar-nav > li > a.admin-icon-avatar { padding-top: 11px; padding-bottom: 10px;}

14
e107_themes/bootstrap3/admin_template.php
View File

@@ -48,7 +48,7 @@ $E_ADMIN_NAVIGATION['button_active'] = '
// Leave Admin Area.
$E_ADMIN_NAVIGATION['button_home'] = '
$E_ADMIN_NAVIGATION['button_enav_home'] = '
<li class="dropdown">
<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
{LINK_IMAGE} {LINK_TEXT}
@@ -60,7 +60,7 @@ $E_ADMIN_NAVIGATION['button_home'] = '
';
// Change Language
$E_ADMIN_NAVIGATION['button_language'] = '
$E_ADMIN_NAVIGATION['button_enav_language'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
@@ -83,9 +83,9 @@ $E_ADMIN_NAVIGATION['button_language'] = '
// Logout / Settings / Personalize
$E_ADMIN_NAVIGATION['button_logout'] = '
$E_ADMIN_NAVIGATION['button_enav_logout'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
<a class="dropdown-toggle admin-icon-avatar " title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b>
</a>
@@ -244,9 +244,9 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar-collapse collapse">
{ADMIN_NAVIGATION=no-main}
<div>
{ADMIN_NAVIGATION=logout}
{ADMIN_NAVIGATION=language}
{ADMIN_NAVIGATION=home}
{ADMIN_NAVIGATION=enav_logout}
{ADMIN_NAVIGATION=enav_language}
{ADMIN_NAVIGATION=enav_home}
{ADMIN_PM}
{ADMIN_DEBUG}
{ADMIN_UPDATE}

11
e107_themes/bootstrap3/admin_theme.php
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>

2
e107_themes/bootstrap3/theme.xml
View File

@@ -2,7 +2,7 @@
<e107Theme name="Bootstrap 3" version="1.0" date="2013-12-25" compatibility="2.0">
<author name ="e107 Inc" email="e107inc@something.com" url="http://e107.org" />
<summary>Bootstrap3 e107 theme</summary>
<description>a bootstrap 3 theme for the frontend</description>
<description>a simple bootstrap 3 template for the frontend</description>
<category>generic</category>
<plugins>
<plugin name='featurebox' url='core' />

2
e107_themes/bootstrap3/theme_shortcodes.php
View File

@@ -86,7 +86,7 @@ class theme_shortcodes extends e_shortcode
return '';
}
include_lan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php");
e107::includeLan(e_PLUGIN."login_menu/languages/".e_LANGUAGE.".php");
$tp = e107::getParser();
require(e_PLUGIN."login_menu/login_menu_shortcodes.php"); // don't use 'require_once'.