mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cpage.php
View File

@ -143,7 +143,7 @@ class page_admin_form_ui extends e_admin_form_ui
$query['id'] = $id;
$query = http_build_query($query,null, '&');
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".ADMIN_EDIT_ICON."</a>";
if($this->getController()->getMode() === 'overview')

4
e107_admin/emoticon.php
View File

@ -128,8 +128,8 @@ class emotec
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a href='#emoticon-activate' data-toggle='tab'>" . EMOLAN_1 . "</a></li>
<li><a href='#emoticon-packages' data-toggle='tab'>" . EMOLAN_13 . "</a></li>
<li class='active'><a href='#emoticon-activate' data-toggle='tab' data-bs-toggle='tab'>" . EMOLAN_1 . "</a></li>
<li><a href='#emoticon-packages' data-toggle='tab' data-bs-toggle='tab'>" . EMOLAN_13 . "</a></li>
</ul>
<div class='tab-content'>

2
e107_admin/eurl.php
View File

@ -756,7 +756,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
$id = 'eurl_'.$this->name2id($title);
$text = "<a data-toggle='modal' href='#".$id."' data-cache='false' data-target='#".$id."' class='e-tip' title='".LAN_MOREINFO."'>";
$text = "<a data-toggle='modal' data-bs-toggle='modal' href='#".$id."' data-cache='false' data-target='#".$id."' class='e-tip' title='".LAN_MOREINFO."'>";
$text .= $title;
$text .= '</a>';

4
e107_admin/frontpage.php
View File

@ -495,8 +495,8 @@ class frontpage
";
$text .= '<ul class="nav nav-tabs" id="myTabs">
<li class="active"><a data-toggle="tab" href="#home">'.FRTLAN_49.'</a></li>
<li><a data-toggle="tab" href="#postlogin">'.FRTLAN_35.'</a></li>
<li class="active"><a data-toggle="tab" data-bs-toggle="tab" href="#home">'.FRTLAN_49.'</a></li>
<li><a data-toggle="tab" data-bs-toggle="tab" href="#postlogin">'.FRTLAN_35.'</a></li>
</ul>
';

10
e107_admin/image.php
View File

