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

Issue #1138 Added 'btn-default' where missing.

Browse Source
This commit is contained in:
Cameron
2015-07-13 19:09:30 -07:00
parent 9d6e3978e6
commit 6499ff72f7
33 changed files with 97 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -46,7 +46,7 @@ class bbcode_shortcodes extends e_shortcode
if(BOOTSTRAP)
{
$text = '<div class="btn-group">';
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="">';
$text .= '<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" title="">';
$text .= "Format";
$text .= ' <span class="caret"></span></a>';
$text .= "<ul class='dropdown-menu'>\n";
@@ -64,7 +64,7 @@ class bbcode_shortcodes extends e_shortcode
// Legacy Version.
$text = "<select class='btn e-bb bbcode_buttons e-pointer' id='{$id}' title='Format text' onchange=\"addtext(this.value);this.value=''\">
$text = "<select class='btn btn-default e-bb bbcode_buttons e-pointer' id='{$id}' title='Format text' onchange=\"addtext(this.value);this.value=''\">
<option value=''>Format</option>
<option value='[p][/p]'>Paragraph</option>
<option value='[h2][/h2]'>Heading</option>
@@ -165,7 +165,7 @@ class bbcode_shortcodes extends e_shortcode
{
$data = "[link=*]*[/link]";
$event = $this->getEvent('addinput',$data,LANHELP_35);
$text = "<a {$event} class='btn e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".$this->br2nl(LANHELP_23)."' data-bbcode='{$data}'>\n";
$text = "<a {$event} class='btn btn-default e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}' title='".$this->br2nl(LANHELP_23)."' data-bbcode='{$data}'>\n";
// $text .="<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' />";
$text .= $this->button(e_IMAGE_ABS.'bbcode/link.png', 'link');
@@ -247,7 +247,7 @@ class bbcode_shortcodes extends e_shortcode
$sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36);
$text = '<div class="btn-group">';
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_22.'">';
$text .= '<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_22.'">';
// $text .= "<img src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' />\n";
$text .= $this->button(e_IMAGE_ABS."bbcode/fontsize.png", 'text-height');
@@ -302,7 +302,7 @@ class bbcode_shortcodes extends e_shortcode
if(deftrue('BOOTSTRAP'))
{
$text = '<div class="btn-group" >';
$text .= '<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_44.'">';
$text .= '<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#" title="'.LANHELP_44.'">';
$text .= $this->button(e_IMAGE_ABS."bbcode/emotes.png","smile-o");
// $text .= ' <span class="caret"></span>';
@@ -371,7 +371,7 @@ class bbcode_shortcodes extends e_shortcode
$event = $this->getEvent('expandit',$formid, LANHELP_22);
$text = "<a {$event} class='btn e-bb' id='{id}' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
$text = "<a {$event} class='btn btn-default e-bb' id='{id}' data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontcol.png' alt='' title='".LANHELP_21."' /></a>";
// return $text;
@@ -591,12 +591,12 @@ class bbcode_shortcodes extends e_shortcode
if($_onclick_func == 'e-dialog')
{ // $tagid = "news-body";
$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='btn e-dialog' >";
$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='btn btn-default e-dialog' >";
$post = "</a>\n";
}
else
{
$pre = "<a class='btn ".vartrue($bbcode[$parm][7], 'e-pointer')."' title=\"".str_replace('<br />','\\n',($_helptxt))."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." >";
$pre = "<a class='btn btn-default ".vartrue($bbcode[$parm][7], 'e-pointer')."' title=\"".str_replace('<br />','\\n',($_helptxt))."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." >";
$post = "</a>\n"; // btn-small bbcode bbcode_buttons
}

2
e107_core/shortcodes/single/nextprev.php
View File

@@ -81,7 +81,7 @@ function nextprev_shortcode($parm = '')
$LAN_NP_FIRST = $tp->toGlyph("icon-fast-backward.glyph",false);
$LAN_NP_PREVIOUS = $tp->toGlyph("icon-backward.glyph",false);
$LAN_NP_NEXT = $tp->toGlyph("icon-forward.glyph",false);
$LAN_NP_LAST = $tp->toGlyph("icon-fast-forward.glyph",false);
$LAN_NP_LAST = $tp->toGlyph("fa fa-fast-forward",false);
}
else
{

24
e107_core/templates/nextprev_template.php
View File

@@ -26,14 +26,14 @@ $NEXTPREV_TEMPLATE['default_end'] = '
//$NEXTPREV_TEMPLATE['default_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
$NEXTPREV_TEMPLATE['default_nav_caption'] = ''; // NP_3.'&nbsp;';
$NEXTPREV_TEMPLATE['default_nav_first'] = '<a class="btn nextprev-item first" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_prev'] = '<a class="btn nextprev-item prev" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_last'] = '<a class="btn nextprev-item last" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_next'] = '<a class="btn nextprev-item next" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_first'] = '<a class="btn btn-default nextprev-item first" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_prev'] = '<a class="btn btn-default nextprev-item prev" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_last'] = '<a class="btn btn-default nextprev-item last" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_nav_next'] = '<a class="btn btn-default nextprev-item next" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_items_start'] = '';
$NEXTPREV_TEMPLATE['default_item'] = '<a class="btn nextprev-item" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_item_current'] = '<a class="btn nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_item'] = '<a class="btn btn-default nextprev-item" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_item_current'] = '<a class="btn btn-default nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_items_end'] = '';
//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>';
@@ -123,14 +123,14 @@ $NEXTPREV_TEMPLATE['admin_end'] = '
//$NEXTPREV_TEMPLATE['admin_nav_caption'] = '<span class="nexprev-caption center">{caption}</span>&nbsp;'; XXX - awaiting the new front-end themes & templates
$NEXTPREV_TEMPLATE['admin_nav_caption'] = ''; // NP_3.'&nbsp;';
$NEXTPREV_TEMPLATE['admin_nav_first'] = '<a class="btn nextprev-item first e-tip" href="{url}" title="{url_label}"><i class="icon-fast-backward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_prev'] = '<a class="btn nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="icon-backward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_last'] = '<a class="btn nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="icon-fast-forward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_next'] = '<a class="btn nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="icon-forward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_first'] = '<a class="btn btn-default nextprev-item first e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-backward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_prev'] = '<a class="btn btn-default nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="fa fa-backward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_last'] = '<a class="btn btn-default nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="fa fa-fast-forward"></i></a>';
$NEXTPREV_TEMPLATE['admin_nav_next'] = '<a class="btn btn-default nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="fa fa-forward icon-forward"></i></a>';
$NEXTPREV_TEMPLATE['admin_items_start'] = '';
$NEXTPREV_TEMPLATE['admin_item'] = '<a class="btn nextprev-item e-tip" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['admin_item_current'] = '<a class="btn nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['admin_item'] = '<a class="btn btn-default nextprev-item e-tip" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['admin_item_current'] = '<a class="btn btn-default nextprev-item current active" href="#" onclick="return false;" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['admin_items_end'] = '';
//$NEXTPREV_TEMPLATE['admin_separator'] = '<span class="nextprev-sep"><!-- --></span>';