mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +02:00
Code Issues Releases Wiki Activity

Bootstrap 5 styling. (data-bs-toggle)

Browse Source 
Signup shortcodes now automatically load the required template.
This commit is contained in:
Cameron
2021-01-26 15:08:58 -08:00
parent afcbd2c01b
commit 835e477147
39 changed files with 139 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -46,7 +46,7 @@ class admin_shortcodes extends e_shortcode
return '<ul class="nav navbar pill navbar-nav">
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_MESSAGES.'" role="button" data-toggle="dropdown" href="#">
<a class="dropdown-toggle" title="'.LAN_MESSAGES.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#">
'.E_16_E107.' <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
@@ -773,7 +773,7 @@ class admin_shortcodes extends e_shortcode
$text = "<ul class='nav nav-admin navbar-nav navbar-right admin-icon-debug'>
<li class='dropdown'>
<a class='dropdown-toggle' title=\"Set DEBUG mode".$currentAlias."\" role='button' data-toggle='dropdown' data-target='#' href='#'>
<a class='dropdown-toggle' title=\"Set DEBUG mode".$currentAlias."\" role='button' data-toggle='dropdown' data-bs-toggle='dropdown' data-target='#' href='#'>
";
$text .= e107::getParser()->toGlyph('fa-bug', array('class'=>$active))."<b class='caret ".$active."'></b></a>";
@@ -855,7 +855,7 @@ class admin_shortcodes extends e_shortcode
$text = '<ul class="nav nav-admin navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_PM.'" role="button" data-toggle="dropdown" href="#" >
<a class="dropdown-toggle" title="'.LAN_PM.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" >
'.$tp->toGlyph('fa-envelope').$countDisp.'
</a>
<ul class="dropdown-menu" role="menu" >
@@ -878,7 +878,7 @@ class admin_shortcodes extends e_shortcode
$text = '
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" >
<i class="icon-envelope icon-white active"></i> 3 <b class="caret"></b>
</a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
@@ -921,7 +921,7 @@ class admin_shortcodes extends e_shortcode
$text = '<ul class="nav nav-admin navbar-nav navbar-right">
<li class="dropdown">
<a class="dropdown-toggle" title="Multisite" role="button" data-toggle="dropdown" href="#" >
<a class="dropdown-toggle" title="Multisite" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" >
'.$tp->toGlyph('fa-clone').'
</a>
<ul class="dropdown-menu" role="menu" >';
@@ -1699,7 +1699,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
return '<ul class="core-update-available nav navbar-nav navbar-left">
<li class="dropdown open">
<a class="dropdown-toggle " title="Core Update Available" role="button" data-toggle="dropdown" href="#" aria-expanded="true">
<a class="dropdown-toggle " title="Core Update Available" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" aria-expanded="true">
<i class="fa fa-cloud-download text-success"></i>
</a>
<ul class="dropdown-menu" role="menu">
@@ -2037,7 +2037,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$upStatus = (e107::getSession()->get('core-update-status') === true) ? '<span title="' .ADLAN_120. '" class="text-info"><i class="fa fa-database"></i></span>' : '<!-- -->';
return varset($template['start']). '<li><a id="e-admin-core-update" tabindex="0" href="'.e_ADMIN_ABS.'e107_update.php" class="e-popover text-primary" role="button" data-container="body" data-toggle="popover" data-placement="right" data-trigger="bottom" data-content="'.$tp->toAttribute(ADLAN_120).'">'.$upStatus.'</a></li>' .varset($template['end']);
return varset($template['start']). '<li><a id="e-admin-core-update" tabindex="0" href="'.e_ADMIN_ABS.'e107_update.php" class="e-popover text-primary" role="button" data-container="body" data-toggle="popover" data-bs-toggle="popover" data-placement="right" data-trigger="bottom" data-content="'.$tp->toAttribute(ADLAN_120).'">'.$upStatus.'</a></li>' .varset($template['end']);
}