@ -1473,7 +1473,7 @@ class media_admin_ui extends e_admin_ui
if($bbcodeQuery !== 'video' && $bbcodeQuery !== 'glyph')
{
$text .= "<li class='active'><a data-toggle='tab' href='#core-media-select'>".ADLAN_105."</a></li>\n";
$text .= "<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-select'>".ADLAN_105."</a></li>\n";
}
else
{
@ -1493,23 +1493,23 @@ class media_admin_ui extends e_admin_ui
if(varset($options['bbcode']) === 'img')
{
$text .= "<li><a data-toggle='tab' href='#core-media-style'>".IMALAN_152."</a></li>\n";
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-style'>".IMALAN_152."</a></li>\n";
}
if($this->getQuery('video') == 1 || $this->getQuery('bbcode') === 'video')
{
$text .= "<li class='{$youtubeActive}'><a data-toggle='tab' href='#core-media-youtube'>"."Youtube</a></li>\n";
$text .= "<li class='{$youtubeActive}'><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-youtube'>"."Youtube</a></li>\n";
}
if($this->getQuery('glyph') == 1 || $this->getQuery('bbcode') === 'glyph')
{
$text .= "<li class='{$glyphActive}'><a data-toggle='tab' href='#core-media-glyphs'>"."Glyphs</a></li>\n";
$text .= "<li class='{$glyphActive}'><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-glyphs'>"."Glyphs</a></li>\n";
}
if(getperms('A|A1') && ($this->getQuery('bbcode') !== 'video' && $this->getQuery('bbcode') !== 'glyph'))
{
$text .= "<li><a data-toggle='tab' href='#core-media-upload'>".IMALAN_150. '</a></li>';
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-media-upload'>".IMALAN_150. '</a></li>';
}

4
e107_admin/includes/tabbed.php
View File

@ -47,7 +47,7 @@ class tabbed
foreach ($admin_cat['id'] as $cat_key => $cat_id)
{
$cls = ($cat_key == 1) ? "class='active'" : "";
$text .= "<li {$cls} ><a data-toggle='tab' href='#core-main-".$cat_key."'>".$admin_cat['title'][$cat_key]."</a></li>";
$text .= "<li {$cls} ><a data-toggle='tab' data-bs-toggle='tab' href='#core-main-".$cat_key."'>".$admin_cat['title'][$cat_key]."</a></li>";
}
$text .= "</ul>";
@ -109,7 +109,7 @@ class tabbed
foreach ($admin_cat['id'] as $cat_key => $cat_id)
{
// $text .= "<li id='tab-main_".$cat_key."' ><span style='white-space:nowrap'><img class='icon S16' src='".$admin_cat['img'][$cat_key]."' alt='' style='margin-right:3px' /><a href='#core-main_".$cat_key."'>".$admin_cat['title'][$cat_key]."</a></span></li>";
$text .= "<li id='tab-main_".$cat_key."' ><a data-toggle='tab' href='#core-main_".$cat_key."'>".$admin_cat['title'][$cat_key]."</a></li>";
$text .= "<li id='tab-main_".$cat_key."' ><a data-toggle='tab' data-bs-toggle='tab' href='#core-main_".$cat_key."'>".$admin_cat['title'][$cat_key]."</a></li>";
}
$text .= "</ul>";

2
e107_admin/menus.php
View File

@ -1590,7 +1590,7 @@ class e_layout
foreach($layouts as $title)
{
$text .= '<li '.$active.'><a href="#'.$title.'" data-toggle="tab">'.$title.'</a></li>';
$text .= '<li '.$active.'><a href="#'.$title.'" data-toggle="tab" data-bs-toggle="tab">'.$title.'</a></li>';
$active = '';
}

8
e107_admin/newspost.php
View File

@ -315,7 +315,7 @@ class news_sub_form_ui extends e_admin_form_ui
// $text .= "<a href='#submitted_".$submitnews_id."' class='e-modal' >";
$text = "<a data-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' class='e-tip' title='".LAN_PREVIEW."'>";
$text = "<a data-toggle='modal' data-bs-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' class='e-tip' title='".LAN_PREVIEW."'>";
$text .= $tp->toHTML($submitnews_title,FALSE,'emotes_off, no_make_clickable');
$text .= '</a>';
@ -387,7 +387,7 @@ class news_sub_form_ui extends e_admin_form_ui
// $text .= "<a href='#submitted_".$submitnews_id."' class='e-modal' >";
$text = "<a class='btn btn-default btn-secondary btn-large' data-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' title='".LAN_PREVIEW."'>".ADMIN_VIEW_ICON."</a>";
$text = "<a class='btn btn-default btn-secondary btn-large' data-toggle='modal' data-bs-toggle='modal' href='#submitted_".$submitnews_id."' data-cache='false' data-target='#submitted_".$submitnews_id."' title='".LAN_PREVIEW."'>".ADMIN_VIEW_ICON."</a>";
@ -1496,8 +1496,8 @@ class news_form_ui extends e_admin_form_ui
$text = '<ul class="nav nav-tabs">
<li class="active"><a href="#news-body-container" data-toggle="tab">'.NWSLAN_13.'</a></li>
<li><a href="#news-extended-container" data-toggle="tab">'.NWSLAN_14.'</a></li>
<li class="active"><a href="#news-body-container" data-toggle="tab" data-bs-toggle="tab">'.NWSLAN_13.'</a></li>
<li><a href="#news-extended-container" data-toggle="tab" data-bs-toggle="tab">'.NWSLAN_14.'</a></li>
</ul>
<div class="tab-content">';

12
e107_admin/plugin.php
View File

@ -1363,7 +1363,7 @@ class plugin_online_ui extends e_admin_ui
// Temporary Pop-up version.
// $dicon = '<a class="e-modal" href="'.$data['plugin_url'].'" rel="external" data-modal-caption="'.$data['plugin_name']." ".$data['plugin_version'].'" target="_blank" ><img class="top" src="'.e_IMAGE_ABS.'icons/download_32.png" alt="" /></a>';
// $dicon = "<a data-toggle='modal' data-modal-caption=\"Downloading ".$data['plugin_name']." ".$data['plugin_version']."\" href='{$url}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
// $dicon = "<a data-toggle='modal' data-bs-toggle='modal' data-modal-caption=\"Downloading ".$data['plugin_name']." ".$data['plugin_version']."\" href='{$url}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
return "<div id='{$id}' class='center' >
{$dicon}
@ -1855,7 +1855,7 @@ class plugin_form_online_ui extends e_admin_form_ui
$dicon = '<a title="'.$title.'" '.$disable.' class="e-modal '.$class.'" href="'.$url.'" rel="external" data-loading="'.e_IMAGE.'/generic/loading_32.gif" data-cache="false" data-modal-caption="'.$modalCaption.'" target="_blank" >'.$button.'</a>';
// $dicon = "<a data-toggle='modal' data-modal-caption=\"Downloading ".$data['plugin_name']." ".$data['plugin_version']."\" href='{$url}' data-cache='false' data-target='#uiModal' title='".LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
// $dicon = "<a data-toggle='modal' data-bs-toggle='modal' data-modal-caption=\"Downloading ".$data['plugin_name']." ".$data['plugin_version']."\" href='{$url}' data-cache='false' data-target='#uiModal' title='".LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
return $dicon;
@ -2694,7 +2694,7 @@ class pluginBuilder
$text = $frm->open('newplugin-step3','post', e_SELF.'?mode=create&action=build&newplugin='.$newplug.'&createFiles='.$this->createFiles.'&step=3');
$text .= "<ul class='nav nav-tabs'>\n";
$text .= "<li class='active'><a data-toggle='tab' href='#xml'>".EPL_ADLAN_109."</a></li>";
$text .= "<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#xml'>".EPL_ADLAN_109."</a></li>";
$this->tableCount = count($ret['tables']);
@ -2703,14 +2703,14 @@ class pluginBuilder
foreach($ret['tables'] as $key=>$table)
{
$label = "Table: ".$table;
$text .= "<li><a data-toggle='tab' href='#".$table."'>".$label."</a></li>";
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#".$table."'>".$label."</a></li>";
$this->tableList[] = $table;
}
}
$text .= "<li><a data-toggle='tab' href='#preferences'>".LAN_PREFS."</a></li>";
$text .= "<li><a data-toggle='tab' href='#addons'>".LAN_ADDONS."</a></li>"; //TODO LAN
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#preferences'>".LAN_PREFS."</a></li>";
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#addons'>".LAN_ADDONS."</a></li>"; //TODO LAN
$text .= "</ul>";

8
e107_admin/prefs.php
View File

