mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

Issue #2970 Bootstrap 3 pull-left/right combined with Bootstrap 4 float-left/right. News Email/Print icon default styles added.

Browse Source
This commit is contained in:
Cameron 2019-06-17 12:27:53 -07:00
parent d318b7a8fc
commit 26ff074ee5
28 changed files with 68 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@ class comment_shortcodes extends e_shortcode
$pid = ($this->var['action'] == 'reply') ? $this->var['pid'] : 0;
$class = "e-comment-submit ";
$class .= (!empty($parm['class'])) ? $parm['class'] : 'button btn btn-primary e-comment-submit pull-right';
$class .= (!empty($parm['class'])) ? $parm['class'] : 'button btn btn-primary e-comment-submit pull-right float-right';
$options = array(
'class' => $class,
'data-pid' => $pid,

4
e107_core/shortcodes/batch/news_shortcodes.php
View File

@ -521,7 +521,7 @@ class news_shortcodes extends e_shortcode
return null;
}
$class = varset($parm['class']) ? " ".$parm['class'] : "";
$class = !empty($parm['class']) ? " ".$parm['class'] : " btn btn-default btn-secondary";
if(empty($this->param['commentlink']))
{
@ -598,7 +598,7 @@ class news_shortcodes extends e_shortcode
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt=\"".LAN_EDIT."\" class='icon' />" : $default);
$class = varset($parm['class']);
$class = varset($parm['class'], 'btn btn-default btn-secondary');
return "<a class='e-tip ".$class." hidden-print' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_EDIT."\">".$adop_icon."</a>\n";
}

2
e107_core/templates/page_template.php
View File

@ -22,7 +22,7 @@ $sc_style['CPAGESUBTITLE|default']['post'] = '</h2>';
$sc_style['CPAGEMESSAGE|default']['pre'] = '';
$sc_style['CPAGEMESSAGE|default']['post'] = '<div class="clear"><!-- --></div>';
$sc_style['CPAGENAV|default']['pre'] = '<div class="f-right pull-right col-md-3">';
$sc_style['CPAGENAV|default']['pre'] = '<div class="f-right pull-right float-right col-md-3">';
$sc_style['CPAGENAV|default']['post'] = '</div>';
#### default template - BC ####

4
e107_handlers/emailprint_class.php
View File

