mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 04:12:00 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1275 from lonalore/master

Browse Source 
A few minor fixes and corrections...
This commit is contained in:
Cameron
2016-01-13 13:59:53 -08:00
parent 82d4a5583a 78d9b5da77
commit d396bf8dc9
9 changed files with 77 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,11 +99,14 @@ class comment_shortcodes extends e_shortcode
$pref = e107::getPref();
$REPLY = '';
if($this->var['comment_lock'] != "1" && $this->var['comment_blocked'] < 1)
if(USERID || $pref['anon_post'] == 1)
{
if ($thisaction == "comment" && $pref['nested_comments'])
if($this->var['comment_lock'] != "1" && $this->var['comment_blocked'] < 1)
{
$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn btn-default 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>";
if ($thisaction == "comment" && $pref['nested_comments'])
{
$REPLY = "<a id='e-comment-reply-".$this->var['comment_id']."' class='e-comment-reply btn btn-default 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>";
}
}
}
return $REPLY;
@@ -431,10 +434,10 @@ class comment_shortcodes extends e_shortcode
if($prov == 'facebook' || $prov == 'twitter')
{
//TODO Move styling to e107.css
$text = "<img src='".e_IMAGE."xup/".$prov.".png' style='display:inline-block;width:26px;height:26px;vertical-align:middle' alt='Share' />";
$text = "<img src='".e_IMAGE_ABS."xup/".$prov.".png' style='display:inline-block;width:26px;height:26px;vertical-align:middle' alt='Share' />";
$text .= e107::getForm()->checkbox('comment_share',$prov,true);
$text .= "Share";
$text .= LAN_SHARE;
return $text;
}
}

6
e107_core/templates/nextprev_template.php
View File

@@ -42,9 +42,9 @@ $NEXTPREV_TEMPLATE['default_separator'] = '&nbsp;';
/* ****************** Default when Bootstrap is enabled ************** */
$NEXTPREV_TEMPLATE['bootstrap_start'] = "<!-- Start of Next/Prev -->\n<div class='pagination'>\n<ul class='pagination'>";
$NEXTPREV_TEMPLATE['bootstrap_end'] = "</ul></div><!-- End of Next/Prev -->";
$NEXTPREV_TEMPLATE['bootstrap_nav_caption'] = '';
$NEXTPREV_TEMPLATE['bootstrap_start'] = "<!-- Start of Next/Prev -->\n<nav>\n<ul class='pagination'>";
$NEXTPREV_TEMPLATE['bootstrap_end'] = "</ul></nav><!-- End of Next/Prev -->";
$NEXTPREV_TEMPLATE['bootstrap_nav_caption'] = '';
$NEXTPREV_TEMPLATE['bootstrap_nav_first'] = '<li><a class="first hidden-xs" href="{url}" title="{url_label}">{label}</a></li>';
$NEXTPREV_TEMPLATE['bootstrap_nav_prev'] = '<li><a class="prev" href="{url}" title="{url_label}">{label}</a></li>';