@ -2137,7 +2137,7 @@ function prefs_adminmenu()
function libraryGetName($machineName, $details)
{
$text = e107::getParser()->lanVars(LAN_LIBRARY_MANAGER_27, array($machineName));
return '<span data-toggle="tooltip" data-placement="top" title="' . $text . '">' . $details['name'] . '</span>';
return '<span data-toggle="tooltip" data-bs-toggle="tooltip" data-placement="top" title="' . $text . '">' . $details['name'] . '</span>';
}
/**
@ -2216,7 +2216,7 @@ function libraryGetProvider($details)
$provider = LAN_THEME;
}
return '<span data-toggle="tooltip" data-placement="top" title="' . $text . '">' . $provider . '</span>';
return '<span data-toggle="tooltip" data-bs-toggle="tooltip" data-placement="top" title="' . $text . '">' . $provider . '</span>';
}
/**
@ -2230,12 +2230,12 @@ function libraryGetStatus($details)
{
$icon = $tp->toGlyph('fa-check');
$text = LAN_OK;
return '<span class="text-success" data-toggle="tooltip" data-placement="top" title="' . $text . '">' . $icon . '</span>';
return '<span class="text-success" data-toggle="tooltip" data-bs-toggle="tooltip" data-placement="top" title="' . $text . '">' . $icon . '</span>';
}
$icon = $tp->toGlyph('fa-remove');
$text = $details['error'];
return '<span class="text-danger" data-toggle="tooltip" data-placement="top" title="' . $text . '">' . $icon . '</span>';
return '<span class="text-danger" data-toggle="tooltip" data-bs-toggle="tooltip" data-placement="top" title="' . $text . '">' . $icon . '</span>';
}
/**

2
e107_admin/theme.php
View File

@ -1022,7 +1022,7 @@ class theme_admin_form_ui extends e_admin_form_ui
$infoUrl = e_SELF.'?mode=main&iframe=1&action=info&src='.$base64;
// $viewUrl = $theme['url'];
$main_icon = "<a class='".$mainClass." btn-default btn-secondary btn btn-sm btn-small btn-inverse' target='".$mainTarget."' data-modal-caption=\"".$modalCaption."\" href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('fa-download',array('size'=>'2x'))."</a>";
$info_icon = "<a class='btn btn-default btn-secondary btn-sm btn-small btn-inverse e-modal' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
$info_icon = "<a class='btn btn-default btn-secondary btn-sm btn-small btn-inverse e-modal' data-toggle='modal' data-bs-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
if(!empty($theme['preview'][0]))
{

4
e107_admin/users.php
View File

@ -2766,7 +2766,7 @@ class users_admin_form_ui extends e_admin_form_ui
$btn = '<div class="btn-group pull-right">
<button aria-expanded="false" class="btn btn-default btn-secondary btn-user-action dropdown-toggle" data-toggle="dropdown">
<button aria-expanded="false" class="btn btn-default btn-secondary btn-user-action dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="user-action-indicators" id="user-action-indicator-'.$user_id.'">'.e107::getParser()->toGlyph('fa-cog').'</span>
<span class="caret"></span>
</button>
@ -2957,7 +2957,7 @@ class users_admin_form_ui extends e_admin_form_ui
$query['id'] = $id;
$query = http_build_query($query, null, '&amp;');
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
$text = "<a href='".e_SELF."?{$query}' class='btn btn-default' title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".ADMIN_EDIT_ICON."</a>";
$special = $this->getController()->getListModel()->get('gen_datestamp');

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>

4
e107_handlers/e_marketplace.php
View File

@ -98,8 +98,8 @@ class e_marketplace
<div class="well">
<img src="'.e_IMAGE_ABS.'admin_images/credits_logo.png" alt="" style="margin-bottom:15px" />
<ul class="nav nav-tabs">
<li class="active"><a href="#login" data-toggle="tab">Login</a></li>
<li><a href="#create" data-toggle="tab">Create Account</a></li>
<li class="active"><a href="#login" data-toggle="tab" data-bs-toggle="tab">Login</a></li>
<li><a href="#create" data-toggle="tab" data-bs-toggle="tab">Create Account</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane active in" id="login">

18
e107_handlers/form_handler.php
View File

@ -565,7 +565,7 @@ class e_form
$active = ($key ==$initTab) ? ' class="nav-item active"' : ' class="nav-item"';
$text .= '<li'.$active.'><a class="nav-link" href="#'.$key.'" data-toggle="tab">'.$tab['caption'].'</a></li>';
$text .= '<li'.$active.'><a class="nav-link" href="#'.$key.'" data-toggle="tab" data-bs-toggle="tab">'.$tab['caption'].'</a></li>';
$c++;
}
@ -3232,7 +3232,7 @@ class e_form
<option value="faq_parent__4">Test 3</option>
</optgroup>
</select><div class="btn-group bootstrap-select e-tip tbox select filter"><button id="filter-options" class="btn dropdown-toggle clearfix" data-toggle="dropdown"><span class="filter-option pull-left">Display All</span>&nbsp;<span class="caret"></span></button><ul style="max-height: none; overflow-y: auto;" class="dropdown-menu" role="menu"><li rel="0"><a tabindex="-1" class="">Display All</a></li><li rel="1"><a tabindex="-1" class="">Clear Filter</a></li><li rel="2"><dt class="optgroup-div">Filter by&nbsp;Category</dt><a tabindex="-1" class="opt ">General</a></li><li rel="3"><a tabindex="-1" class="opt ">Misc</a></li><li rel="4"><a tabindex="-1" class="opt ">Test 3</a></li></ul></div>
</select><div class="btn-group bootstrap-select e-tip tbox select filter"><button id="filter-options" class="btn dropdown-toggle clearfix" data-toggle="dropdown" data-bs-toggle="dropdown"><span class="filter-option pull-left">Display All</span>&nbsp;<span class="caret"></span></button><ul style="max-height: none; overflow-y: auto;" class="dropdown-menu" role="menu"><li rel="0"><a tabindex="-1" class="">Display All</a></li><li rel="1"><a tabindex="-1" class="">Clear Filter</a></li><li rel="2"><dt class="optgroup-div">Filter by&nbsp;Category</dt><a tabindex="-1" class="opt ">General</a></li><li rel="3"><a tabindex="-1" class="opt ">Misc</a></li><li rel="4"><a tabindex="-1" class="opt ">Test 3</a></li></ul></div>
<div class="e-autocomplete"></div>
@ -3575,7 +3575,7 @@ var_dump($select_options);*/
$align = vartrue($options['align'],'left');
$text = '<div class="btn-group pull-'.$align.'">
<a class="btn dropdown-toggle '.$options['class'].'" data-toggle="dropdown" href="#">
<a class="btn dropdown-toggle '.$options['class'].'" data-toggle="dropdown" data-bs-toggle="dropdown" href="#">
'.($label ?: LAN_NO_LABEL_PROVIDED).'
<span class="caret"></span>
</a>
@ -4254,7 +4254,7 @@ var_dump($select_options);*/
// navbar-header nav-header
// navbar-header nav-header
$text = '<div class="col-selection dropdown e-tip pull-right float-right" data-placement="left">
<a class="dropdown-toggle" title="'.LAN_EFORM_008.'" data-toggle="dropdown" href="#"><b class="caret"></b></a>
<a class="dropdown-toggle" title="'.LAN_EFORM_008.'" data-toggle="dropdown" data-bs-toggle="dropdown" href="#"><b class="caret"></b></a>
<ul class="list-group dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel">
<li class="list-group-item "><h5 class="list-group-item-heading">'.LAN_EFORM_009.'</h5></li>
@ -4304,7 +4304,7 @@ var_dump($select_options);*/
/*
$text = '<div class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><b class="caret"></b></a>
<a class="dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#"><b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li>hi</li>
</ul>
@ -4823,7 +4823,7 @@ var_dump($select_options);*/
$dialog = vartrue($parms['target']) === 'dialog' ? ' e-modal' : ''; // iframe
$ext = vartrue($parms['target']) === 'blank' ? " rel='external' " : ''; // new window
$modal = vartrue($parms['target']) === 'modal' ? " data-toggle='modal' data-cache='false' data-target='#uiModal' " : '';
$modal = vartrue($parms['target']) === 'modal' ? " data-toggle='modal' data-bs-toggle='modal' data-cache='false' data-target='#uiModal' " : '';
$link = null;
@ -4942,7 +4942,7 @@ var_dump($select_options);*/
}
$query = http_build_query($query, null, '&amp;');
$text .= "<a href='".e_SELF."?{$query}' class='btn btn-default btn-secondary".$eModal."' ".$eModalCap." title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
$text .= "<a href='".e_SELF."?{$query}' class='btn btn-default btn-secondary".$eModal."' ".$eModalCap." title='".LAN_EDIT."' data-toggle='tooltip' data-bs-toggle='tooltip' data-placement='left'>
".$editIconDefault. '</a>';
}
@ -7247,7 +7247,7 @@ var_dump($select_options);*/
foreach($data['tabs'] as $i=>$label)
{
$class = ((string) $i === $curTab) ? 'class="active" ' : '';
$text .= '<li '.$class.'><a href="#tab'.$i.'" data-toggle="tab">'.$label.'</a></li>';
$text .= '<li '.$class.'><a href="#tab'.$i.'" data-toggle="tab" data-bs-toggle="tab">'.$label.'</a></li>';
}
$text .= ' </ul><div class="tab-content">';
@ -7581,7 +7581,7 @@ var_dump($select_options);*/
{
$text .=
'<button class="btn btn-success dropdown-toggle left" data-toggle="dropdown">
'<button class="btn btn-success dropdown-toggle left" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu col-selection">

4
e107_handlers/media_class.php
View File

@ -849,7 +849,7 @@ class e_media
$data_bb = ($bbcode) ? "img" : "";
$text .= "<a data-toggle='context' class='thumbnail {$class} e-tip' data-id='{$im['media_id']}' data-width='{$w}' data-height='{$h}' data-src='{$media_path}' data-bbcode='{$data_bb}' data-target='{$tagid}' data-path='{$im['media_url']}' data-preview='{$realPath}' data-alt=\"".$media_alt."\" title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
$text .= "<a data-toggle='context' data-bs-toggle='context' class='thumbnail {$class} e-tip' data-id='{$im['media_id']}' data-width='{$w}' data-height='{$h}' data-src='{$media_path}' data-bbcode='{$data_bb}' data-target='{$tagid}' data-path='{$im['media_url']}' data-preview='{$realPath}' data-alt=\"".$media_alt."\" title=\"".$diz."\" style='float:left' href='#' onclick=\"{$onclicki}\" >";
$text .= "<img class='image-rounded' src='".$img_url."' alt=\"".$im['media_title']."\" title=\"{$diz}\" />";
$text .= "</a>\n\n";
}
@ -1477,7 +1477,7 @@ class e_media
$class = varset($data['class']);
$dataPreview = !empty($data['previewHtml']) ? base64_encode($data['previewHtml']) : '';
return "<a data-toggle='context' class='e-media-select ".$select." ".$class."' ".$close." data-id='".$data['id']."' data-width='".$data['width']."' data-height='".$data['height']."' data-src='".$data['previewUrl']."' data-type='".$data['type']."' data-bbcode='".$data['bbcode']."' data-target='".$data['tagid']."' data-path='".$data['saveValue']."' data-preview='".$data['previewUrl']."' data-preview-html='".$dataPreview."' title=\"".$data['title']."\" style='".$style."' href='#' >";
return "<a data-toggle='context' data-bs-toggle='context' class='e-media-select ".$select." ".$class."' ".$close." data-id='".$data['id']."' data-width='".$data['width']."' data-height='".$data['height']."' data-src='".$data['previewUrl']."' data-type='".$data['type']."' data-bbcode='".$data['bbcode']."' data-target='".$data['tagid']."' data-path='".$data['saveValue']."' data-preview='".$data['previewUrl']."' data-preview-html='".$dataPreview."' title=\"".$data['title']."\" style='".$style."' href='#' >";
}

