mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +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

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');