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

Issue #4332 Bootstrap 5 Fixes

Browse Source
This commit is contained in:
Cameron
2021-01-02 12:06:46 -08:00
parent 833d3f6133
commit dd184a024c
8 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/templates/chapter_template.php
View File

@@ -31,10 +31,10 @@ $CHAPTER_TEMPLATE['default']['listBooks']['end'] = "</ul>";
$CHAPTER_TEMPLATE['nav']['listChapters']['caption'] = "Articles";
$CHAPTER_TEMPLATE['nav']['listChapters']['start'] = '<ul class="page-nav">';
$CHAPTER_TEMPLATE['nav']['listChapters']['start'] = '<ul class="list-group page-nav">';
$CHAPTER_TEMPLATE['nav']['listChapters']['item'] = '
<li>
<li class="list-group-item">
<a role="button" href="{LINK_URL}" >
{LINK_NAME}
</a>
@@ -43,7 +43,7 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['item'] = '
$CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu'] = '
<li>
<li class="list-group-item">
<a role="button" href="{LINK_URL}" >
{LINK_NAME}
</a>
@@ -52,7 +52,7 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu'] = '
';
$CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu_active'] = '
<li class="active">
<li class="list-group-item active">
<a role="button" href="{LINK_URL}">
{LINK_NAME}
</a>
@@ -61,7 +61,7 @@ $CHAPTER_TEMPLATE['nav']['listChapters']['item_submenu_active'] = '
';
$CHAPTER_TEMPLATE['nav']['listChapters']['item_active'] = '
<li class="active">
<li class="list-group-item active">
<a crole="button" href="{LINK_URL}">
{LINK_NAME}
</a>

2
e107_plugins/blogcalendar_menu/blogcalendar_menu.php
View File