2
e107_handlers/sitelinks_class.php
View File

@ -1468,7 +1468,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
break;
case 'div':
$text .= "<div class='core-mainpanel-block col-md-2'><a data-toggle='tooltip' class='core-mainpanel-link-icon btn btn-default btn-secondary muted' href='".$link."' title='{$description}'>".$icon."
$text .= "<div class='core-mainpanel-block col-md-2'><a data-toggle='tooltip' data-bs-toggle='tooltip' class='core-mainpanel-link-icon btn btn-default btn-secondary muted' href='".$link."' title='{$description}'>".$icon."
<small class='core-mainpanel-link-text'>".$tp->toHTML($title,FALSE,"defs, emotes_off")."</small></a>
</div>";
break;

14
e107_handlers/theme_handler.php
View File

@ -2307,7 +2307,7 @@ class themeHandler
$website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : "");
// $preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<button class='btn btn-default btn-secondary btn-small btn-sm btn-inverse' type='submit' name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" >".$tp->toGlyph('fa-home',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-secondary btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
// $info_icon = "<a data-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
// $info_icon = "<a data-toggle='modal' data-bs-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
$info_icon = "<a class='btn btn-default btn-secondary btn-small btn-sm btn-inverse e-modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".e_SELF."?mode=".varset($_GET['mode'])."&id=".$theme['path']."&action=info' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
// $preview_icon = "<a title='Preview : ".$theme['name']."' rel='external' class='e-dialog' href='".e_BASE."index.php?themepreview.".$theme['id']."'>".E_32_SEARCH."</a>";
$admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-secondary btn-small btn-sm btn-inverse' type='submit' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-secondary btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
@ -2375,7 +2375,7 @@ class themeHandler
$viewUrl = $theme['url'];
//$main_icon = "<a data-src='".$downloadUrl."' href='{$downloadUrl}' data-target='{$id}' data-loading='".e_IMAGE."/generic/loading_32.gif' class='-e-ajax' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
// $main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
// $main_icon = "<a data-toggle='modal' data-bs-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
$modalCaption = (empty($theme['price'])) ? ' '.LAN_DOWNLOADING.' '.$theme['name']." ".$theme['version'] :' '.LAN_PURCHASE.' '.$theme['name']." ".$theme['version'];
$main_icon = "<a class='e-modal btn-default btn-secondary btn btn-sm btn-small btn-inverse' data-modal-caption=\"".$modalCaption."\" rel='external' href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('fa-download',array('size'=>'2x'))."</a>";
@ -2386,7 +2386,7 @@ class themeHandler
// $main_icon = "<a class='e-modal btn btn-small btn-inverse' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external' href='{$viewUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
$info_icon = "<a class='btn btn-default btn-secondary btn-sm btn-small btn-inverse e-modal' data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
$info_icon = "<a class='btn btn-default btn-secondary btn-sm btn-small btn-inverse e-modal' data-toggle='modal' data-bs-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' title='".TPVLAN_7."'>".$tp->toGlyph('fa-info-circle',array('size'=>'2x'))."</a>";
if($theme['livedemo'])
{
@ -2465,17 +2465,17 @@ class themeHandler
$text .= "
<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == self::RENDER_SITEPREFS)
{
$text .= "<li><a data-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
}
if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'help')))
{
$text .= "<li><a data-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
}
$text .= "</ul>
@ -2944,7 +2944,7 @@ class themeHandler
// print_a($preset);
//TODO LAN
$text = "<div class='btn-group pull-right'>".$frm->admin_button("setMenuPreset[".$key."]", TPVLAN_73,'other');
$text .= '<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
$text .= '<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu col-selection">