@ -62,7 +62,7 @@ class emailprint
{
$genericMail = $tp->toGlyph('fa-envelope',false); // "<i class='icon-envelope'></i>";
$genericPrint = $tp->toGlyph('fa-print',false); // "<i class='icon-print'></i>";
$class = varset($parm['class']) ? $parm['class'] : "";
$class = !empty($parm['class']) ? $parm['class'] : "btn btn-default btn-secondary";
}
else // BC
{
@ -76,7 +76,7 @@ class emailprint
{
$ico_mail = (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL) ? "<img src='".THEME_ABS."images/".ICONMAIL."' alt='".LAN_EMAIL_7."' />" : $genericMail);
//TDOD CSS class
$text_emailprint .= "<a class='e-tip hidden-print".$class."' href='".e_HTTP."email.php?".$email.".".$id."' title='".LAN_EMAIL_7."'>".$ico_mail."</a> ";
$text_emailprint .= "<a class='e-tip hidden-print ".$class."' href='".e_HTTP."email.php?".$email.".".$id."' title='".LAN_EMAIL_7."'>".$ico_mail."</a> ";
}
if ($look == 0 || $look == 2)
{

2
e107_handlers/form_handler.php
View File

@ -4053,7 +4053,7 @@ var_dump($select_options);*/
// navbar-header nav-header
// navbar-header nav-header
$text = '<div class="col-selection dropdown e-tip pull-right" data-placement="left">
$text = '<div class="col-selection dropdown e-tip pull-right float-right" data-placement="left">
<a class="dropdown-toggle" title="'.LAN_EFORM_008.'" data-toggle="dropdown" href="#"><b class="caret"></b></a>
<ul class="list-group dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel">

2
e107_plugins/blogcalendar_menu/blogcalendar_menu.php
View File

@ -166,7 +166,7 @@ if(false === $cached)
if(deftrue('BOOTSTRAP')) // v2.x
{
$month_selector = '<span class="btn-group pull-right"><a class="btn btn-mini btn-default btn-secondary btn-xs " href="#blogCalendar" data-slide="prev">‹</a>
$month_selector = '<span class="btn-group pull-right float-right"><a class="btn btn-mini btn-default btn-secondary btn-xs " href="#blogCalendar" data-slide="prev">‹</a>
<a class="btn btn-mini btn-default btn-secondary btn-xs" href="#blogCalendar" data-slide="next">›</a></span>';
$caption = "<span class='inline-text'>".BLOGCAL_L1." ".$month_selector."</span>";

2
e107_plugins/chatbox_menu/chat.php
View File

@ -163,7 +163,7 @@ if (CB_MOD) {
$text =
"<form method='post' action='" . e_SELF . "'>"
. $text .
"<input type='submit' class='btn btn-danger btn-secondary button pull-right' name='moderate' value='" . CHATBOX_L13 . "' />
"<input type='submit' class='btn btn-danger btn-secondary button float-right pull-right' name='moderate' value='" . CHATBOX_L13 . "' />
</form>";
}

6
e107_plugins/chatbox_menu/templates/chatbox_menu_template.php
View File

@ -45,11 +45,11 @@ $CHATBOX_MENU_TEMPLATE['list']['item'] = '
</div>
<div class="media-body">
<h4 class="media-heading" style="display: inline !important;">{CB_USERNAME}</h4>
<small class="label label-default pull-right">{CB_TIMEDATE}</small><br>
<small class="label label-default pull-right float-right">{CB_TIMEDATE}</small><br>
<p>{CB_MESSAGE}</p>
<div>
<div class="pull-left">{CB_BLOCKED}</div>
<div class="pull-right">{CB_MOD}</div>
<div class="pull-left float-left">{CB_BLOCKED}</div>
<div class="pull-right float-right">{CB_MOD}</div>
</div>
</div>
</li>'. PHP_EOL;

4
e107_plugins/download/templates/download_template.php
View File

@ -417,8 +417,8 @@ $DOWNLOAD_TEMPLATE['categories']['end'] = "
</table>
</div>
<div class='clearfix table'>
<div class='pull-left'><small>{DOWNLOAD_CAT_NEWDOWNLOAD_TEXT}</small></div>
<div class='pull-right'>{DOWNLOAD_CAT_SEARCH}</div>
<div class='pull-left float-left'><small>{DOWNLOAD_CAT_NEWDOWNLOAD_TEXT}</small></div>
<div class='pull-right float-right'>{DOWNLOAD_CAT_SEARCH}</div>
</div>";
// ##### ------------------------------------------------------------------------------------------

4
e107_plugins/featurebox/templates/featurebox_template.php
View File

@ -27,7 +27,7 @@ $FEATUREBOX_TEMPLATE['bootstrap_carousel_left'] = '
<!-- slide --> {SETIMAGE: w=600&h=450&crop=1}
<div class="{FEATUREBOX_ACTIVE} item slide{FEATUREBOX_COUNTER}">
<div class="container">
<div class="featurebox-item-image col-xs-12 col-md-6 col-sm-6 pull-left ">
<div class="featurebox-item-image col-xs-12 col-md-6 col-sm-6 pull-left float-left">
{FEATUREBOX_IMAGE=placeholder}
</div>
<div class="featurebox-item-text col-xs-12 col-md-6 col-sm-6 span4">
@ -49,7 +49,7 @@ $FEATUREBOX_TEMPLATE['bootstrap_carousel_right'] = '
{SETIMAGE: w=600&h=450&crop=1}
<div class="{FEATUREBOX_ACTIVE} item slide{FEATUREBOX_COUNTER}">
<div class="container">
<div class="featurebox-item-image pull-right col-xs-12 col-sm-6 col-md-6 span6">
<div class="featurebox-item-image pull-right float-right col-xs-12 col-sm-6 col-md-6 span6">
{FEATUREBOX_IMAGE=placeholder}
</div>
<div class="featurebox-item-text col-xs-12 col-md-6 col-sm-6">

2
e107_plugins/forum/forum_post.php
View File

@ -947,7 +947,7 @@ class forum_post_handler
<div class='alert alert-block alert-warning'>
<h4>".LAN_FORUM_2025.': '.$thread_name."</h4>
".LAN_FORUM_2027."<br />".str_replace(array('[', ']'), array('<b>', '</b>'), LAN_FORUM_2028)."
<a class='pull-right btn btn-xs btn-primary e-expandit' href='#post-info'>".LAN_FORUM_2026."</a>
<a class='pull-right float-right btn btn-xs btn-primary e-expandit' href='#post-info'>".LAN_FORUM_2026."</a>
</div>
<div id='post-info' class='e-hideme alert alert-block alert-danger'>
".$tp->toHTML($this->data['post_entry'],true)."

4
e107_plugins/forum/forum_viewforum.php
View File

@ -493,7 +493,7 @@
$text = '<div class="btn-group"><button class="btn btn-default btn-secondary btn-sm btn-mini dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu pull-right float-right">
';
//FIXME - not fully working.
@ -639,7 +639,7 @@
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu pull-right float-right">
';
foreach($jumpList as $key => $val)

6
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@ -841,7 +841,7 @@
$tp = e107::getParser();
// {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG}
$text = '<div class="btn-group pull-right">
$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">
' . LAN_FORUM_8013 . '
';
@ -851,7 +851,7 @@
}
$text .= '
</button>
<ul class="dropdown-menu pull-right text-right">';
<ul class="dropdown-menu pull-right float-right text-right">';
$text .= "<li class='text-right float-right float-right'><a href='" . e_HTTP . "email.php?plugin:forum." . $this->postInfo['post_thread'] . "'>" . LAN_FORUM_2044 . " " . $tp->toGlyph('fa-envelope') . "</a></li>";
@ -1148,7 +1148,7 @@
$text .= '
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu pull-right float-right">
';
foreach($options as $key => $val)

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

@ -110,7 +110,7 @@
$text .= '
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right">
<ul class="dropdown-menu pull-right float-right">
';
//-- foreach($jumpList as $key => $val)

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

@ -51,7 +51,7 @@ $FORUM_POLL_TEMPLATE['results']['start'] = "
";
$FORUM_POLL_TEMPLATE['results']['item'] = "
<strong>{OPTION}</strong><small class='pull-right'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
<strong>{OPTION}</strong><small class='pull-right float-right'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
{BAR}
";

8
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'><h3>{FORUMIMAGE:h=60}{FORUMTITLE}</h3></div>
<div class='col-md-3 span3 pull-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>
<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 right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div></div>
<table class='table table-hover table-striped table-bordered'>
<colgroup>
<col style='width:3%' />
@ -313,7 +313,7 @@ $FORUM_VIEWFORUM_TEMPLATE['item'] = "<tr>
</div>
</td>
<td class='text-center'>{REPLIESX}</td><td class='hidden-xs text-center'>{VIEWSX}</td>
<td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right pull-right'>{ADMINOPTIONS}</div></td>
<td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE} </small><div class='span2 right float-right pull-right'>{ADMINOPTIONS}</div></td>
</tr>\n";
@ -350,7 +350,7 @@ $SC_WRAPPER['VIEWABLE_BY'] = "<div class='panel panel-default' style='margin-top
$FORUM_VIEWFORUM_TEMPLATE['footer'] = "</table>
<div class='row row-fluid'>
<div class='col-md-5 span5 pull-left left' style='padding-top:10px'>{THREADPAGES}</div><div class='col-md-3 span3 pull-right right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div>
<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 right' style='padding-top:10px'>{NEWTHREADBUTTONX}</div>
</div>

