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

Moved library loading into class2. Fixes Fontawesome not loading early enough when added via theme.xml (with forum and possibly other parts of e107). Added the FONTAWESOME constant to Paths/Variables debug output.

Browse Source
This commit is contained in:
Cameron
2019-04-11 10:47:50 -07:00
parent 0ac0ab0b21
commit f148e20837
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
class2.php
View File

@@ -1374,6 +1374,15 @@ if(!defined("THEME_LAYOUT"))
unset($cusPageDef,$lyout,$cusPagePref,$menus_equery,$deflayout); unset($cusPageDef,$lyout,$cusPagePref,$menus_equery,$deflayout);
} }
// Load library dependencies.
if(deftrue('e_ADMIN_AREA'))
{
e107::getTheme('current', true)->loadLibrary();
}
else
{
e107::getTheme('current')->loadLibrary();
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

43
e107_admin/header.php
View File

@@ -91,8 +91,6 @@ function loadJSAddons()
} }
} }
// Load library dependencies.
e107::getTheme('current', true)->loadLibrary();
// Load other JS files. // Load other JS files.
loadJSAddons(); loadJSAddons();
@@ -497,26 +495,26 @@ echo "</head>
echo getModal(); echo getModal();
echo getAlert(); echo getAlert();
function getModal($caption = '', $type='') function getModal()
{
if(deftrue('BOOTSTRAP')) // see bootstrap3/admin_template.php
{ {
return '';
}
if(deftrue('BOOTSTRAP')) // see bootstrap3/admin_template.php if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable
{ {
return ''; return null;
} }
/*
if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable if(e_PAGE == "image.php")
{ {
return; return;
} }
*/
if(e_PAGE == "image.php") return '
{
// return;
}
return '
<div id="uiModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"> <div id="uiModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
@@ -537,16 +535,11 @@ echo getAlert();
</div> </div>
</div>'; </div>';
} }
function getAlert($caption='') function getAlert()
{ {
// style="box-shadow:0px 15px 8px #000;width:300px;position:absolute;left:40%;right:40%;top:15%;z-index:10000"
return '<div id="uiAlert" class="notifications center"><!-- empty --></div>'; return '<div id="uiAlert" class="notifications center"><!-- empty --></div>';
} }

3
e107_core/templates/header_default.php
View File

@@ -23,8 +23,7 @@ $sql = e107::getDb();
$sql->db_Mark_Time('(Header Top)'); $sql->db_Mark_Time('(Header Top)');
// Load library dependencies.
e107::getTheme('current')->loadLibrary();
//e107::js('core', 'bootstrap/js/bootstrap-tooltip.js','jquery'); //e107::js('core', 'bootstrap/js/bootstrap-tooltip.js','jquery');
// e107::css('core', 'bootstrap/css/tooltip.css','jquery'); // e107::css('core', 'bootstrap/css/tooltip.css','jquery');

2
e107_handlers/db_debug_class.php
View File

@@ -765,7 +765,7 @@
$inc = array( $inc = array(
'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'CHARSET', 'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'FONTAWESOME', 'CHARSET',
'GUESTS_ONLINE', 'MEMBERS_ONLINE', 'PAGE_NAME', 'STANDARDS_MODE', 'TIMEOFFSET', 'GUESTS_ONLINE', 'MEMBERS_ONLINE', 'PAGE_NAME', 'STANDARDS_MODE', 'TIMEOFFSET',
'TOTAL_ONLINE', 'THEME', 'THEME_ABS', 'THEME_LAYOUT', 'THEME_LEGACY', 'THEME_STYLE', 'META_OG', 'META_DESCRIPTION', 'MPREFIX', 'VIEWPORT', 'BODYTAG', 'CSSORDER' 'TOTAL_ONLINE', 'THEME', 'THEME_ABS', 'THEME_LAYOUT', 'THEME_LEGACY', 'THEME_STYLE', 'META_OG', 'META_DESCRIPTION', 'MPREFIX', 'VIEWPORT', 'BODYTAG', 'CSSORDER'
); );