8
e107_handlers/user_handler.php
View File

@ -2127,10 +2127,10 @@ class e_userperms
//XXX Bootstrap Tabs (as used below) should eventually be the default for all of the admin area.
$text .= '
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">'.$this->renderSectionDiz('core').'</a></li>
<li><a href="#tab2" data-toggle="tab">'.$this->renderSectionDiz('plugin').'</a></li>
<li><a href="#tab3" data-toggle="tab">'.$this->renderSectionDiz('language').'</a></li>
<li><a href="#tab4" data-toggle="tab">'.$this->renderSectionDiz('main').'</a></li>
<li class="active"><a href="#tab1" data-toggle="tab" data-bs-toggle="tab">'.$this->renderSectionDiz('core').'</a></li>
<li><a href="#tab2" data-toggle="tab" data-bs-toggle="tab">'.$this->renderSectionDiz('plugin').'</a></li>
<li><a href="#tab3" data-toggle="tab" data-bs-toggle="tab">'.$this->renderSectionDiz('language').'</a></li>
<li><a href="#tab4" data-toggle="tab" data-bs-toggle="tab">'.$this->renderSectionDiz('main').'</a></li>
</ul>
<div class="tab-content">

16
e107_plugins/download/includes/admin.php
View File

@ -1283,9 +1283,9 @@ $columnInfo = array(
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' href='#download-create'>".DOWLAN_175."</a></li>
<li><a data-toggle='tab' href='#download-edit-external'>".DOWLAN_176."</a></li>
<li><a data-toggle='tab' href='#download-edit-mirror'>".DOWLAN_128."</a></li>
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#download-create'>".DOWLAN_175."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#download-edit-external'>".DOWLAN_176."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#download-edit-mirror'>".DOWLAN_128."</a></li>
</ul>
<form method='post' action='".e_SELF."?".e_QUERY."' id='myform'>
<div class='tab-content'>
@ -2167,11 +2167,11 @@ $columnInfo = array(
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' href='#core-download-download1'>".LAN_DL_DOWNLOAD_OPT_GENERAL."</a></li>
<li><a data-toggle='tab' href='#core-download-download2'>".LAN_DL_DOWNLOAD_OPT_BROKEN."</a></li>
<li><a data-toggle='tab' href='#core-download-download3'>".LAN_DL_DOWNLOAD_OPT_AGREE."</a></li>
<li><a data-toggle='tab' href='#core-download-download4'>".LAN_DL_DOWNLOAD_OPT_SECURITY."</a></li>
<li><a data-toggle='tab' href='#core-download-download5'>".LAN_DL_UPLOAD."</a></li>
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download1'>".LAN_DL_DOWNLOAD_OPT_GENERAL."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download2'>".LAN_DL_DOWNLOAD_OPT_BROKEN."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download3'>".LAN_DL_DOWNLOAD_OPT_AGREE."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download4'>".LAN_DL_DOWNLOAD_OPT_SECURITY."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download5'>".LAN_DL_UPLOAD."</a></li>
</ul>
<form method='post' action='".e_SELF."?".e_QUERY."'>\n

2
e107_plugins/featurebox/templates/featurebox_category_template.php
View File

@ -242,7 +242,7 @@ $FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['item_separator'] = '<div class=
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['item_empty'] = '';
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['nav_start'] = '<ul class="nav nav-tabs">';
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['nav_item'] = '<li class="{FEATUREBOX_ACTIVE}"><a data-toggle="tab" href="#tab-{FEATUREBOX_COLSCOUNT}">{FEATUREBOX_TITLE}</a></li>';
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['nav_item'] = '<li class="{FEATUREBOX_ACTIVE}"><a data-toggle="tab" data-bs-toggle="tab" href="#tab-{FEATUREBOX_COLSCOUNT}">{FEATUREBOX_TITLE}</a></li>';
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['nav_end'] = '</ul>';
$FEATUREBOX_CATEGORY_TEMPLATE['bootstrap_tabs']['nav_separator'] = '';
//<div class="e-bootstrap_tabs">

2
e107_plugins/forum/forum_post.php
View File

@ -948,7 +948,7 @@ class forum_post_handler
<div class='alert alert-block alert-warning'>
<h4>".LAN_FORUM_2025.': '.$thread_name."</h4>
".LAN_FORUM_2027."<br />".str_replace(array('[', ']'), array('<b>', '</b>'), LAN_FORUM_2028)."
<a class='pull-right float-right btn btn-xs btn-primary e-expandit' href='#post-info'>".LAN_FORUM_2026."</a>
<a class='pull-right float-right float-end btn btn-xs btn-primary e-expandit' href='#post-info'>".LAN_FORUM_2026."</a>
</div>
<div id='post-info' class='e-hideme alert alert-block alert-danger'>
".$tp->toHTML($this->data['post_entry'],true)."

2
e107_plugins/forum/forum_viewforum.php
View File

@ -525,7 +525,7 @@ function init()
$text = '<div class="btn-group">
<a href="' . $url . '" class="btn btn-primary">' . LAN_FORUM_1018 . '</a>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right float-right">

6
e107_plugins/forum/shortcodes/batch/post_shortcodes.php
View File

@ -358,10 +358,10 @@ class plugin_forum_post_shortcodes extends e_shortcode
/*
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a href='#type' data-toggle='tab'>".LAN_FORUM_3025."</a></li>";
<li class='active'><a href='#type' data-toggle='tab' data-bs-toggle='tab'>".LAN_FORUM_3025."</a></li>";
$text .= ($poll) ? "<li><a href='#poll' data-toggle='tab'>".LAN_FORUM_1016."</a></li>\n" : "";
$text .= ($attach) ? "<li><a href='#attach' data-toggle='tab'>".LAN_FORUM_3012."</a></li>\n" : "";
$text .= ($poll) ? "<li><a href='#poll' data-toggle='tab' data-bs-toggle='tab'>".LAN_FORUM_1016."</a></li>\n" : "";
$text .= ($attach) ? "<li><a href='#attach' data-toggle='tab' data-bs-toggle='tab'>".LAN_FORUM_3012."</a></li>\n" : "";
$text .= "
</ul>

14
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@ -864,7 +864,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
$text = '<div class="btn-group ">
<a class="btn btn-default btn-secondary btn-sm btn-small" href="' . $userUrl . '">' . $username . '</a>
<button class="btn btn-default btn-secondary btn-sm btn-small dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-default btn-secondary btn-sm btn-small dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu left">
@ -914,8 +914,8 @@ class plugin_forum_view_shortcodes extends e_shortcode
$postID = !empty($this->postInfo['post_id']) ? $this->postInfo['post_id'] : 0;
// {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG}
$text = '<div class="btn-group pull-right float-right">
<button class="btn btn-default btn-secondary btn-sm btn-small dropdown-toggle" data-toggle="dropdown">
$text = '<div class="btn-group pull-right float-right float-end">
<button class="btn btn-default btn-secondary btn-sm btn-small dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
' . LAN_FORUM_8013 . '
';
@ -926,7 +926,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
$text .= '
</button>
<ul class="dropdown-menu pull-right float-right text-right">';
<ul class="dropdown-menu pull-right dropdown-menu-end float-right text-right">';
$text .= "<li class='text-right float-right float-right'><a href='" . e_HTTP . "email.php?plugin:forum." . $threadID . "'>" . LAN_FORUM_2044 . " " . $tp->toGlyph('fa-envelope') . "</a></li>";
@ -1206,7 +1206,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
}
$replyUrl = "<a class='btn btn-primary" . ($url ? "" : " disabled") . "' "
. ($url ? "" : " data-toggle='tooltip' title='" . LAN_FORUM_0046 . "'
. ($url ? "" : " data-toggle='tooltip' data-bs-toggle='tooltip' title='" . LAN_FORUM_0046 . "'
style='cursor: not-allowed; pointer-events: all !important;'") . " href='" . ($url ?: "#") . "'>" . LAN_FORUM_2006 . "</a>" . ($url ? "" : "<span>&nbsp;</span>");
if($this->forum->checkPerm($this->var['thread_forum_id'], 'post'))
@ -1235,7 +1235,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
$text = '<div class="btn-group">
' . $replyUrl . '
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
';
if(defined('BOOTSTRAP') && BOOTSTRAP !== 4)
@ -1246,7 +1246,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
$text .= '
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right float-right">
<ul class="dropdown-menu pull-right dropdown-menu-end float-right">
';
foreach($options as $key => $val)

25
e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View File

@ -85,11 +85,11 @@
global $forum;
$jumpList = $forum->forumGetAllowed('view');
$text = '<div class="btn-group">';
$text = '<div class="btn-group mb-2">';
/*
$text .=
($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' :'').
'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
'.($this->var['ntUrl'] ? '' : LAN_FORUM_1001." ".LAN_FORUM_8013).'<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
@ -98,7 +98,7 @@
*/
$href = "#";
$disabled = " disabled";
$restricted_to_members_only = " data-toggle='tooltip' title='".LAN_FORUM_0006."'
$restricted_to_members_only = " data-toggle='tooltip' data-bs-toggle='tooltip' title='".LAN_FORUM_0006."'
style='cursor: not-allowed; pointer-events: all !important;'";
$extra_space = "<span>&nbsp;</span>";
if ($this->var['ntUrl'])
@ -110,11 +110,8 @@
}
$text .=
'<a href="'.$href.
'" class="btn btn-primary'.$disabled.'"'
.$restricted_to_members_only.'>'.LAN_FORUM_1018.'</a>
'.$extra_space.'
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
'<a href="'.$href.'" class="btn btn-primary'.$disabled.'"'.$restricted_to_members_only.'>'.LAN_FORUM_1018.'</a>'.$extra_space.'
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
';
if($bootstrap !== 4)
{
@ -123,7 +120,7 @@
$text .= '
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right float-right">
<ul class="dropdown-menu pull-right float-right dropdown-menu-end">
';
//-- foreach($jumpList as $key => $val)
@ -1026,7 +1023,7 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa;
$opts[] = "<a data-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
}
$text .= ' ... ';
for($a = $pages - 3; $a <= $pages - 1; $a++)
@ -1037,7 +1034,7 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa;
$opts[] = "<a data-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
}
}
else
@ -1051,7 +1048,7 @@
// $url = e107::getUrl()->create('forum/thread/view', $urlparms);
$title = $tp->lanVars(LAN_GOTOPAGEX, $aa);
$url = e107::url('forum', 'topic', $urlparms) . '&amp;p=' . $aa;
$opts[] = "<a data-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
$opts[] = "<a data-toggle='tooltip' data-bs-toggle='tooltip' title=\"" . $title . "\" href='{$url}'>{$aa}</a>";
}
}
@ -1135,10 +1132,10 @@
$tp = e107::getParser();
// $text = "<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'>";
$text = '<div class="btn-group"><button class="btn btn-default btn-secondary btn-sm btn-mini dropdown-toggle" data-toggle="dropdown">
$text = '<div class="btn-group"><button class="btn btn-default btn-secondary btn-sm btn-mini dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right float-right">
<ul class="dropdown-menu pull-right dropdown-menu-end float-right">
';
//FIXME - not fully working.