8
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'><h3>{THREADNAME}</h3></div><div class='col-md-3 span3 pull-right 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 right text-right' style='padding-top:10px'>{TRACK} {BUTTONSX}</div>
</div>
{MESSAGE}
@ -366,7 +366,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['thread'] = "
{LEVEL=badge} {LEVEL=glyph}
</small>
</div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right '><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div>
</div>
<div class='visible-xs col-xs-12'><hr /></div>
@ -405,7 +405,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['end'] = "</ul>
{GOTOPAGES}
</div>
<div class='col-xs-12 col-md-4'>
<div class='pull-right'>
<div class='pull-right float-right'>
{BUTTONSX}
</div>
</div>
@ -454,7 +454,7 @@ $FORUM_VIEWTOPIC_TEMPLATE['deleted'] = "
{LEVEL=badge} {LEVEL=glyph}
</small>
</div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right '><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
<div class='visible-xs col-xs-3'><div class='clearfix'>{POSTOPTIONS}</div><div class='pull-right float-right'><br /><small class='text-muted'>{THREADDATESTAMP=relative}</small></div></div>
</div>
</div>
<div class='visible-xs col-xs-12'><hr /></div>

2
e107_plugins/gallery/templates/gallery_template.php
View File

@ -66,7 +66,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
</div>
<div class="gallery-slideshow-controls">
<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right">
<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right float-right">
' . LAN_NEXT . ' {GLYPH=fa-chevron-right}
</a>
<a href="#" class="gallery-control gal-prev btn btn-xs btn-default btn-secondary">

