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

Closes #4124, #3686 - News template loading behavior. Added alert-dismissible for BS4.

Browse Source
This commit is contained in:
Cameron
2020-05-01 13:40:07 -07:00
parent cd01e8119b
commit d51c3e07c6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/message_handler.php
View File

@@ -591,7 +591,7 @@ class eMessage
$icon = !empty(self::$_customIcon[$type]) ? "s-message-empty fa fa-2x ".self::$_customIcon[$type] : "s-message-".$type; $icon = !empty(self::$_customIcon[$type]) ? "s-message-empty fa fa-2x ".self::$_customIcon[$type] : "s-message-".$type;
$text = "<div class='s-message alert alert-block fade in show {$type} {$bclass}' role='alert'>"; $text = "<div class='s-message alert alert-block alert-dismissible fade in show {$type} {$bclass}' role='alert'>";
$text .= (self::$_close[$type] === true) ? "<a class='close' data-dismiss='alert' aria-label='".LAN_CLOSE."'>×</a>" : ""; $text .= (self::$_close[$type] === true) ? "<a class='close' data-dismiss='alert' aria-label='".LAN_CLOSE."'>×</a>" : "";
$text .= "<i class='s-message-icon ".$icon."'></i> $text .= "<i class='s-message-icon ".$icon."'></i>
<h4 class='s-message-title'>".self::getTitle($type, $mstack)."</h4> <h4 class='s-message-title'>".self::getTitle($type, $mstack)."</h4>

2
e107_plugins/news/news.php
View File

@@ -985,7 +985,7 @@ class news_front
$action = $currentNewsAction; $action = $currentNewsAction;
if(deftrue('BOOTSTRAP')) // v2.x if(!deftrue('THEME_LEGACY')) // v2.x
{ {
$template = e107::getTemplate('news', 'news', 'list'); $template = e107::getTemplate('news', 'news', 'list');
} }