2
e107_plugins/forum/templates/forum_poll_template.php
View File

@ -51,7 +51,7 @@ $FORUM_POLL_TEMPLATE['results']['start'] = "
";
$FORUM_POLL_TEMPLATE['results']['item'] = "
<strong>{OPTION}</strong><small class='pull-right float-right'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
<strong>{OPTION}</strong><small class='pull-right float-right float-end'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
{BAR}
";

6
e107_plugins/forum/templates/forum_viewforum_template.php
View File

@ -289,7 +289,7 @@ $FORUM_VIEWFORUM_TEMPLATE['start'] = "<div id='forum-viewforum'>";
$FORUM_VIEWFORUM_TEMPLATE['header'] = "<div class=' row-fluid'><div>{BREADCRUMB}</div></div>
<div class='row row-fluid'>
<div class='col-md-9 span9 pull-left float-left'><h3>{FORUMIMAGE:h=60}{FORUMTITLE}</h3></div>
<div class='col-md-3 span3 pull-right float-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>
<div class='col-md-3 span3 pull-right float-right float-end right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>
<table class='table table-hover table-striped table-bordered'>
<colgroup>
<col style='width:3%' />
@ -313,7 +313,7 @@ $FORUM_VIEWFORUM_TEMPLATE['item'] = "<tr>
</div>
</td>
<td class='text-center'>{REPLIESX}</td><td class='hidden-xs text-center'>{VIEWSX}</td>
<td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right float-right pull-right'>{ADMINOPTIONS}</div></td>
<td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right float-right pull-right float-end'>{ADMINOPTIONS}</div></td>
</tr>\n";
@ -350,7 +350,7 @@ $SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top
$FORUM_VIEWFORUM_TEMPLATE['footer'] = "</table>
<div class='row row-fluid'>
<div class='col-md-5 span5 pull-left float-left left' style='padding-top:10px'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right float-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div>
<div class='col-md-5 span5 pull-left float-left left' style='padding-top:10px'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right float-right float-end right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div>
</div>

