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

Plugin/Theme update check moved to admin_shortcodes

Browse Source
This commit is contained in:
Cameron
2017-02-02 11:48:13 -08:00
parent 8843752aa1
commit f7a14d29ae
8 changed files with 170 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_themes/bootstrap3/admin_dark.css
View File

@@ -38,7 +38,7 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-colo
color: black;
}
tr.first a, th a { color: rgb(102, 102, 102); }
.bootstrap-select.btn-group .dropdown-menu .optgroup-div {

3
e107_themes/bootstrap3/admin_style.css
View File

@@ -142,7 +142,10 @@ table label.checkbox { margin-left: 20px }
#admin-ui-media-manager-search { margin-bottom: 20px }
/*
.panel-default:hover { transition: color .50s ease-in-out; -moz-transition: color .50s ease-in-out; -webkit-transition: color .50s ease-in-out; color: #fff }
*/
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; padding-bottom:5px; padding-right:5px }

197
e107_themes/bootstrap3/admin_template.php
View File

@@ -157,54 +157,7 @@ $E_ADMIN_NAVIGATION['end'] = '</ul>';
$inverse = (e107::getPref('admincss') == "admin_light.css") ? "navbar-inverse" : "";
/*
$ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-nav navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand " href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.e_THEME_ABS.'bootstrap/images/e107_adminlogo.png" alt="e107" /></a>
<div class="nav-collapse collapse">
<div class="dropdown nav">
{ADMIN_NAVIGATION=no-main}
</div>
<div class="dropdown nav pull-right navbar-text ">
<li>{ADMIN_COREUPDATE=icon}</li>
{ADMIN_PM}
{ADMIN_NAVIGATION=home}
{ADMIN_NAVIGATION=language}
{ADMIN_NAVIGATION=logout}
</div>
</div><!--/.nav-collapse -->
</div>
</div>
</div>';
*/
/*
$ADMIN_MODAL = '<div id="uiModal" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-caption">&nbsp;</h4>
</div>
<div class="modal-body">
<p>Loading…</p>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
</div>
</div>';*/
// TODO - LANs
$ADMIN_MODAL = '
<div id="uiModal" class="modal fade">
<div id="admin-ui-modal" class="modal-dialog modal-lg">
@@ -226,7 +179,7 @@ $ADMIN_MODAL = '
</div>
';
// TODO - LANs
$ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
@@ -268,13 +221,17 @@ if(defset('e_PAGE') == 'admin.php' && $adminstyle == 'flexpanel' && varset($_GET
}
else
{
// TODO - LANs
$ADMIN_HEADER .= '
<div class="col-md-3 col-lg-2 admin-left-panel">
{SETSTYLE=warning}
{ADMIN_ADDON_UPDATES}
{SETSTYLE=site_info}
{ADMIN_PWORD}
{SETSTYLE=admin_menu}
{ADMIN_MENU}
{ADMIN_PWORD}
{ADMIN_MENUMANAGER}
<div class="e-scroll-fixed">
@@ -312,98 +269,11 @@ $ADMIN_FOOTER = '
</div><!--/.fluid-container-->
<footer class="center mute">
Copyright &copy; 2008-2015 e107 Inc (e107.org)<br />
Copyright &copy; 2008-2017 e107 Inc (e107.org)<br />
</footer>
';
//{FS_ADMIN_ALT_NAV}
/*
$ADMIN_HEADER = "
<div class='admin-wrapper'>
<div class='admin-header'>
<div class='admin-header-content'>
<div class='f-right'><!-- -->{ADMIN_LANG=nobutton&nomenu}</div>
{ADMIN_LOGO}
{ADMIN_LOGGED}
{ADMIN_SEL_LAN}
</div>
<div style='height: 20px;'><!-- --></div>
<div class='admin-navigation'>
<div id='nav'>{ADMIN_NAVIGATION}</div>
<div class='clear'><!-- --></div>
</div>
</div>
<div class='admin-page-body'>
<table class='main-table'>
<tr>
<td class='col-left'>
{SETSTYLE=admin_menu}
{ADMIN_MENU}
{ADMIN_MENUMANAGER}
{ADMIN_PRESET}
{ADMIN_LANG}
{SETSTYLE=none}
{ADMIN_PWORD}
{ADMIN_STATUS=request}
{ADMIN_LATEST=request}
{ADMIN_LOG=request}
{ADMIN_MSG}
{ADMIN_PLUGINS}
{ADMIN_UPDATE}
{SETSTYLE=site_info}
{ADMIN_SITEINFO}
{ADMIN_HELP}
</td>
<td>
<div class='col-main'>
<div class='inner-wrapper'>
{SETSTYLE=admin_content}
";
*/
/*
{SETSTYLE=admin_menu}
<!--
{ADMIN_NAV}
-->
{ADMIN_LANG}
{ADMIN_SITEINFO}
{ADMIN_DOCS}
*/
/*
$ADMIN_FOOTER = "
</div>
</div>
</td>
<!--
<td class='col-right'>
<div class='col-right'>
</div>
</td>
-->
</tr>
</table>
</div>
<div class='admin-footer'>
<!-- -->
</div>
</div>
";
*/
/* NEW ADMIN MENU TEMPLATE
* see function e107::getNav()->admin() in e107_admin/header.php
*/
@@ -452,53 +322,4 @@ $E_ADMIN_MENU['end'] = '
$E_ADMIN_MENU['divider'] = '<li role="separator" class="divider"></li>';
/* NEW ADMIN SLIDE DOWN MENU TEMPLATE
* see function admin_navigation() in e107_files/shortcodes/admin_navigation.php
* TODO move it together with menu.css/menu.js to the theme templates/e107_files folder (default menu render)
*/
/*
$E_ADMIN_NAVIGATION['start'] = '
<ul id="nav nav-links">
';
$E_ADMIN_NAVIGATION['button'] = '
<li>
<a class="menuButton" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_NAVIGATION['button_active'] = '
<li>
<a class="menuButton active" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_NAVIGATION['start_sub'] = '
<ul class="menu"{SUB_ID}>
';
$E_ADMIN_NAVIGATION['button_sub'] = '
<li>
<a class="menuItem{SUB_CLASS}" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_NAVIGATION['button_active_sub'] = '
<li>
<a class="menuItem{SUB_CLASS}" href="{LINK_URL}"{ONCLICK}>{LINK_IMAGE}{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_NAVIGATION['end_sub'] = '
</ul>
';
$E_ADMIN_NAVIGATION['end'] = '
</ul>
';
*/
?>
?>

15
e107_themes/bootstrap3/admin_theme.php
View File

@@ -170,6 +170,7 @@ class bootstrap3_admintheme
}
switch(varset($style, 'admin_content'))
{
@@ -185,7 +186,7 @@ class bootstrap3_admintheme
break;
case 'admin_menu':
echo '<div class="panel panel-default">
echo '<div class="panel panel-default" >
<div class="panel-heading">
<h3 class="panel-title">' . $caption . '</h3>
</div>
@@ -196,6 +197,18 @@ class bootstrap3_admintheme
break;
case 'warning':
echo '<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">' . $caption . '</h3>
</div>
<div class="panel-body">
' . $text . '
</div>
</div>';
break;
case 'core-infopanel':
case 'site_info':
echo '<div class="panel ' . $panelType[$style] . '">