mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 03:24:20 +02:00
Code Issues Releases Wiki Activity

Issue #4332 - Bootstrap 5 styling fixes.

Browse Source
This commit is contained in:
Cameron
2021-02-23 11:11:35 -08:00
parent 973a446bb4
commit 76af210666
8 changed files with 19 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_plugins/forum/forum_viewforum.php
View File

@@ -155,6 +155,7 @@ function init()
if(THEME_LEGACY !== true)
{
$FORUM_VIEWFORUM_TEMPLATE = e107::getTemplate('forum', 'forum_viewforum');
$GLOBALS['FORUM_VIEWFORUM_TEMPLATE'] = $FORUM_VIEWFORUM_TEMPLATE;
}
else
{

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

@@ -85,7 +85,7 @@
global $forum;
$jumpList = $forum->forumGetAllowed('view');
$text = '<div class="btn-group mb-2">';
$text = '<div class="btn-group mb-3">';
/*
$text .=
($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' :'').
@@ -207,39 +207,7 @@
function sc_iconkey()
{
global $FORUM_VIEWFORUM_TEMPLATE;
/*--
if(defset('BOOTSTRAP')==3 && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) // v2.x
{
return e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'],true);
}
// v1.x
return "
<table class='table table-bordered' style='width:100%'>
<tr>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_new_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_0039."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_nonew_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_0040."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_sticky_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_1011."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_announce_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_1013."</td>
</tr>
<tr>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_new_popular_small."</td>
<td style='width:2%' class='smallblacktext'>".LAN_FORUM_0039." ".LAN_FORUM_1010."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_nonew_popular_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_0040." ".LAN_FORUM_1010."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_stickyclosed_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_1012."</td>
<td style='vertical-align:middle; text-align:center; width:2%'>".IMAGE_closed_small."</td>
<td style='width:10%' class='smallblacktext'>".LAN_FORUM_1014."</td>
</tr>
</table>";
--*/
$FORUM_VIEWFORUM_TEMPLATE = varset($GLOBALS['FORUM_VIEWFORUM_TEMPLATE']);
return (defset('BOOTSTRAP') && !empty($FORUM_VIEWFORUM_TEMPLATE['iconkey'])) ? e107::getParser()->parseTemplate($FORUM_VIEWFORUM_TEMPLATE['iconkey'], true) : "
<table class='table table-bordered' style='width:100%'>
@@ -827,14 +795,14 @@
function sc_threaddate()
{
// global $gen;
return $this->gen->convert_date($this->var['thread_datestamp'], 'forum');
}
function sc_threadtimelapse()
{
// global $gen;
return $this->gen->computeLapse($this->var['thread_datestamp'], time(), false, false, 'short'); // convert_date($thread_info['thread_datestamp'], 'forum');
}

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

@@ -103,7 +103,7 @@ $FORUM_TRACK_END = "<br />TRACK-END";
$FORUM_TEMPLATE['main']['start'] = "{FORUM_BREADCRUMB}
<div class=''>
<div class='form-group right'>
<div class='form-group right float-right float-end mb-3'>
{SEARCH}
</div>
</div>

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

@@ -288,8 +288,8 @@ $FORUM_VIEWFORUM_TEMPLATE['caption'] = "";
$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 float-end right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>
<div class='col-md-9 span9 pull-left float-left float-start'><h3>{FORUMIMAGE:h=60}{FORUMTITLE}</h3></div>
<div class='col-md-3 span3 pull-right float-right float-end right'>{NEWTHREADBUTTONX}</div></div>
<table class='table table-hover table-striped table-bordered'>
<colgroup>
<col style='width:3%' />
@@ -348,18 +348,17 @@ $FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = "<tr><th colspan='2'>".LAN_FORUM_
$SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top:10px'><div class='panel-heading'>".LAN_FORUM_8012."</div><div class='panel-body'>{---}</div></div>";
$FORUM_VIEWFORUM_TEMPLATE['footer'] = "</table>
<div class='row row-fluid'>
<div class='row row-fluid d-flex justify-content-between'>
<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 class='col-md-5 span5 pull-left float-left float-start left'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right float-right float-end right'>{NEWTHREADBUTTONX}</div>
</div>
<div>
<div class=>
<div class='panel panel-default' style='margin-top:50px'>
<div class='panel-heading'>".LAN_FORUM_8011."</div>
<div class='panel-body'>
{ICONKEY}
</div>
</div>
</div>

2
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 float-end 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'>{TRACK} {BUTTONSX}</div>
</div>
{MESSAGE}