mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +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

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.