4
e107_plugins/log/admin_config.php
View File

@ -402,7 +402,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
private function gen_select($prompt,$name,$value)
{
$ret = "<div class='control-group clearfix' >
<span class='pull-left'>".$prompt."</span><span class='pull-right'><select name='{$name}' class='tbox'>\n
<span class='pull-left float-left'>".$prompt."</span><span class='pull-right'><select name='{$name}' class='tbox'>\n
<option value='0' ".($value == 0 ? " selected='selected'" : "").">".ADSTAT_LAN_50."</option>\n
<option value='1' ".($value == 1 ? " selected='selected'" : "").">".ADSTAT_LAN_49."</option>\n
<option value='2' ".($value == 2 ? " selected='selected'" : "").">".ADSTAT_LAN_48."</option>\n
@ -919,7 +919,7 @@ e107::css('inline', 'td.last.options { padding-right:20px } ');
.$this->gen_select(ADSTAT_LAN_9, 'statDomain',$pref['statDomain'])
.$this->gen_select(ADSTAT_LAN_10, 'statRefer',$pref['statRefer'])
.$this->gen_select(ADSTAT_LAN_11, 'statQuery',$pref['statQuery'])
."<div class='clearfix' style='padding-bottom: 4px'><span class='pull-left'>".ADSTAT_LAN_19."</span><span class='pull-right'>
."<div class='clearfix' style='padding-bottom: 4px'><span class='pull-left float-left'>".ADSTAT_LAN_19."</span><span class='pull-right float-right'>
".$frm->radio_switch('statRecent', $pref['statRecent'])."</span></div>
</td>
</tr>

2
e107_plugins/news/other_news_menu.php
View File

@ -57,7 +57,7 @@ if(!$OTHERNEWS_STYLE)
}
$template = e107::getTemplate('news', 'news_menu', 'other', true, true);
$item_selector = '<div class="btn-group pull-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev">‹</a>
$item_selector = '<div class="btn-group pull-right float-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev">‹</a>
<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next">›</a></div>';
if(!empty($parms['caption']))

4
e107_plugins/news/templates/news_menu_template.php
View File

