mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 10:50:25 +02:00
Code Issues Releases Wiki Activity

Issue #4332 - Bootstrap5 fixes.

Browse Source
This commit is contained in:
Cameron
2021-01-04 13:02:19 -08:00
parent f8f40a23fe
commit ed0629a976
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -111,7 +111,7 @@ class comment_shortcodes extends e_shortcode
{ {
if ($thisaction == "comment" && $pref['nested_comments']) if ($thisaction == "comment" && $pref['nested_comments'])
{ {
$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn btn-default btn-secondary btn-mini btn-xs' data-type='".$this->var['comment_type']."' data-target='".e_HTTP."comment.php' href='".e_HTTP."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>"; $REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn btn-default btn-secondary btn-sm btn-mini btn-xs' data-type='".$this->var['comment_type']."' data-target='".e_HTTP."comment.php' href='".e_HTTP."comment.php?reply.".$thistable.".".$this->var['comment_id'].".".$thisid."'>".COMLAN_326."</a>";
} }
} }
} }
@@ -129,7 +129,7 @@ class comment_shortcodes extends e_shortcode
} }
function sc_comment_avatar($parm = '') function sc_comment_avatar($parm = null)
{ {
$tp = e107::getParser(); $tp = e107::getParser();
@@ -141,7 +141,7 @@ class comment_shortcodes extends e_shortcode
$this->var = array_merge($this->var, $userdata); $this->var = array_merge($this->var, $userdata);
} }
$text = $tp->toAvatar($this->var); $text = $tp->toAvatar($this->var, $parm);
$text .= '<div class="field-help" style="display:none;">'; $text .= '<div class="field-help" style="display:none;">';
$text .= '<div class="left">'; $text .= '<div class="left">';
@@ -224,11 +224,11 @@ class comment_shortcodes extends e_shortcode
// e107::getDebug()->log($this->var); // e107::getDebug()->log($this->var);
$text = "<a href='#' data-target='".e_HTTP."comment.php' id='e-comment-delete-".$this->var['comment_id']."' data-type='".$this->var['comment_type']."' data-itemid='".$this->var['comment_item_id']."' class='e-comment-delete btn btn-default btn-secondary btn-mini btn-xs'>".LAN_DELETE."</a> "; $text = "<a href='#' data-target='".e_HTTP."comment.php' id='e-comment-delete-".$this->var['comment_id']."' data-type='".$this->var['comment_type']."' data-itemid='".$this->var['comment_item_id']."' class='e-comment-delete btn btn-default btn-secondary btn-sm btn-mini btn-xs'>".LAN_DELETE."</a> ";
if($this->var['comment_blocked'] == 2) // pending approval. if($this->var['comment_blocked'] == 2) // pending approval.
{ {
$text .= "<a href='#' data-target='" . e_HTTP . "comment.php' id='e-comment-approve-" . $this->var['comment_id'] . "' class='e-comment-approve btn btn-default btn-secondary btn-mini btn-xs'>" . COMLAN_404 . "</a> "; $text .= "<a href='#' data-target='" . e_HTTP . "comment.php' id='e-comment-approve-" . $this->var['comment_id'] . "' class='e-comment-approve btn btn-default btn-secondary btn-sm btn-mini btn-xs'>" . COMLAN_404 . "</a> ";
} }
return $text; return $text;
/* /*
@@ -408,7 +408,7 @@ class comment_shortcodes extends e_shortcode
//Searching for '.' is BAD!!! It breaks mod rewritten requests. Why is this needed at all? //Searching for '.' is BAD!!! It breaks mod rewritten requests. Why is this needed at all?
if (strpos(e_QUERY, "&") !== false) if (strpos(e_QUERY, "&") !== false)
{ {
return "<a data-target='".e_HTTP."comment.php' id='e-comment-edit-".$this->var['comment_id']."' class='btn btn-default btn-secondary btn-mini btn-xs e-comment-edit' href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$this->var['comment_id']."'>{$adop_icon}</a>"; return "<a data-target='".e_HTTP."comment.php' id='e-comment-edit-".$this->var['comment_id']."' class='btn btn-default btn-secondary btn-sm btn-mini btn-xs e-comment-edit' href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$this->var['comment_id']."'>{$adop_icon}</a>";
} }
else else
{ {

12
e107_core/templates/comment_template.php
View File

@@ -30,9 +30,9 @@ $COMMENT_WRAPPER['form'] = $COMMENT_WRAPPER['item']; // use the above wrappers f
$COMMENT_TEMPLATE['form'] = " $COMMENT_TEMPLATE['form'] = "
{SETIMAGE: w=90&h=90&crop=1} {SETIMAGE: w=90&h=90&crop=1}
<div class='media comment-box comment-box-form clearfix'> <div class='media comment-box comment-box-form d-flex clearfix'>
<div class='comment-box-left media-object pull-left' > <div class='comment-box-left media-object pull-left me-3' >
{COMMENT_AVATAR} {COMMENT_AVATAR: shape=circle}
</div> </div>
<div class='media-body comment-box-right text-left' > <div class='media-body comment-box-right text-left' >
<div class='P10'> <div class='P10'>
@@ -53,10 +53,10 @@ $COMMENT_TEMPLATE['form'] = "
$COMMENT_TEMPLATE['item'] = ' $COMMENT_TEMPLATE['item'] = '
{SETIMAGE: w=90&h=90&crop=1} {SETIMAGE: w=90&h=90&crop=1}
<div class="media-object comment-box-left pull-left span1"> <div class="media-object comment-box-left pull-left me-3 span1">
{COMMENT_AVATAR} {COMMENT_AVATAR: shape=circle}
</div> </div>
<div class="media-body comment-box-right "> <div class="media-body d-flex comment-box-right ">
<div class="row"> <div class="row">
<div class="comment-box-username span2 col-xs-6 col-sm-6 col-md-6">{USERNAME}</div> <div class="comment-box-username span2 col-xs-6 col-sm-6 col-md-6">{USERNAME}</div>

2
e107_handlers/comment_class.php
View File

@@ -463,7 +463,7 @@ class comment
// $COMMENT_TEMPLATE['ITEM_END'] = "\n</div><div class='clear_b'><!-- --></div>\n"; // $COMMENT_TEMPLATE['ITEM_END'] = "\n</div><div class='clear_b'><!-- --></div>\n";
//XXX Do NOT add to template - too important to allow for modification. //XXX Do NOT add to template - too important to allow for modification.
$COMMENT_TEMPLATE['item_start'] = "\n\n<li id='{COMMENT_ITEMID}' class='media comment-box clearfix'>\n"; $COMMENT_TEMPLATE['item_start'] = "\n\n<li id='{COMMENT_ITEMID}' class='media comment-box d-flex clearfix'>\n";
$COMMENT_TEMPLATE['item_end'] = "\n</li>\n"; $COMMENT_TEMPLATE['item_end'] = "\n</li>\n";
if(defset('BOOTSTRAP') === 2 || defset('BOOTSTRAP') === true) // Convert Bootstrap3 to Bootstrap 2 when detected. if(defset('BOOTSTRAP') === 2 || defset('BOOTSTRAP') === true) // Convert Bootstrap3 to Bootstrap 2 when detected.