8
e107_plugins/forum/templates/forum_viewtopic_template.php
View File

@ -327,7 +327,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['start'] = "
</div>
<div class='row row-fluid'>
<div class='col-md-9 span9 pull-left float-left'><h3>{THREADNAME}</h3></div><div class='col-md-3 span3 pull-right float-right right text-right' style='padding-top:10px'>{TRACK} {BUTTONSX}</div>
<div class='col-md-9 span9 pull-left float-left'><h3>{THREADNAME}</h3></div><div class='col-md-3 span3 pull-right float-right float-end right text-right' style='padding-top:10px'>{TRACK} {BUTTONSX}</div>
</div>
{MESSAGE}
@ -366,7 +366,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
{LEVEL=badge} {LEVEL=glyph}
</small>
</div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div>
</div>
<div class='visible-xs col-xs-12'><hr /></div>
@ -405,7 +405,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul>
{GOTOPAGES}
</div>
<div class='col-xs-12 col-md-4'>
<div class='pull-right float-right'>
<div class='pull-right float-right float-end'>
{BUTTONSX}
</div>
</div>
@ -454,7 +454,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['deleted'] = "
{LEVEL=badge} {LEVEL=glyph}
</small>
</div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right float-end'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div>
</div>
<div class='visible-xs col-xs-12'><hr /></div>