@ -71,7 +71,7 @@ $NEWS_MENU_TEMPLATE['other']['end'] = "</div></div>";
$NEWS_MENU_TEMPLATE['other2']['caption'] = TD_MENU_L2;
$NEWS_MENU_TEMPLATE['other2']['start'] = "<ul class='media-list unstyled list-unstyled othernews2-block'>{SETIMAGE: w=100&h=100&crop=1}"; // set the {NEWSIMAGE} dimensions.
$NEWS_MENU_TEMPLATE['other2']['item'] = "<li class='media'>
<span class='media-object pull-left'>{NEWSTHUMBNAIL=placeholder}</span>
<span class='media-object pull-left float-left'>{NEWSTHUMBNAIL=placeholder}</span>
<div class='media-body'><h4>{NEWSTITLELINK}</h4>
<p class='text-right'><a class='btn btn-primary btn-othernews2' href='{NEWSURL}'>".LAN_READ_MORE." &raquo;</a></p>
</div>
@ -104,7 +104,7 @@ $NEWS_MENU_TEMPLATE['carousel']['end'] = '
</div><!-- End Carousel Inner -->
</div>
<div id="news-carousel-titles" class="col-md-4 ">
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right ">{NAV}</ul>
<ul id="news-carousel-nav" class="nav nav-inverse nav-stacked pull-right float-right">{NAV}</ul>
</div>
</div><!-- End Carousel -->
</div>

97
e107_plugins/news/templates/news_template.php
View File

@ -115,7 +115,7 @@ $NEWS_TEMPLATE['default']['item'] = '
$NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left float-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_TEMPLATE['default']['caption'] = null; // add a value to user tablerender()
$NEWS_TEMPLATE['default']['start'] = '<!-- Default News Template -->';
@ -167,101 +167,6 @@ $NEWS_TEMPLATE['2-column']['item'] = '<div class="item col-md-6">
$NEWS_TEMPLATE['2-column']['end'] = '</div>';
###### Default view item (temporary) ######
//$NEWS_MENU_TEMPLATE['view']['start'] = '<ul class="nav nav-list news-menu-months">';
//$NEWS_MENU_TEMPLATE['view']['end'] = '</ul>';
// As displayed by news.php?extend.1
//@XXX SEE news_view_template.php
/*
$NEWS_WRAPPER['view']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_TEMPLATE['view']['item'] = '
{SETIMAGE: w=900&h=600}
<div class="view-item">
<h2 class="news-title">{NEWS_TITLE: link=1}</h2>
<hr class="news-heading-sep">
<div class="row">
<div class="col-md-6"><small>{GLYPH=user} &nbsp;{NEWSAUTHOR} &nbsp; {GLYPH=time} &nbsp;{NEWSDATE=short} </small></div>
<div class="col-md-6 text-right options"><small>{GLYPH=tags} &nbsp;{NEWSTAGS} &nbsp; {GLYPH=folder-open} &nbsp;{NEWSCATEGORY} </small></div>
</div>
<hr>
<div class="body">
{NEWSIMAGE: item=1}
<p class="lead">{NEWS_SUMMARY}</p>
<div class="text-justify">
{NEWS_BODY=body}
</div>
<div class="news-videos-1">
{NEWSVIDEO: item=1}
{NEWSVIDEO: item=2}
{NEWSVIDEO: item=3}
</div>
<br />
{SETIMAGE: w=400&h=400}
<div class="row news-images-1">
<div class="col-md-6">{NEWSIMAGE: item=2}</div>
<div class="col-md-6">{NEWSIMAGE: item=3}</div>
</div>
<div class="row news-images-2">
<div class="col-md-6">{NEWSIMAGE: item=4}</div>
<div class="col-md-6">{NEWSIMAGE: item=5}</div>
</div>
{NEWSVIDEO: item=4}
{NEWSVIDEO: item=5}
<div class="body-extended text-justify">
{NEWS_BODY=extended}
</div>
</div>
<hr>
<div class="options hidden-print ">
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
</div>
</div>
<hr />
{NEWSRELATED}
<hr>
{NEWSNAVLINK}
';
*/
/*
* <hr />
<h3>About the Author</h3>
<div class="media">
<div class="media-left">{SETIMAGE: w=80&h=80&crop=1}{NEWS_AUTHOR_AVATAR: shape=circle}</div>
<div class="media-body">
<h4>{NEWS_AUTHOR}</h4>
{NEWS_AUTHOR_SIGNATURE}
<a class="btn btn-xs btn-primary" href="{NEWS_AUTHOR_ITEMS_URL}">My Articles</a>
</div>
</div>
*/
//$NEWS_MENU_TEMPLATE['view']['separator'] = '<br />';
### Related 'start' - Options: Core 'single' shortcodes including {SETIMAGE}
### Related 'item' - Options: {RELATED_URL} {RELATED_IMAGE} {RELATED_TITLE} {RELATED_SUMMARY}
### Related 'end' - Options: Options: Core 'single' shortcodes including {SETIMAGE}

