mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Bootstrap 4 fixes. USERTHEME fix.

Browse Source
This commit is contained in:
Cameron 2021-01-01 12:29:43 -08:00
parent 14862f0463
commit 1a510cb897
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/e107_class.php
View File

@ -1619,7 +1619,7 @@ class e107
} }
else else
{ {
$themedir= self::getPref('sitetheme'); $themedir= deftrue('USERTHEME', self::getPref('sitetheme'));
} }
} }

13
e107_handlers/theme_handler.php
View File

@ -89,7 +89,7 @@ class e_theme
{ {
if($theme === null) if($theme === null)
{ {
$theme = e107::pref('core','sitetheme'); $theme = deftrue('USERTHEME', e107::pref('core','sitetheme'));
} }
if(!is_readable(e_THEME.$theme."/layouts/".$key."_layout.html") || !is_readable(e_THEME.$theme."/theme.html")) if(!is_readable(e_THEME.$theme."/layouts/".$key."_layout.html") || !is_readable(e_THEME.$theme."/theme.html"))
@ -1125,7 +1125,6 @@ class e_theme
return; return;
} }
// check for valid theme. // check for valid theme.
if (@fopen(e_THEME . $themeDir . '/theme.php', 'r')) if (@fopen(e_THEME . $themeDir . '/theme.php', 'r'))
{ {
@ -1160,12 +1159,14 @@ class e_theme
define('THEME', e_THEME . $e107tmp_theme . '/'); define('THEME', e_THEME . $e107tmp_theme . '/');
define('THEME_ABS', e_THEME_ABS . $e107tmp_theme . '/'); define('THEME_ABS', e_THEME_ABS . $e107tmp_theme . '/');
define('THEME_VERSION', 2.3); define('THEME_VERSION', 2.3);
define('THEME_LEGACY', false);
define('USERTHEME', 'bootstrap3');
define('BOOTSTRAP', 3);
define('FONTAWESOME', 4);
if (ADMIN && strpos(e_SELF, $ADMIN_DIRECTORY) === false) if (ADMIN && (e_ADMIN_AREA !== true))
{ {
echo '<script>alert("' . $tp->toJS(CORE_LAN1) . '")</script>'; echo "<div class='alert alert-danger'><b>".$themeDir."</b> ".str_replace('\n','<br />',CORE_LAN1)."</div>";
$tm = e107::getSingleton('themeHandler');
$tm->setTheme($e107tmp_theme);
} }
e107::getDebug()->logTime('Theme Check End'); e107::getDebug()->logTime('Theme Check End');

2
e107_plugins/gallery/includes/gallery_load.php
View File

@ -66,7 +66,7 @@ function gallery_load_prettyphoto() // @lonalore FIXME Stop loading this on ever
if(vartrue($plugPref['downloadable'], false)) if(vartrue($plugPref['downloadable'], false))
{ {
$settings['prettyphoto']['image_markup'] .= '<span class="download-btn">'; $settings['prettyphoto']['image_markup'] .= '<span class="download-btn">';
$settings['prettyphoto']['image_markup'] .= '<a class="btn btn-default btn-secondary btn-xs" href="{path}">' . LAN_DOWNLOAD . '</a>'; $settings['prettyphoto']['image_markup'] .= '<a class="btn btn-default btn-secondary btn-sm btn-xs" href="{path}">' . LAN_DOWNLOAD . '</a>';
$settings['prettyphoto']['image_markup'] .= '</span>'; $settings['prettyphoto']['image_markup'] .= '</span>';
} }

4
e107_plugins/gallery/templates/gallery_template.php
View File

@ -66,10 +66,10 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
</div> </div>
<div class="gallery-slideshow-controls"> <div class="gallery-slideshow-controls">
<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right float-right"> <a href="#" class="gallery-control gal-next btn btn-sm btn-xs btn-default btn-secondary pull-right float-right">
' . LAN_NEXT . ' {GLYPH=fa-chevron-right} ' . LAN_NEXT . ' {GLYPH=fa-chevron-right}
</a> </a>
<a href="#" class="gallery-control gal-prev btn btn-xs btn-default btn-secondary"> <a href="#" class="gallery-control gal-prev btn btn-sm btn-xs btn-default btn-secondary">
{GLYPH=fa-chevron-left} ' . LAN_PREVIOUS . ' {GLYPH=fa-chevron-left} ' . LAN_PREVIOUS . '
</a> </a>
<span class="gallery-slide-jumper-container"> <span class="gallery-slide-jumper-container">

4
e107_plugins/news/other_news_menu.php
View File

@ -57,8 +57,8 @@ if(!$OTHERNEWS_STYLE)
} }
$template = e107::getTemplate('news', 'news_menu', 'other', true, true); $template = e107::getTemplate('news', 'news_menu', 'other', true, true);
$item_selector = '<div class="btn-group pull-right float-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev" data-bs-slide="prev">‹</a> $item_selector = '<div class="btn-group pull-right float-right"><a class="btn btn-mini btn-sm btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev" data-bs-slide="prev">‹</a>
<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next" data-bs-slide="next">›</a></div>'; <a class="btn btn-sm btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next" data-bs-slide="next">›</a></div>';
if(!empty($parms['caption'])) if(!empty($parms['caption']))
{ {

2
e107_plugins/pm/templates/pm_menu_template.php
View File

@ -27,7 +27,7 @@ if (!defined('e107_INIT')) { exit; }
if(deftrue('BOOTSTRAP') && deftrue('FONTAWESOME')) if(deftrue('BOOTSTRAP') && deftrue('FONTAWESOME'))
{ {
define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox')); define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-down'));
// Icon candidate to stacked fontawesome icons... // Icon candidate to stacked fontawesome icons...
define('PM_OUTBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-up')); define('PM_OUTBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-up'));
// Icon candidate to animated fontawesome icons... // Icon candidate to animated fontawesome icons...