6
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -46,7 +46,7 @@ class bbcode_shortcodes extends e_shortcode
if(defined('BOOTSTRAP') && BOOTSTRAP)
{
$text = '<div class="btn-group">';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" href="#" title="">';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" title="">';
$text .= LANHELP_55;
$text .= ' <span class="caret"></span></a>';
$text .= "<ul class='dropdown-menu'>\n";
@@ -296,7 +296,7 @@ class bbcode_shortcodes extends e_shortcode
$sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36);
$text = '<div class="btn-group">';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_22.'">';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" title="'.LANHELP_22.'">';
// $text .= "<img src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' />\n";
$text .= $this->button(e_IMAGE_ABS."bbcode/fontsize.png", 'text-height');
@@ -351,7 +351,7 @@ class bbcode_shortcodes extends e_shortcode
if(deftrue('BOOTSTRAP'))
{
$text = '<div class="btn-group" >';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_44.'">';
$text .= '<a class="btn btn-default btn-secondary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" title="'.LANHELP_44.'">';
$text .= $this->button(e_IMAGE_ABS."bbcode/emotes.png","smile-o");
// $text .= ' <span class="caret"></span>';

11
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -22,6 +22,13 @@ class signup_shortcodes extends e_shortcode
{
public $template = array();
function __construct()
{
parent::__construct();
e107::coreLan('user');
$this->template = e107::getCoreTemplate('signup');
}
function sc_signup_coppa_text($parm=null)
{
$text = LAN_SIGNUP_77. " <a target='_blank' href='http://www.ftc.gov/privacy/coppafaqs.shtm'>". LAN_SIGNUP_14."</a>. ".
@@ -470,14 +477,14 @@ class signup_shortcodes extends e_shortcode
if(empty($this->template['extended-user-fields']))
{
$msg = "SIGNUP 'extended-user-fields' template is not defined or empty";
trigger_error($ms);
trigger_error($msg);
return (ADMIN) ? $msg : '';
}
if(empty($this->template['extended-category']))
{
$msg = "SIGNUP 'extended-user-fields' template is not defined or empty";
trigger_error($ms);
trigger_error($msg);
return (ADMIN) ? $msg : '';
}

18
e107_core/templates/admin_template.php
View File

@@ -26,7 +26,7 @@ $E_ADMIN_NAVIGATION['start_other'] = '<ul class="nav nav-admin navbar-nav navbar
$E_ADMIN_NAVIGATION['button'] = '
<li class="dropdown">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_IMAGE}
</a>
@@ -38,7 +38,7 @@ $E_ADMIN_NAVIGATION['button'] = '
$E_ADMIN_NAVIGATION['button_active'] = '
<li class="dropdown active">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_IMAGE}
</a>
@@ -54,7 +54,7 @@ $E_ADMIN_NAVIGATION['button_enav_home'] = '
<li class="dropdown">
<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
{LINK_IMAGE} {LINK_TEXT}
</a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px;" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
</a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px;" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" >
<b class="caret"></b>
</a>
{SUB_MENU}
@@ -64,7 +64,7 @@ $E_ADMIN_NAVIGATION['button_enav_home'] = '
// Change Language
$E_ADMIN_NAVIGATION['button_enav_language'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b>
</a>
@@ -87,7 +87,7 @@ $E_ADMIN_NAVIGATION['button_enav_language'] = '
// Logout / Settings / Personalize
$E_ADMIN_NAVIGATION['button_enav_logout'] = '
<li class="dropdown">
<a class="dropdown-toggle admin-icon-avatar " title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
<a class="dropdown-toggle admin-icon-avatar " title="'.$label.'" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b>
</a>
@@ -99,11 +99,11 @@ $E_ADMIN_NAVIGATION['button_enav_logout'] = '
// Private Messaging - //TODO Discuss and make this work..
$E_ADMIN_NAVIGATION['button_pm'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" >
<i class="icon-envelope active"></i> 3
<b class="caret"></b>
</a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px;">
<div id="dropdown" class="dropdown-menu dropdown-menu-end pull-right float-right e-noclick" style="padding:10px;width:300px;">
<ul class="nav-list">
<li class="dropdown-header nav-header">Unread Messages</li>
<li><a href="#">Incoming Message Number 1</a></li>
@@ -132,7 +132,7 @@ $E_ADMIN_NAVIGATION['start_sub'] = '
';
$E_ADMIN_NAVIGATION['start_other_sub'] = '
<ul class="dropdown-menu pull-right" role="menu" >
<ul class="dropdown-menu dropdown-menu-end pull-right float-right" role="menu" >
';
$E_ADMIN_NAVIGATION['button_sub'] = '
@@ -187,7 +187,7 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-bs-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>

10
e107_core/templates/bootstrap4/navigation_template.php
View File

@@ -32,7 +32,7 @@ $NAVIGATION_TEMPLATE['main']['end'] = '</ul>';
// Main Link which has a sub menu.
$NAVIGATION_TEMPLATE['main']['item_submenu'] = "
<li class='nav-item dropdown'>
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-bs-toggle='dropdown' id='navbarDropdownMenuLink-{NAV_LINK_ID}' data-target='#' aria-haspopup='true' aria-expanded='false' href='#' title='{NAV_LINK_DESCRIPTION}'>
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-bs-toggle='dropdown' data-bs-toggle='dropdown' id='navbarDropdownMenuLink-{NAV_LINK_ID}' data-target='#' aria-haspopup='true' aria-expanded='false' href='#' title='{NAV_LINK_DESCRIPTION}'>
{NAV_LINK_ICON}{NAV_LINK_NAME}
</a>
{NAV_LINK_SUB}
@@ -42,7 +42,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu'] = "
// Main Link which has a sub menu - active state.
$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
<li class="nav-item dropdown active {NAV_LINK_IDENTIFIER}">
<a class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" id="navbarDropdownMenuLink-{NAV_LINK_ID}" aria-haspopup="true" aria-expanded="true" data-target="#" href="#">
<a class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-bs-toggle="dropdown" id="navbarDropdownMenuLink-{NAV_LINK_ID}" aria-haspopup="true" aria-expanded="true" data-target="#" href="#">
{NAV_LINK_ICON}{NAV_LINK_NAME}
</a>
{NAV_LINK_SUB}
@@ -134,16 +134,16 @@ $NAVIGATION_TEMPLATE['footer']['item_active'] = "<li class='nav-item active' {NA
<a class='nav-link' href='{NAV_LINK_URL}' title='{NAV_LINK_DESCRIPTION}'>{NAV_LINK_ICON}{NAV_LINK_NAME}</a></li>";
$NAVIGATION_TEMPLATE['footer']['end'] = '</ul>';
// 2rd Sub menu data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
// 2rd Sub menu data-toggle="dropdown" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Dropdown</a>
$NAVIGATION_TEMPLATE['footer']['item_submenu'] = "
<li class='nav-item dropdown'>
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-target='#' aria-haspopup='true'
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-bs-toggle='dropdown' data-target='#' aria-haspopup='true'
aria-expanded='false' href='#' title='{NAV_LINK_DESCRIPTION}'>{NAV_LINK_ICON}{NAV_LINK_NAME}</a>
{NAV_LINK_SUB}
</li>";
$NAVIGATION_TEMPLATE['footer']['item_submenu_active'] = "
<li class='nav-item dropdown active'>
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-target='#' aria-haspopup='true' aria-expanded='false' href='{NAV_LINK_URL}' title='{NAV_LINK_DESCRIPTION}'>
<a class='nav-link dropdown-toggle' role='button' data-toggle='dropdown' data-bs-toggle='dropdown' data-target='#' aria-haspopup='true' aria-expanded='false' href='{NAV_LINK_URL}' title='{NAV_LINK_DESCRIPTION}'>
{NAV_LINK_ICON}{NAV_LINK_NAME}
</a>
{NAV_LINK_SUB}

4
e107_core/templates/navigation_template.php
View File

@@ -31,7 +31,7 @@ $NAVIGATION_TEMPLATE['main']['item_active'] = '
// Main Link which has a sub menu.
$NAVIGATION_TEMPLATE['main']['item_submenu'] = '
<li class="nav-item dropdown {LINK_IDENTIFIER}">
<a class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
<a class="nav-link dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
{LINK_ICON}{LINK_NAME}
<span class="caret"></span>
</a>
@@ -42,7 +42,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
// Main Link which has a sub menu - active state.
$NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
<li class="nav-item dropdown active {LINK_IDENTIFIER}">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" data-target="#" href="{LINK_URL}">
{LINK_ICON}{LINK_NAME}
<span class="caret"></span>
</a>