18
e107_plugins/news/templates/news_view_template.php
View File

@ -19,7 +19,7 @@ $NEWS_VIEW_INFO = array(
// Default
$NEWS_VIEW_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_VIEW_WRAPPER['default']['item']['NEWSIMAGE: item=1'] = '<span class="news-images-main pull-left float-left col-xs-12 col-sm-6 col-md-6">{---}</span>';
$NEWS_VIEW_TEMPLATE['default']['caption'] = null; // add a value to user tablerender()
@ -75,7 +75,7 @@ $NEWS_VIEW_TEMPLATE['default']['item'] = '
<hr>
<div class="options hidden-print ">
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments&class=btn btn-default}{PRINTICON: class=btn btn-default}{ADMINOPTIONS: class=btn btn-default}{SOCIALSHARE}</div>
<div class="btn-group">{NEWSCOMMENTLINK: glyph=comments}{PRINTICON}{ADMINOPTIONS}{SOCIALSHARE}</div>
</div>
</div>
@ -88,6 +88,20 @@ $NEWS_VIEW_TEMPLATE['default']['item'] = '
';
/*
* <hr />
<h3>About the Author</h3>
<div class="media">
<div class="media-left">{SETIMAGE: w=80&h=80&crop=1}{NEWS_AUTHOR_AVATAR: shape=circle}</div>
<div class="media-body">
<h4>{NEWS_AUTHOR}</h4>
{NEWS_AUTHOR_SIGNATURE}
<a class="btn btn-xs btn-primary" href="{NEWS_AUTHOR_ITEMS_URL}">My Articles</a>
</div>
</div>
*/
// @todo add more templates. eg. 'videos' , 'slideshow images', 'full width image' - help and ideas always appreciated.

4
e107_plugins/online/online_menu.php
View File

