mirror of
https://github.com/e107inc/e107.git
synced 2025-01-17 12:48:24 +01:00
Issue #2245 Admin-area CSS cleanup.
This commit is contained in:
Cameron
parent
3307291ed9
commit
dfea8f3896
@ -25,33 +25,42 @@ if(!defined('USER_AREA'))
|
||||
{
|
||||
define("USER_AREA", FALSE);
|
||||
}
|
||||
|
||||
e107::getDb()->db_Mark_Time('(Header Top)');
|
||||
|
||||
// Admin template
|
||||
if (defined('THEME') && file_exists(THEME.'admin_template.php'))
|
||||
{
|
||||
require_once (THEME.'admin_template.php');
|
||||
}
|
||||
else
|
||||
{
|
||||
require_once (e_CORE.'templates/admin_template.php');
|
||||
}
|
||||
|
||||
if(!deftrue('e_MENUMANAGER_ACTIVE'))
|
||||
{
|
||||
|
||||
if (defined('THEME') && file_exists(THEME.'admin_template.php')) // Admin template
|
||||
{
|
||||
require_once (THEME.'admin_template.php');
|
||||
}
|
||||
else
|
||||
{
|
||||
require_once (e_CORE.'templates/admin_template.php');
|
||||
}
|
||||
|
||||
|
||||
// FIXME - remove ASAP
|
||||
if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
|
||||
{
|
||||
$threshold = (time() - ($pref['del_unv'] * 60));
|
||||
e107::getDb()->delete("user", "user_ban = 2 AND user_join < '{$threshold}' ");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function loadJSAddons()
|
||||
{
|
||||
|
||||
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu Manager inactive drop-down problem.
|
||||
if(deftrue('e_MENUMANAGER_ACTIVE'))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// e107::js('core', 'bootstrap/js/bootstrap-modal.js', 'jquery', 2); // Special Version see: https://github.com/twitter/bootstrap/pull/4224
|
||||
|
||||
|
||||
|
||||
|
||||
e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery');
|
||||
e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2);
|
||||
|
||||
@ -137,12 +146,6 @@ loadJSAddons();
|
||||
// A: Admin Defines and Links
|
||||
//
|
||||
|
||||
// FIXME - remove ASAP
|
||||
if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
|
||||
{
|
||||
$threshold = (time() - ($pref['del_unv'] * 60));
|
||||
e107::getDb()->db_Delete("user", "user_ban = 2 AND user_join < '{$threshold}' ");
|
||||
}
|
||||
|
||||
//
|
||||
// B: Send HTTP headers (these come before ANY html)
|
||||
@ -155,35 +158,13 @@ if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
|
||||
//
|
||||
// C: Send start of HTML
|
||||
//
|
||||
|
||||
// HTML 5 default.
|
||||
//if(!defined('XHTML4'))
|
||||
{
|
||||
echo "<!doctype html>\n";
|
||||
echo "<html".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " lang=\"".CORE_LC."\"" : "").">\n";
|
||||
echo "<head>\n";
|
||||
echo "<meta charset='utf-8' />\n";
|
||||
}
|
||||
/*
|
||||
else // XHTML
|
||||
{
|
||||
echo(defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
|
||||
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">\n";
|
||||
echo "
|
||||
<head>
|
||||
<meta http-equiv='content-style-type' content='text/css' />\n";
|
||||
echo(defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
|
||||
echo "<meta http-equiv='content-type' content='text/html; charset=utf-8' />\n";
|
||||
}
|
||||
*
|
||||
*/
|
||||
|
||||
echo "<!doctype html>\n";
|
||||
echo "<html".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " lang=\"".CORE_LC."\"" : "").">\n";
|
||||
echo "<head>\n";
|
||||
echo "<meta charset='utf-8' />\n";
|
||||
echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=0.8, maximum-scale=1\" />\n"; // Works better for iOS but still has some issues.
|
||||
// echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
|
||||
|
||||
echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_HEADER_04." :: ".SITENAME."</title>\n";
|
||||
|
||||
// print_a(get_included_files());
|
||||
//
|
||||
// D: Send CSS
|
||||
//
|
||||
@ -198,14 +179,9 @@ if (!isset($no_core_css) || !$no_core_css)
|
||||
}
|
||||
|
||||
|
||||
$custom = e107::getThemeGlyphs();
|
||||
foreach($custom as $val)
|
||||
{
|
||||
$e_js->otherCSS($val['path']);
|
||||
}
|
||||
|
||||
// Register Plugin specific CSS
|
||||
// DEPRECATED, use $e_js->pluginCSS('myplug', 'style/myplug.css'[, $media = 'all|screen|...']);
|
||||
|
||||
// Register Plugin specific CSS (BC)
|
||||
if (isset($eplug_css) && $eplug_css)
|
||||
{
|
||||
e107::getMessage()->addDebug('Deprecated $eplug_css method detected. Use e107::css() in an e_header.php file instead.'.print_a($eplug_css,true));
|
||||
@ -217,55 +193,60 @@ if (isset($eplug_css) && $eplug_css)
|
||||
|
||||
foreach($eplug_css as $kcss)
|
||||
{
|
||||
// echo ($kcss[0] == "<") ? $kcss : "<link rel='stylesheet' href='{$kcss}' type='text/css' />\n";
|
||||
$e_js->otherCSS($kcss);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && e107::getPref('admintheme')!='bootstrap3')
|
||||
{
|
||||
|
||||
$e_js->coreCSS('bootstrap/css/darkstrap.css');
|
||||
|
||||
}
|
||||
|
||||
//NEW - Iframe mod
|
||||
if (!deftrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss'] && !vartrue($_GET['configure']))
|
||||
{
|
||||
$css_file = file_exists(THEME.'admin_'.$pref['admincss']) ? 'admin_'.$pref['admincss'] : $pref['admincss'];
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
$e_js->themeCSS($css_file);
|
||||
|
||||
}
|
||||
elseif (isset($pref['themecss']) && $pref['themecss'])
|
||||
{
|
||||
$css_file = (file_exists(THEME.'admin_'.$pref['themecss']) && !vartrue($_GET['configure'])) ? 'admin_'.$pref['themecss'] : $pref['themecss'];
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
// $e_js->themeCSS($css_file); // Test with superhero.css for frontend bootstrap and 'dark' for backend bootstrap.
|
||||
}
|
||||
else
|
||||
{
|
||||
$css_file = (file_exists(THEME.'admin_style.css') && !vartrue($_GET['configure'])) ? 'admin_style.css' : 'style.css';
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
$e_js->themeCSS($css_file);
|
||||
}
|
||||
|
||||
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu Manager inactive drop-down problem.
|
||||
if(deftrue('e_MENUMANAGER_ACTIVE')) // load frontend style.css
|
||||
{
|
||||
$css_file = $pref['themecss'];
|
||||
$e_js->themeCSS($css_file); // Test with superhero.css for frontend bootstrap and 'dark' for backend bootstrap.
|
||||
// return;
|
||||
$e_js->themeCSS($css_file); // Test with superhero.css for frontend bootstrap and 'dark' for backend bootstrap.
|
||||
|
||||
}
|
||||
else
|
||||
else // backend css.
|
||||
{
|
||||
// $e_js->coreCSS('font-awesome/css/font-awesome.min.css');
|
||||
|
||||
$custom = e107::getThemeGlyphs();
|
||||
foreach($custom as $val)
|
||||
{
|
||||
$e_js->otherCSS($val['path']);
|
||||
}
|
||||
|
||||
//NEW - Iframe mod
|
||||
if(!deftrue('e_IFRAME') && !empty($pref['admincss']))
|
||||
{
|
||||
$css_file = file_exists(THEME.'admin_'.$pref['admincss']) ? 'admin_'.$pref['admincss'] : $pref['admincss'];
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
$e_js->themeCSS($css_file);
|
||||
|
||||
}
|
||||
elseif(isset($pref['themecss']) && $pref['themecss'])
|
||||
{
|
||||
$css_file = (file_exists(THEME.'admin_'.$pref['themecss'])) ? 'admin_'.$pref['themecss'] : $pref['themecss'];
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
// $e_js->themeCSS($css_file); // Test with superhero.css for frontend bootstrap and 'dark' for backend bootstrap.
|
||||
}
|
||||
else
|
||||
{
|
||||
$css_file = (file_exists(THEME.'admin_style.css')) ? 'admin_style.css' : 'style.css';
|
||||
//echo "<link rel='stylesheet' href='".$css_file."' type='text/css' />\n";
|
||||
$e_js->themeCSS($css_file);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// FIXME: TEXTDIRECTION compatibility CSS (marj?)
|
||||
// TODO: probably better to externalise along with some other things above
|
||||
// possibility to overwrite some CSS definition according to TEXTDIRECTION
|
||||
@ -273,14 +254,12 @@ else
|
||||
// see _blank theme for examples
|
||||
if(defined('TEXTDIRECTION') && file_exists(THEME.'/'.strtolower(TEXTDIRECTION).'.css'))
|
||||
{
|
||||
//echo '
|
||||
//<link rel="stylesheet" href="'.THEME_ABS.strtolower(TEXTDIRECTION).'.css" type="text/css" media="all" />';
|
||||
$e_js->themeCSS(strtolower(TEXTDIRECTION).'.css');
|
||||
}
|
||||
|
||||
|
||||
// --- Load plugin Header files before all CSS nad JS zones. --------
|
||||
if (vartrue($pref['e_header_list']) && is_array($pref['e_header_list']))
|
||||
if (!empty($pref['e_header_list']) && is_array($pref['e_header_list']))
|
||||
{
|
||||
foreach($pref['e_header_list'] as $val)
|
||||
{
|
||||
@ -361,11 +340,14 @@ if (!empty($eplug_js))
|
||||
}
|
||||
|
||||
//FIXME - theme.js/user.js should be registered/rendered through e_jsmanager
|
||||
// BC Fix.
|
||||
if (file_exists(THEME.'theme.js'))
|
||||
{
|
||||
e107::js('theme','theme.js',null,3);
|
||||
// echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n";
|
||||
}
|
||||
|
||||
|
||||
if (is_readable(e_FILE.'user.js') && filesize(e_FILE.'user.js'))
|
||||
{
|
||||
echo "<script type='text/javascript' src='".e_FILE_ABS."user.js'></script>\n";
|
||||
@ -410,8 +392,7 @@ if (!USER && ($pref['user_tracking'] == "session") && varset($pref['password_CHA
|
||||
}
|
||||
|
||||
|
||||
//XXX - do we still need it? Now we have better way of doing this - admin tools (see below)
|
||||
if (function_exists('headerjs'))
|
||||
if (function_exists('headerjs'))// required for BC.
|
||||
{
|
||||
echo headerjs();
|
||||
}
|
||||
|
||||
@ -25,16 +25,19 @@ if(isset($_GET['configure']))
|
||||
@ini_set('display_errors', 0);
|
||||
error_reporting(0);
|
||||
|
||||
define('e_MENUMANAGER_ACTIVE', true);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
define('e_ADMIN_AREA', true);
|
||||
define('e_MENUMANAGER_ACTIVE', false);
|
||||
}
|
||||
|
||||
require_once("../class2.php");
|
||||
|
||||
|
||||
if(empty($_GET['configure']) )
|
||||
if(e_MENUMANAGER_ACTIVE === false )
|
||||
{
|
||||
if(e_DEBUG_MENUMANAGER === true)
|
||||
{
|
||||
@ -53,7 +56,7 @@ if(empty($_GET['configure']) )
|
||||
{
|
||||
e107::js('footer-inline',"
|
||||
|
||||
$('#menu_iframe').attr('scrolling','no');
|
||||
$('#menu_iframe').attr('scrolling','no');
|
||||
$('#menu_iframe').load(function() {
|
||||
// $('#menu_iframe').bind('load', function() {
|
||||
|
||||
@ -70,6 +73,46 @@ if(empty($_GET['configure']) )
|
||||
|
||||
}
|
||||
|
||||
e107::css('inline',"
|
||||
|
||||
.menu-manager-items { padding-right:15px}
|
||||
.menu-manager-items div.item { padding:5px; margin:5px 0; border:1px solid rgba(255,255,255,0.3); border-radius:3px; cursor: move }
|
||||
.menu-manager-sticky {
|
||||
position: fixed;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
left: 0;
|
||||
top: 60px;
|
||||
z-index: 100;
|
||||
border-top: 0;
|
||||
-moz-transition: fadeIn .4s;
|
||||
-o-transition: fadeIn .4s;
|
||||
-webkit-transition: fadeIn .4s;
|
||||
transition: fadeIn .4s;
|
||||
}
|
||||
|
||||
|
||||
.menu-selector ul li {
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
padding: 5px 30px;
|
||||
padding-right:2px;
|
||||
margin-bottom:2px;
|
||||
}
|
||||
|
||||
.menu-selector ul li:nth-child(odd){ background-color:rgba(0,0,0,0.2) }
|
||||
|
||||
.menu-selector { height:330px; display:block; padding-bottom:50px; overflow-y:scroll; margin-bottom:10px }
|
||||
|
||||
.menu-selector input:checked + span { color: white; }
|
||||
|
||||
@media all and (min-height: 1000px) {
|
||||
|
||||
.menu-selector { height:550px }
|
||||
}
|
||||
|
||||
ul.dropdown-menu.e-mm-selector { padding: 10px; margin-top: -2px; margin-right:-2px; }
|
||||
|
||||
");
|
||||
|
||||
}
|
||||
|
||||
@ -82,60 +125,19 @@ if (!getperms("2"))
|
||||
exit;
|
||||
}
|
||||
|
||||
define('e_DEBUG', false);
|
||||
|
||||
|
||||
|
||||
e107::coreLan('menus', true);
|
||||
e107::coreLan('admin', true);
|
||||
|
||||
e107::css('inline',"
|
||||
|
||||
|
||||
|
||||
.menu-manager-items { padding-right:15px}
|
||||
.menu-manager-items div.item { padding:5px; margin:5px 0; border:1px solid rgba(255,255,255,0.3); border-radius:3px; cursor: move }
|
||||
.menu-manager-sticky {
|
||||
position: fixed;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
left: 0;
|
||||
top: 60px;
|
||||
z-index: 100;
|
||||
border-top: 0;
|
||||
-moz-transition: fadeIn .4s;
|
||||
-o-transition: fadeIn .4s;
|
||||
-webkit-transition: fadeIn .4s;
|
||||
transition: fadeIn .4s;
|
||||
}
|
||||
|
||||
|
||||
.menu-selector ul li {
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
padding: 5px 30px;
|
||||
padding-right:2px;
|
||||
margin-bottom:2px;
|
||||
}
|
||||
|
||||
.menu-selector ul li:nth-child(odd){ background-color:rgba(0,0,0,0.2) }
|
||||
|
||||
.menu-selector { height:330px; display:block; padding-bottom:50px; overflow-y:scroll; margin-bottom:10px }
|
||||
|
||||
.menu-selector input:checked + span { color: white; }
|
||||
|
||||
@media all and (min-height: 1000px) {
|
||||
|
||||
.menu-selector { height:550px }
|
||||
}
|
||||
|
||||
ul.dropdown-menu.e-mm-selector { padding: 10px; margin-top: -2px; margin-right:-2px; }
|
||||
|
||||
");
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(strpos(e_QUERY, 'configure') !== FALSE || vartrue($_GET['enc']))
|
||||
|
||||
if(e_MENUMANAGER_ACTIVE === true || vartrue($_GET['enc']))
|
||||
{
|
||||
|
||||
|
||||
@ -303,7 +305,25 @@ TEMPL;
|
||||
.portlet-content { padding: 7px; }
|
||||
.ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; height: 50px !important; }
|
||||
.ui-sortable-placeholder * { visibility: hidden; }
|
||||
|
||||
|
||||
i.S16 {
|
||||
background: url(".e_THEME."bootstrap3/images/adminicons_16.png) no-repeat top left;
|
||||
display:inline-block;
|
||||
width:17px;
|
||||
height:16px;
|
||||
*margin-right: .3em;
|
||||
line-height: 14px;
|
||||
vertical-align: text-top;
|
||||
}
|
||||
|
||||
i.e-search-16 { background-position: -1344px 0; width: 16px; height: 16px; }
|
||||
i.e-delete-16 { background-position: -525px 0; width: 16px; height: 16px; }
|
||||
i.e-configure-16 { background-position: -378px 0; width: 16px; height: 16px; }
|
||||
i.e-edit-16 { background-position: -609px 0; width: 16px; height: 16px; }
|
||||
|
||||
|
||||
|
||||
|
||||
[class^='icon-'], [class*=' icon-'] {
|
||||
display: inline-block;
|
||||
width: 14px;
|
||||
@ -498,8 +518,8 @@ TEMPL;
|
||||
",'jquery');
|
||||
|
||||
|
||||
e107::js('footer',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js");
|
||||
e107::css('url', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css");
|
||||
// e107::js('footer',"http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js");
|
||||
// e107::css('url', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css");
|
||||
|
||||
e107::js('footer-inline','
|
||||
$(function()
|
||||
@ -526,7 +546,7 @@ TEMPL;
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
||||
$(".sortable").sortable({
|
||||
connectWith: $("#area-1,#area-2,#area-3,#area-4,#area-5"),
|
||||
@ -542,12 +562,14 @@ TEMPL;
|
||||
});
|
||||
|
||||
|
||||
/*
|
||||
|
||||
|
||||
$( ".draggable", window.top.document).click(function()
|
||||
{
|
||||
alert("hi there");
|
||||
});*/
|
||||
});
|
||||
|
||||
|
||||
|
||||
// http://jsfiddle.net/DT764/2/
|
||||
|
||||
@ -571,7 +593,7 @@ TEMPL;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
*/
|
||||
// $( "ul, li", window.top.document ).disableSelection();
|
||||
|
||||
|
||||
@ -633,7 +655,7 @@ else
|
||||
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -1744,15 +1766,6 @@ class e_layout
|
||||
//include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
|
||||
|
||||
|
||||
// FIXME - quick temporarry fix for missing icons on menu administration. We need different core style to be included (forced) here - e.g. e107_web/css/admin/sprite.css
|
||||
if(e_IFRAME) //<-- Check config and delete buttons if modifying
|
||||
{
|
||||
|
||||
//e107::js('core','bootstrap/js/bootstrap.min.js');
|
||||
//e107::css('core','bootstrap/css/bootstrap.min.css');
|
||||
e107::css('url','{e_THEME}/bootstrap3/admin_style.css');
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user