@@ -166,7 +166,7 @@ if(false === $cached)
if(deftrue('BOOTSTRAP')) // v2.x
{
$month_selector = '<span class="btn-group pull-right float-right"><a class="btn btn-mini btn-default btn-secondary btn-sm btn-xs " href="#blogCalendar" data-slide="prev" data-bs-slide="prev">‹</a>
$month_selector = '<span class="btn-group pull-right float-right float-end"><a class="btn btn-mini btn-default btn-secondary btn-sm btn-xs " href="#blogCalendar" data-slide="prev" data-bs-slide="prev">‹</a>
<a class="btn btn-mini btn-default btn-secondary btn-sm btn-xs" href="#blogCalendar" data-slide="next" data-bs-slide="next">›</a></span>';
$caption = "<span class='inline-text'>".BLOGCAL_L1." ".$month_selector."</span>";

8
e107_plugins/chatbox_menu/templates/chatbox_menu_template.php
View File

@@ -16,12 +16,12 @@ if ( ! defined('e107_INIT')) {
//---------------------------------MENU-----------------------------------------
$CHATBOX_MENU_TEMPLATE['menu']['start'] =
'<ul class="media-list unstyled list-unstyled">' . PHP_EOL;
'<ul class="media-list unstyled list-unstyled mt-3">' . PHP_EOL;
$CHATBOX_MENU_TEMPLATE['menu']['item'] = '
<li class="media">
<div class="media-left">
<span class="media-object mr-3">{CB_AVATAR: shape=circle&size=48}</span>
<li class="media d-flex mb-2">
<div class="media-left me-3">
<span class="media-object mr-3">{CB_AVATAR: size=48&shape=circle}</span>
</div>
<div class="media-body">
<b>{CB_USERNAME}</b>&nbsp;

4
e107_plugins/forum/templates/newforumposts_menu_template.php
View File

@@ -9,8 +9,8 @@
*/
$NEWFORUMPOSTS_MENU_TEMPLATE['default']['start'] = "<ul class='media-list list-unstyled newforumposts-menu'>{SETIMAGE: w=48&h=48&crop=1}";
$NEWFORUMPOSTS_MENU_TEMPLATE['default']['item'] = "<li class='media mt-3'>
<div class='media-left'>
$NEWFORUMPOSTS_MENU_TEMPLATE['default']['item'] = "<li class='media d-flex mt-3'>
<div class='media-left me-3'>
<a class='mr-3' href='{POST_URL}'>{POST_AUTHOR_AVATAR: shape=circle}</a>
</div>
<div class='media-body'>

2
e107_plugins/news/other_news_menu.php
View File

@@ -57,7 +57,7 @@ if(!$OTHERNEWS_STYLE)
}
$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-sm 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 float-end"><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-sm btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next" data-bs-slide="next">›</a></div>';
if(!empty($parms['caption']))

10
e107_plugins/news/templates/news_menu_template.php
View File

@@ -59,7 +59,7 @@ $NEWS_MENU_TEMPLATE['other']['item'] = '<div class="carousel-item item {ACTIVE}
{NEWSTHUMBNAIL=placeholder}
<h3>{NEWSTITLE}</h3>
<p>{NEWSSUMMARY}</p>
<p class="text-right"><a class="btn btn-sm btn-primary btn-othernews" href="{NEWSURL}">'.LAN_READ_MORE.' &raquo;</a></p>
<p class="text-right text-end"><a class="btn btn-sm btn-primary btn-othernews" href="{NEWSURL}">'.LAN_READ_MORE.' &raquo;</a></p>
</div>';
$NEWS_MENU_TEMPLATE['other']['end'] = "</div></div>";
@@ -74,10 +74,10 @@ $NEWS_MENU_TEMPLATE['other']['end'] = "</div></div>";
$NEWS_MENU_TEMPLATE['other2']['caption'] = TD_MENU_L2;
$NEWS_MENU_TEMPLATE['other2']['start'] = "<ul class='media-list unstyled list-unstyled othernews2-block'>{SETIMAGE: w=100&h=100&crop=1}"; // set the {NEWSIMAGE} dimensions.
$NEWS_MENU_TEMPLATE['other2']['item'] = "<li class='media'>
<span class='media-object pull-left float-left'>{NEWSTHUMBNAIL=placeholder}</span>
$NEWS_MENU_TEMPLATE['other2']['item'] = "<li class='media d-flex'>
<span class='media-object pull-left float-left mr-3 me-3'>{NEWSTHUMBNAIL=placeholder}</span>
<div class='media-body'><h4>{NEWSTITLELINK}</h4>
<p class='text-right'><a class='btn btn-sm btn-primary btn-othernews2' href='{NEWSURL}'>".LAN_READ_MORE." &raquo;</a></p>
<p class='text-right text-end'><a class='btn btn-sm btn-primary btn-othernews2' href='{NEWSURL}'>".LAN_READ_MORE." &raquo;</a></p>
</div>
</li>\n";
@@ -108,7 +108,7 @@ $NEWS_MENU_TEMPLATE['carousel']['end'] = '
</div><!-- End Carousel Inner -->
</div>
<div id="news-carousel-titles" class="col-md-4 ">
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right float-right">{NAV}</ul>
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right float-right float-end">{NAV}</ul>
</div>
</div><!-- End Carousel -->
</div>

1
e107_plugins/online/online_menu.php
View File

@@ -21,6 +21,7 @@ e107::includeLan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php');
require_once(e_PLUGIN.'online/online_shortcodes.php');
$mode = empty($menu_pref['online_show_memberlist_extended']) ? 'default' : 'extended';
$online_shortcodes = new online_shortcodes;
$online_shortcodes->wrapper('online_menu/'.$mode);

56
e107_plugins/online/templates/online_menu_template.php
View File

@@ -21,7 +21,7 @@ $ONLINE_MENU_TEMPLATE['lastseen']['end'] = "</ul>";
// Online Menu - default.
$ONLINE_MENU_TEMPLATE['default']['enabled'] = "
<ul class='online-menu'>
<ul class='list-group online-menu'>
{ONLINE_GUESTS}
{ONLINE_MEMBERS}
{ONLINE_MEMBERS_LIST}
@@ -29,7 +29,7 @@ $ONLINE_MENU_TEMPLATE['default']['enabled'] = "
{ONLINE_ONPAGE}
{ONLINE_MEMBERS_TOTAL}
{ONLINE_MEMBER_NEWEST}
<li>
<li class='list-group-item'>
{ONLINE_MOST}
<small class='muted'>
{ONLINE_MOST_GUESTS}
@@ -41,64 +41,64 @@ $ONLINE_MENU_TEMPLATE['default']['enabled'] = "
";
$ONLINE_MENU_TEMPLATE['default']['disabled'] = "{ONLINE_TRACKING_DISABLED}";
$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left float-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='list-group-item media'><span class='media-object pull-left float-left mr-3'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</span><span class='media-body'>{ONLINE_MEMBER_USER} <small>".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</small></span></li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_GUESTS'] = "<li>".LAN_ONLINE_1."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS'] = "<li>".LAN_ONLINE_2."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST'] = "<ul>{---}</ul>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST_EXTENDED'] = "<ul class='unstyled list-unstyled'>{---}</ul>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_ONPAGE'] = "<li>".LAN_ONLINE_3."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_TOTAL'] = "<li>".LAN_ONLINE_11."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_NEWEST'] = "<li>".LAN_ONLINE_6."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_GUESTS'] = "<li class='list-group-item'>".LAN_ONLINE_1."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS'] = "<li class='list-group-item'>".LAN_ONLINE_2."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST'] = "<li class='list-group-item'><ul>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_LIST_EXTENDED'] = "<ul class='unstyled list-unstyled py-0'>{---}</ul>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_ONPAGE'] = "<li class='list-group-item'>".LAN_ONLINE_3."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_TOTAL'] = "<li class='list-group-item'>".LAN_ONLINE_11."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBER_NEWEST'] = "<li class='list-group-item'>".LAN_ONLINE_6."{---}</li>";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST'] = LAN_ONLINE_8."{---}<br />";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_MEMBERS'] = LAN_ONLINE_2."{---}";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_GUESTS'] = LAN_ONLINE_1."{---}";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MOST_DATESTAMP'] = LAN_ONLINE_9."{---}";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_REGISTERED'] = "<li>".LAN_ONLINE_11."{---}";
$ONLINE_MENU_WRAPPER['default']['ONLINE_MEMBERS_REGISTERED'] = "<li class='list-group-item'>".LAN_ONLINE_11."{---}";
//##### ONLINE MEMBER LIST EXTENDED -------------------------------------------
$ONLINE_MENU_TEMPLATE['extended']['disabled'] = "{ONLINE_TRACKING_DISABLED}";
$ONLINE_MENU_TEMPLATE['extended']['enabled'] = "
<ul class='online-menu online-menu-extended list-unstyled'>
<ul class='list-group online-menu online-menu-extended list-unstyled'>
{ONLINE_GUESTS}
{ONLINE_MEMBERS}
{ONLINE_MEMBERS_LIST_EXTENDED}
{ONLINE_ONPAGE}
{ONLINE_MEMBER_NEWEST: type=avatar}
{ONLINE_MEMBERS_REGISTERED}
<li class='online-menu-extended-label'>
<li class='list-group-item d-flex justify-content-between online-menu-extended-label'>
{ONLINE_MOST}
<div id='online-menu-extended-most' class='text-muted text-right' style='display:none'>
<small>
{ONLINE_MOST_GUESTS}<br />
{ONLINE_MOST_MEMBERS}<br />
{ONLINE_MOST_DATESTAMP=long}
</small>
<small>
{ONLINE_MOST_GUESTS}<br />
{ONLINE_MOST_MEMBERS}<br />
{ONLINE_MOST_DATESTAMP=long}
</small>
</div>
</li>
</ul>
";
$ONLINE_MENU_TEMPLATE['extended']['online_members_list_extended'] = "{SETIMAGE: w=48&h=48&crop=1}<li class='media'><div class='media-left'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span><small class='text-muted'>{ONLINE_MEMBER_PAGE}</small></div></li>";
$ONLINE_MENU_TEMPLATE['extended']['online_member_newest'] = "{SETIMAGE: w=48&h=48&crop=1}<li class='media'><div class='media-left'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span></div></li>";
$ONLINE_MENU_TEMPLATE['extended']['online_members_list_extended'] = "{SETIMAGE: w=48&h=48&crop=1}<li class='media d-flex'><div class='media-left mr-3 me-3'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span><small class='text-muted'>{ONLINE_MEMBER_PAGE}</small></div></li>";
$ONLINE_MENU_TEMPLATE['extended']['online_member_newest'] = "{SETIMAGE: w=48&h=48&crop=1}<li class='media d-flex'><div class='media-left mr-3 me-3'>{ONLINE_MEMBER_IMAGE: type=avatar&shape=circle}</div><div class='media-body'><span class='online-menu-user'>{ONLINE_MEMBER_USER}</span></div></li>";
// Shortcode wrappers
$ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_1."<span class='label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_2."<span class='label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS'] = "<li class='list-group-item d-flex justify-content-between align-items-center online-menu-extended-label'>".LAN_ONLINE_1."<span class='badge bg-primary rounded-pill label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS'] = "<li class='list-group-item d-flex justify-content-between align-items-center online-menu-extended-label'>".LAN_ONLINE_2."<span class='badge bg-primary rounded-pill label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST'] = "<ul>{---}</ul>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST_EXTENDED'] = "<li><ul class='unstyled list-unstyled'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_ONPAGE'] = "<li>".LAN_ONLINE_3."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_TOTAL'] = "<li>".LAN_ONLINE_11."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_NEWEST'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_6."</li><li><ul class='unstyled list-unstyled'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST'] = "<a class='e-expandit' href='#online-menu-extended-most'>".LAN_ONLINE_8."</a><span class='label label-default pull-right float-right'>{---}</span><br />";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST_EXTENDED'] = "<li class='list-group-item'><ul class='unstyled list-unstyled py-0'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_ONPAGE'] = "<li class='list-group-item d-flex justify-content-between align-items-center'>".LAN_ONLINE_3."<span class='badge bg-primary rounded-pill label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_TOTAL'] = "<li class='list-group-item d-flex justify-content-between align-items-center'>".LAN_ONLINE_11."<span class='badge bg-primary rounded-pill label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_NEWEST'] = "<li class='list-group-item online-menu-extended-label'>".LAN_ONLINE_6."</li><li class='list-group-item'><ul class='unstyled list-unstyled py-0'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST'] = "<a class='e-expandit' href='#online-menu-extended-most'>".LAN_ONLINE_8."</a><span class='badge bg-primary rounded-pill label label-default pull-right float-right'>{---}</span><br />";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_MEMBERS'] = LAN_ONLINE_2."{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_GUESTS'] = LAN_ONLINE_1."{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_DATESTAMP'] = "{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_11."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED'] = "<li class='list-group-item d-flex justify-content-between align-items-center online-menu-extended-label'>".LAN_ONLINE_11."<span class='badge bg-primary rounded-pill label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_PAGE'] = LAN_ONLINE_7." {---}";