2
e107_plugins/pm/e_shortcode.php
View File

@ -61,7 +61,7 @@ class pm_shortcodes extends e_shortcode
$urlOutbox = e107::url('pm','index','', array('query'=>array('mode'=>'outbox')));
$urlCompose = e107::url('pm','index','', array('query'=>array('mode'=>'send')));
return '<a class="pm-nav nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#">'.$icon.$count.'</a>
return '<a class="pm-nav nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" data-bs-toggle="dropdown" href="#">'.$icon.$count.'</a>
<ul class="dropdown-menu dropdown-menu-end">
<li>
<a class="dropdown-item" href="'.$urlInbox.'">'.LAN_PLUGIN_PM_INBOX.'</a>

6
e107_plugins/tinymce4/plugins/e107/dialog.php
View File

@ -137,11 +137,11 @@ class e_bootstrap
$text .= '
<ul class="nav nav-tabs">';
$text .= '<li class="active" ><a href="#mbuttons" data-toggle="tab">Buttons</a></li>';
$text .= '<li class="active" ><a href="#mbuttons" data-toggle="tab" data-bs-toggle="tab">Buttons</a></li>';
$text .= '<li><a href="#badges" data-toggle="tab">Labels &amp; Badges</a></li>';
$text .= '<li><a href="#badges" data-toggle="tab" data-bs-toggle="tab">Labels &amp; Badges</a></li>';
$text .= '<li><a href="#glyphs" data-toggle="tab">Glyphicons</a></li>';
$text .= '<li><a href="#glyphs" data-toggle="tab" data-bs-toggle="tab">Glyphicons</a></li>';
$text .= '</ul>';

2
e107_tests/tests/unit/e_formTest.php
View File

@ -1089,7 +1089,7 @@ class e_formTest extends \Codeception\Test\Unit
1 => array(
'value' => 'Some text',
'parms' => array('link'=>'myurl.php?id=[id]', 'target'=>'modal'),
'expected' => "<a class='e-tip' href='myurl.php?id=3' data-toggle='modal' data-cache='false' data-target='#uiModal' title='Quick View' >Some text</a>"
'expected' => "<a class='e-tip' href='myurl.php?id=3' data-toggle='modal' data-bs-toggle='modal' data-cache='false' data-target='#uiModal' title='Quick View' >Some text</a>"
),
2 => array(
'value' => 'Some text',

4
e107_themes/bootstrap3/admin_template.php
View File

@ -103,7 +103,7 @@ $E_ADMIN_NAVIGATION['button_pm'] = '
<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 pull-right dropdown-menu-end 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'] = '

2
search.php
View File

@ -164,7 +164,7 @@ class search_front extends e_shortcode
<input class='tbox form-control m_search' type='text' id='q' name='q' size='35' value='".$value."' maxlength='50' />
<div class='input-group-btn'>
<button class='btn btn-primary' type='submit' name='s' value='1' >".$tp->toGlyph('fa-search',false)."</button>
<button class='btn btn-primary dropdown-toggle' tabindex='-1' data-toggle='dropdown' type='button'>
<button class='btn btn-primary dropdown-toggle' tabindex='-1' data-toggle='dropdown' data-bs-toggle='dropdown' type='button'>
";
if(defined('BOOTSTRAP') && BOOTSTRAP !== 4)