@ -93,7 +93,7 @@ else
$ONLINE_TEMPLATE['disabled'] = "{ONLINE_TRACKING_DISABLED}";
//##### ONLINE MEMBER LIST EXTENDED -------------------------------------------
$ONLINE_TEMPLATE['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
$ONLINE_TEMPLATE['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left float-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
@ -142,7 +142,7 @@ $caption = $img.' '.vartrue($menu_pref['online_caption'], LAN_ONLINE_4);
if (getperms('1'))
{
$path = e_PLUGIN_ABS."online/config.php?iframe=1";
$caption .= "<a class='e-modal pull-right' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='glyphicon glyphicon-cog'></i></a>";
$caption .= "<a class='e-modal pull-right float-right' data-modal-caption='".LAN_SETTINGS."' href='".$path."' title='".LAN_SETTINGS."'><i class='glyphicon glyphicon-cog'></i></a>";
}

14
e107_plugins/online/templates/online_menu_template.php
View File

@ -41,7 +41,7 @@ $ONLINE_MENU_TEMPLATE['default']['enabled'] = "
";
$ONLINE_MENU_TEMPLATE['default']['disabled'] = "{ONLINE_TRACKING_DISABLED}";
$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
$ONLINE_MENU_TEMPLATE['default']['online_members_list_extended'] = "{SETIMAGE: w=40}<li class='media'><span class='media-object pull-left float-left'>{ONLINE_MEMBER_IMAGE=avatar}</span><span class='media-body'>{ONLINE_MEMBER_USER} ".LAN_ONLINE_7." {ONLINE_MEMBER_PAGE}</span></li>";
@ -89,16 +89,16 @@ $ONLINE_MENU_TEMPLATE['extended']['online_member_newest'] = "{SETIMAGE
// Shortcode wrappers
$ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_1."<span class='label label-primary pull-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_2."<span class='label label-primary pull-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_GUESTS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_1."<span class='label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_2."<span class='label label-primary pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST'] = "<ul>{---}</ul>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_LIST_EXTENDED'] = "<li><ul class='unstyled list-unstyled'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_ONPAGE'] = "<li>".LAN_ONLINE_3."<span class='label label-default pull-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_TOTAL'] = "<li>".LAN_ONLINE_11."<span class='label label-default pull-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_ONPAGE'] = "<li>".LAN_ONLINE_3."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_TOTAL'] = "<li>".LAN_ONLINE_11."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_NEWEST'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_6."</li><li><ul class='unstyled list-unstyled'>{---}</ul></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST'] = "<a class='e-expandit' href='#online-menu-extended-most'>".LAN_ONLINE_8."</a><span class='label label-default pull-right'>{---}</span><br />";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST'] = "<a class='e-expandit' href='#online-menu-extended-most'>".LAN_ONLINE_8."</a><span class='label label-default pull-right float-right'>{---}</span><br />";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_MEMBERS'] = LAN_ONLINE_2."{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_GUESTS'] = LAN_ONLINE_1."{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MOST_DATESTAMP'] = "{---}";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_11."<span class='label label-default pull-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBERS_REGISTERED'] = "<li class='online-menu-extended-label'>".LAN_ONLINE_11."<span class='label label-default pull-right float-right'>{---}</span></li>";
$ONLINE_MENU_WRAPPER['extended']['ONLINE_MEMBER_PAGE'] = LAN_ONLINE_7." {---}";

4
e107_plugins/pm/templates/pm_template.php
View File

@ -273,9 +273,9 @@ $PM_TEMPLATE['show'] =
<table class='table table-bordered table-striped fborder'>
<tr>
<td class='fcaption text-left'>
<h3>{PM_SUBJECT} <small class='pull-right'>{PM_DATE}</small></h3>
<h3>{PM_SUBJECT} <small class='pull-right float-right'>{PM_DATE}</small></h3>
<small>{PM_FROM_TO}</small>
<small class='pull-right' >{PM_READ} {PM_DELETE}</small></td>
<small class='pull-right float-right'>{PM_READ} {PM_DELETE}</small></td>
</tr>
<tr>
<td class='forumheader3 text-left' style='vertical-align:top'>

2
e107_plugins/poll/templates/poll_template.php
View File

@ -216,7 +216,7 @@ $POLL_TEMPLATE['results']['start'] = "
";
$POLL_TEMPLATE['results']['item'] = "
<strong>{OPTION}</strong><small class='pull-right'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
<strong>{OPTION}</strong><small class='pull-right float-right'><a href='#' class='e-tip' title=\"{VOTES}\">{PERCENTAGE}</a></small>
{BAR}
";

2
e107_plugins/social/e_shortcode.php
View File

@ -400,7 +400,7 @@ class social_shortcodes extends e_shortcode
if(vartrue($parm['dropdown']))
{
$dir = ($parm['dropdown'] == 'right') ? 'pull-right' : '';
$dir = ($parm['dropdown'] == 'right') ? 'pull-right float-right' : '';
$class = varset($parm['class'],'btn-group');