mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@ -142,7 +142,7 @@ class admin_start
if($inCompatText) if($inCompatText)
{ {
$text = "<ul>".$inCompatText."</ul>"; $text = "<ul>".$inCompatText."</ul>";
$mes->addWarning("The following plugins are not compatible with this version of e107 and should be uninstalled: ".$text."<a class='btn' href='".e_ADMIN."plugin.php'>uninstall</a>"); $mes->addWarning("The following plugins are not compatible with this version of e107 and should be uninstalled: ".$text."<a class='btn btn-default' href='".e_ADMIN."plugin.php'>uninstall</a>");
} }
} }

2
e107_admin/banlist.php
View File

@ -938,7 +938,7 @@ switch ($action)
$text .= "<tr><td colspan='5' style='text-align:center'><br />".$tp->parseTemplate("{NEXTPREV={$parms}}".'<br /><br /></td></tr>'); $text .= "<tr><td colspan='5' style='text-align:center'><br />".$tp->parseTemplate("{NEXTPREV={$parms}}".'<br /><br /></td></tr>');
} }
$text .= "<tr><td colspan='4' style='text-align:center'> $text .= "<tr><td colspan='4' style='text-align:center'>
<input class='btn button' type='submit' name='delete_ban_log' value='".BANLAN_88."' /> <input class='btn btn-default button' type='submit' name='delete_ban_log' value='".BANLAN_88."' />
<input type='hidden' name='e-token' value='".e_TOKEN."' /> <input type='hidden' name='e-token' value='".e_TOKEN."' />
</td> </td>
</tr>"; </tr>";

2
e107_admin/header.php
View File

@ -274,7 +274,7 @@ if (isset($eplug_css) && $eplug_css)
if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure'])) if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && !deftrue('e_BOOTSTRAP3_ADMIN'))
{ {
$e_js->coreCSS('bootstrap/css/darkstrap.css'); $e_js->coreCSS('bootstrap/css/darkstrap.css');

2
e107_admin/image.php
View File

@ -1267,7 +1267,7 @@ class media_admin_ui extends e_admin_ui
<button type='submit' class='btn btn-success submit e-dialog-save e-dialog-close' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' > <button type='submit' class='btn btn-success submit e-dialog-save e-dialog-close' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<span>Save</span> <span>Save</span>
</button> </button>
<button type='submit' class='btn submit e-dialog-close' name='cancel_image' value='Cancel' > <button type='submit' class=' btn btn-default submit e-dialog-close' name='cancel_image' value='Cancel' >
<span>Cancel</span> <span>Cancel</span>
</button> </button>
</div>"; </div>";

2
e107_admin/lancheck.php
View File

@ -1003,7 +1003,7 @@ class lancheck
<input type='hidden' name='language' value='".$lan."' /> <input type='hidden' name='language' value='".$lan."' />
<input type='hidden' name='errorsonly' value='".$_SESSION['lancheck-errors-only']."' /> <input type='hidden' name='errorsonly' value='".$_SESSION['lancheck-errors-only']."' />
<input class='btn btn-primary' type='submit' name='ziplang[".$lan."]' value=\"".$just_go_diz."\" onclick=\"this.value = '".$lan_pleasewait."'\" /> <input class='btn btn-primary' type='submit' name='ziplang[".$lan."]' value=\"".$just_go_diz."\" onclick=\"this.value = '".$lan_pleasewait."'\" />
<a href='".e_REQUEST_URI."' class='btn button'>".$lang_sel_diz."</a> <a href='".e_REQUEST_URI."' class=' btn btn-default button'>".$lang_sel_diz."</a>
</div> </div>
</form> </form>
"; ";

8
e107_admin/mailout.php
View File

@ -1618,7 +1618,7 @@ class mailout_admin_form_ui extends e_admin_form_ui
$link = e_SELF."?mode=main&action=send&id=".$id; $link = e_SELF."?mode=main&action=send&id=".$id;
$preview = e_SELF."?mode=main&action=preview&id=".$id; $preview = e_SELF."?mode=main&action=preview&id=".$id;
$text .= "<a href='".$link."' class='btn' title='Send Mail'>".E_32_MAIL."</a>"; $text .= "<a href='".$link."' class='btn' title='Send Mail'>".E_32_MAIL."</a>";
$text .= "<a rel='external' class='btn e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>"; $text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='Preview'>".E_32_SEARCH."</a>";
$text .= $this->renderValue('options',$value,$att,$id); $text .= $this->renderValue('options',$value,$att,$id);
return $text; return $text;
@ -1630,8 +1630,8 @@ class mailout_admin_form_ui extends e_admin_form_ui
$link = e_SELF."?searchquery=&filter_options=mail_detail_id__".$id."&mode=recipients&action=list&iframe=1"; $link = e_SELF."?searchquery=&filter_options=mail_detail_id__".$id."&mode=recipients&action=list&iframe=1";
$preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user; $preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user;
$text = "<a href='".$link."' class='btn e-modal' data-modal-caption='Recipients for Mail #".$id."' title='Recipients'>".E_32_USER."</a>"; $text = "<a href='".$link."' class='btn btn-default e-modal' data-modal-caption='Recipients for Mail #".$id."' title='Recipients'>".E_32_USER."</a>";
$text .= "<a rel='external' class='btn e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>"; $text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='Preview'>".E_32_SEARCH."</a>";
$att['readParms']['editClass'] = e_UC_NOBODY; $att['readParms']['editClass'] = e_UC_NOBODY;
$text .= $this->renderValue('options',$value,$att,$id); $text .= $this->renderValue('options',$value,$att,$id);
@ -1798,7 +1798,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui
$eid = $this->getController()->getListModel()->get('mail_detail_id'); $eid = $this->getController()->getListModel()->get('mail_detail_id');
$preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user; $preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user;
$text = "<a rel='external' class='btn e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>"; $text = "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>";

2
e107_admin/menus.php
View File

@ -1038,7 +1038,7 @@ class e_layout
<textarea name='pagelist' class='e-save span3' cols='60' rows='8' class='tbox'>".$menu_pages."</textarea> <textarea name='pagelist' class='e-save span3' cols='60' rows='8' class='tbox'>".$menu_pages."</textarea>
</div> </div>
<div class=' span4'><small>".MENLAN_28."</small></div> <div class=' span4 col-md-4'><small>".MENLAN_28."</small></div>
</div></td></tr> </div></td></tr>
</table>"; </table>";

4
e107_admin/message.php
View File

@ -83,13 +83,13 @@ if($amount = $sql -> db_Select("generic", "*", $queryString))
<b>".MESSLAN_9."</b>: ".$gen->convert_date($gen_datestamp, 'long')."<br /> <b>".MESSLAN_9."</b>: ".$gen->convert_date($gen_datestamp, 'long')."<br />
<b>".MESSLAN_10."</b>: $user<br /> <b>".MESSLAN_10."</b>: $user<br />
<b>".MESSLAN_13."</b>: $link ". <b>".MESSLAN_13."</b>: $link ".
($gen_chardata ? "<br /><b>".MESSLAN_12."</b>: $gen_chardata" : "")."<br /><input class='btn button' type='submit' name='delete_message' value='".MESSLAN_2." $gen_id' /> ($gen_chardata ? "<br /><b>".MESSLAN_12."</b>: $gen_chardata" : "")."<br /><input class='btn btn-default button' type='submit' name='delete_message' value='".MESSLAN_2." $gen_id' />
</td>\n</tr>\n"; </td>\n</tr>\n";
} }
$text .= " $text .= "
<tr> <tr>
<td><br /><input class='btn button' type='submit' name='delete_all' value='".MESSLAN_4."' /> <td><br /><input class='btn btn-default button' type='submit' name='delete_all' value='".MESSLAN_4."' />
<input type='checkbox' name='deleteconfirm' value='1' /> ".MESSLAN_5." <input type='checkbox' name='deleteconfirm' value='1' /> ".MESSLAN_5."
</td> </td>
</tr> </tr>

2
e107_admin/plugin.php
View File

@ -129,7 +129,7 @@ class pluginmanager_form extends e_form
// $text .= ($this->plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>"); // $text .= ($this->plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
if (PLUGIN_SHOW_REFRESH && !vartrue($this->plug_vars['plugin_php'])) if (PLUGIN_SHOW_REFRESH && !vartrue($this->plug_vars['plugin_php']))
{ {
$text .= "<br /><br /><input type='button' class='btn button' onclick=\"location.href='".e_SELF."?refresh.{$this->plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> "; $text .= "<br /><br /><input type='button' class='btn btn-default button' onclick=\"location.href='".e_SELF."?refresh.{$this->plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> ";
} }
} }
else else

2
e107_admin/upload.php
View File

@ -614,7 +614,7 @@ switch ($action)
$text .= " $text .= "
<tr> <tr>
<td class='forumheader3' style='text-align:center' colspan='4'> <td class='forumheader3' style='text-align:center' colspan='4'>
<input class='btn button' type='submit' name='generate_filetypes_xml' value='".UPLLAN_56."' /> <input class='btn btn-default button' type='submit' name='generate_filetypes_xml' value='".UPLLAN_56."' />
</td> </td>
</tr> </tr>
</table></form> </table></form>

14
e107_admin/userclass2.php
View File

@ -1278,12 +1278,12 @@ unset($title);
<table class='table adminform'> <table class='table adminform'>
<tr><td class='fcaption' style='text-align:center' colspan='2'>Test Functions and Information</td></tr>"; <tr><td class='fcaption' style='text-align:center' colspan='2'>Test Functions and Information</td></tr>";
$text .= "<tr><td style='text-align:center' colspan='2'>DB Status: ".$db_status."</td></tr>"; $text .= "<tr><td style='text-align:center' colspan='2'>DB Status: ".$db_status."</td></tr>";
$text .= "<tr><td><input class='btn button' type='submit' name='add_db_fields' value='Add new DB fields' />First required step</td>"; $text .= "<tr><td><input class='btn btn-default button' type='submit' name='add_db_fields' value='Add new DB fields' />First required step</td>";
$text .= "<td><input class='btn button' type='submit' name='remove_db_fields' value='Remove new DB fields' />Reverse the process</td></tr>"; $text .= "<td><input class='btn btn-default button' type='submit' name='remove_db_fields' value='Remove new DB fields' />Reverse the process</td></tr>";
$text .= "<tr><td><input class='btn button' type='submit' name='add_class_tree' value='Add class tree' />Optional default tree</td>"; $text .= "<tr><td><input class='btn btn-default button' type='submit' name='add_class_tree' value='Add class tree' />Optional default tree</td>";
$text .= "<td><input class='btn button' type='submit' name='remove_class_tree' value='Remove class tree' />Deletes the 'core' class entries</td></tr>"; $text .= "<td><input class='btn btn-default button' type='submit' name='remove_class_tree' value='Remove class tree' />Deletes the 'core' class entries</td></tr>";
$text .= "<tr><td><input class='btn button' type='submit' name='rebuild_tree' value='Rebuild class tree' />Sets up all the structures</td>"; $text .= "<tr><td><input class='btn btn-default button' type='submit' name='rebuild_tree' value='Rebuild class tree' />Sets up all the structures</td>";
$text .= "<td><input class='btn button' type='submit' name='' value='Spare' />Spare</td></tr>"; $text .= "<td><input class='btn btn-default button' type='submit' name='' value='Spare' />Spare</td></tr>";
$text .= "<tr><td colspan='2'>&nbsp;</td></tr>"; $text .= "<tr><td colspan='2'>&nbsp;</td></tr>";
$text .= "<tr><td colspan='2'>".$e_userclass->show_tree(TRUE)."</td></tr>"; $text .= "<tr><td colspan='2'>".$e_userclass->show_tree(TRUE)."</td></tr>";
@ -1328,7 +1328,7 @@ unset($title);
$text = "Single class: ".$_POST['class_select']."<br /> $text = "Single class: ".$_POST['class_select']."<br />
Multi-select: ".implode(',',$_POST['multi_class_select'])."<br /> Multi-select: ".implode(',',$_POST['multi_class_select'])."<br />
Check boxes: ".implode(',',$_POST['classes_select'])."<br />"; Check boxes: ".implode(',',$_POST['classes_select'])."<br />";
$text .= "<input class='btn button' type='submit' value='Click to save' /> $text .= "<input class='btn btn-default button' type='submit' value='Click to save' />
</form> </div>"; </form> </div>";
$ns->tablerender('Click on the button - the settings above should be remembered, and the $_POST values displayed', $text); $ns->tablerender('Click on the button - the settings above should be remembered, and the $_POST values displayed', $text);
break; // End of 'debug' break; // End of 'debug'

12
e107_admin/users.php
View File

@ -1515,7 +1515,7 @@ class users_admin_ui extends e_admin_ui
".USRLAN_120." ".USRLAN_120."
</td> </td>
<td> <td>
<a href='#set_class' class='btn e-expandit'>".USRLAN_120."</a> <a href='#set_class' class='btn btn-default e-expandit'>".USRLAN_120."</a>
<div class='e-hideme' id='set_class'> <div class='e-hideme' id='set_class'>
{$temp} {$temp}
</div> </div>
@ -1528,7 +1528,7 @@ class users_admin_ui extends e_admin_ui
<tr> <tr>
<td>".USRLAN_35."</td> <td>".USRLAN_35."</td>
<td> <td>
<a href='#set_perms' class='btn e-expandit'>".USRLAN_243."</a> <a href='#set_perms' class='btn btn-default e-expandit'>".USRLAN_243."</a>
<div class='e-hideme' id='set_perms'> <div class='e-hideme' id='set_perms'>
"; ";
@ -2188,10 +2188,10 @@ class users_admin_ui extends e_admin_ui
{ {
// Option to delete emails - only if there are some in the list // Option to delete emails - only if there are some in the list
$text .= "</table><table style='".ADMIN_WIDTH."'><tr> $text .= "</table><table style='".ADMIN_WIDTH."'><tr>
<td style='text-align: center;'><input class='btn button' type='submit' name='delnonbouncesubmit' value='".USRLAN_183."' /></td>\n <td style='text-align: center;'><input class='btn btn-default button' type='submit' name='delnonbouncesubmit' value='".USRLAN_183."' /></td>\n
<td style='text-align: center;'><input class='btn button' type='submit' name='clearemailbouncesubmit' value='".USRLAN_184."' /></td>\n <td style='text-align: center;'><input class='btn btn-default button' type='submit' name='clearemailbouncesubmit' value='".USRLAN_184."' /></td>\n
<td style='text-align: center;'><input class='btn button' type='submit' name='delcheckedsubmit' value='".USRLAN_179."' /></td>\n <td style='text-align: center;'><input class='btn btn-default button' type='submit' name='delcheckedsubmit' value='".USRLAN_179."' /></td>\n
<td style='text-align: center;'><input class='btn button' type='submit' name='delallsubmit' value='".USRLAN_180."' /></td>\n <td style='text-align: center;'><input class='btn btn-default button' type='submit' name='delallsubmit' value='".USRLAN_180."' /></td>\n
</td></tr>"; </td></tr>";
} }
$text .= "</table></form></div>"; $text .= "</table></form></div>";

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

@ -46,7 +46,7 @@ class bbcode_shortcodes extends e_shortcode
if(BOOTSTRAP) if(BOOTSTRAP)
{ {
$text = '<div class="btn-group">'; $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 .= "Format";
$text .= ' <span class="caret"></span></a>'; $text .= ' <span class="caret"></span></a>';
$text .= "<ul class='dropdown-menu'>\n"; $text .= "<ul class='dropdown-menu'>\n";
@ -64,7 +64,7 @@ class bbcode_shortcodes extends e_shortcode
// Legacy Version. // 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=''>Format</option>
<option value='[p][/p]'>Paragraph</option> <option value='[p][/p]'>Paragraph</option>
<option value='[h2][/h2]'>Heading</option> <option value='[h2][/h2]'>Heading</option>
@ -165,7 +165,7 @@ class bbcode_shortcodes extends e_shortcode
{ {
$data = "[link=*]*[/link]"; $data = "[link=*]*[/link]";
$event = $this->getEvent('addinput',$data,LANHELP_35); $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 .="<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'); $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); $sizes = array(7,8,9,10,11,12,14,15,18,20,22,24,26,28,30,36);
$text = '<div class="btn-group">'; $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 .= "<img src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' />\n";
$text .= $this->button(e_IMAGE_ABS."bbcode/fontsize.png", 'text-height'); $text .= $this->button(e_IMAGE_ABS."bbcode/fontsize.png", 'text-height');
@ -302,7 +302,7 @@ class bbcode_shortcodes extends e_shortcode
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP'))
{ {
$text = '<div class="btn-group" >'; $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 .= $this->button(e_IMAGE_ABS."bbcode/emotes.png","smile-o");
// $text .= ' <span class="caret"></span>'; // $text .= ' <span class="caret"></span>';
@ -371,7 +371,7 @@ class bbcode_shortcodes extends e_shortcode
$event = $this->getEvent('expandit',$formid, LANHELP_22); $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>"; <img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontcol.png' alt='' title='".LANHELP_21."' /></a>";
// return $text; // return $text;
@ -591,12 +591,12 @@ class bbcode_shortcodes extends e_shortcode
if($_onclick_func == 'e-dialog') if($_onclick_func == 'e-dialog')
{ // $tagid = "news-body"; { // $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"; $post = "</a>\n";
} }
else 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 $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_FIRST = $tp->toGlyph("icon-fast-backward.glyph",false);
$LAN_NP_PREVIOUS = $tp->toGlyph("icon-backward.glyph",false); $LAN_NP_PREVIOUS = $tp->toGlyph("icon-backward.glyph",false);
$LAN_NP_NEXT = $tp->toGlyph("icon-forward.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 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'] = '<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_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_first'] = '<a class="btn btn-default 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_prev'] = '<a class="btn btn-default 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_last'] = '<a class="btn btn-default 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_next'] = '<a class="btn btn-default nextprev-item next" href="{url}" title="{url_label}">{label}</a>';
$NEXTPREV_TEMPLATE['default_items_start'] = ''; $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'] = '<a class="btn btn-default 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_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_items_end'] = '';
//$NEXTPREV_TEMPLATE['default_separator'] = '<span class="nextprev-sep"><!-- --></span>'; //$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'] = '<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_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_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 nextprev-item prev e-tip" href="{url}" title="{url_label}"><i class="icon-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 nextprev-item last e-tip" href="{url}" title="{url_label}"><i class="icon-fast-forward"></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 nextprev-item next e-tip" href="{url}" title="{url_label}"><i class="icon-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_items_start'] = '';
$NEXTPREV_TEMPLATE['admin_item'] = '<a class="btn nextprev-item e-tip" href="{url}" 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 nextprev-item current active" href="#" onclick="return false;" 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_items_end'] = '';
//$NEXTPREV_TEMPLATE['admin_separator'] = '<span class="nextprev-sep"><!-- --></span>'; //$NEXTPREV_TEMPLATE['admin_separator'] = '<span class="nextprev-sep"><!-- --></span>';

4
e107_handlers/admin_ui.php
View File

@ -5901,7 +5901,7 @@ class e_admin_form_ui extends e_form
<legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend> <legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend>
".$filter_pre." ".$filter_pre."
<div class='row-fluid'> <div class='row-fluid'>
<div class='left form-inline span8' style='margin-top:10px;margin-bottom:-10px;'> <div class='left form-inline span8 col-md-8' style='margin-top:10px;margin-bottom:-10px;'>
".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i> ".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i>
".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
@ -5915,7 +5915,7 @@ class e_admin_form_ui extends e_form
<img src='".e_IMAGE_ABS."generic/loading_16.gif' class='icon action S16' alt='".LAN_LOADING."' /> <img src='".e_IMAGE_ABS."generic/loading_16.gif' class='icon action S16' alt='".LAN_LOADING."' />
</span> </span>
</div> </div>
<div class='span4 text-right' style='margin-top:10px;margin-bottom:-10px;padding-top:15px;padding-right:5px'>"; <div class='span4 col-md-4 text-right' style='margin-top:10px;margin-bottom:-10px;padding-top:15px;padding-right:5px'>";
// Let Admin know which language table is being saved to. (avoid default table overwrites) // Let Admin know which language table is being saved to. (avoid default table overwrites)

4
e107_handlers/media_class.php
View File

@ -665,9 +665,9 @@ class e_media
// $text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason. // $text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason.
$text .= "<button type='button' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason. $text .= "<button type='button' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$data_src."' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason.
$text .= "<button type='button' title='previous page' class='btn e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."' >&laquo;</button>"; // see next page of images. $text .= "<button type='button' title='previous page' class='btn btn-default e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$data_src."' >&laquo;</button>"; // see next page of images.
$text .= "<button type='button' title='next page' class='btn e-nav e-media-nav e-tip' style='text-align:center' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$data_src."' >&raquo;</button>"; // see next page of images. $text .= "<button type='button' title='next page' class='btn btn-default e-nav e-media-nav e-tip' style='text-align:center' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$data_src."' >&raquo;</button>"; // see next page of images.
$text .= "</div></div>"; $text .= "</div></div>";
$text .= " $text .= "

2
e107_handlers/menumanager_class.php
View File

@ -630,7 +630,7 @@ class e_menuManager {
<textarea name='pagelist' class='e-save span3' cols='60' rows='8' class='tbox'>$menu_pages</textarea> <textarea name='pagelist' class='e-save span3' cols='60' rows='8' class='tbox'>$menu_pages</textarea>
</div> </div>
<div class=' span4'><small>".MENLAN_28."</small></div> <div class=' span4 col-md-4'><small>".MENLAN_28."</small></div>
</div></td></tr> </div></td></tr>
</table>"; </table>";

4
e107_handlers/sitelinks_class.php
View File

@ -1388,13 +1388,13 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
break; break;
case 'div': case 'div':
$text .= "<div class='core-mainpanel-block '><a data-toggle='tooltip' class='core-mainpanel-link-icon btn muted' href='".$link."' title='{$description}'>".$icon." $text .= "<div class='core-mainpanel-block '><a data-toggle='tooltip' class='core-mainpanel-link-icon btn btn-default muted' href='".$link."' title='{$description}'>".$icon."
<small class='core-mainpanel-link-text'>".$tp->toHTML($title,FALSE,"defs, emotes_off")."</small></a> <small class='core-mainpanel-link-text'>".$tp->toHTML($title,FALSE,"defs, emotes_off")."</small></a>
</div>"; </div>";
break; break;
case 'div-icon-only': case 'div-icon-only':
$text .= "<div class='core-mainpanel-block e-tip' title='{$description}'><a class='core-mainpanel-link-icon btn e-tip' href='".$link."' >".$icon."</a></div>"; $text .= "<div class='core-mainpanel-block e-tip' title='{$description}'><a class='core-mainpanel-link-icon btn btn-default e-tip' href='".$link."' >".$icon."</a></div>";
break; break;
default: default:

16
e107_plugins/download/includes/admin.php
View File

@ -606,7 +606,7 @@ $columnInfo = array(
$txt .= " $txt .= "
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
<input type='submit' class='btn button' name='updatelimits' value='".DOWLAN_115."'/> <input type='submit' class='btn btn-default button' name='updatelimits' value='".DOWLAN_115."'/>
</div> </div>
<table class='table adminlist'> <table class='table adminlist'>
@ -630,7 +630,7 @@ $columnInfo = array(
$txt .= "</table> $txt .= "</table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
<input type='submit' class='btn button' name='addlimit' value='".DOWLAN_114."'/> <input type='submit' class='btn btn-default button' name='addlimit' value='".DOWLAN_114."'/>
</div></form>"; </div></form>";
echo $txt; echo $txt;
@ -1309,7 +1309,7 @@ $columnInfo = array(
$text .= " </div>"; $text .= " </div>";
} }
$text .=" </div> $text .=" </div>
<input class='btn button' type='button' name='addoption' value='".DOWLAN_130."' onclick=\"duplicateHTML('mirror','mirrorsection')\"/> <input class='btn btn-default button' type='button' name='addoption' value='".DOWLAN_130."' onclick=\"duplicateHTML('mirror','mirrorsection')\"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -1540,10 +1540,10 @@ $columnInfo = array(
if ($id && $subAction == "edit") if ($id && $subAction == "edit")
{ {
$text .= "<input class='btn button' type='submit' name='submit_download' value='".DOWLAN_24."'/> "; $text .= "<input class='btn btn-default button' type='submit' name='submit_download' value='".DOWLAN_24."'/> ";
} else } else
{ {
$text .= "<input class='btn button' type='submit' name='submit_download' value='".DOWLAN_25."'/>"; $text .= "<input class='btn btn-default button' type='submit' name='submit_download' value='".DOWLAN_25."'/>";
} }
$text .= " $text .= "
@ -1943,7 +1943,7 @@ $columnInfo = array(
<input class='tbox' type='text' id='mirror_image' name='mirror_image' size='60' value='{$mirror_image}' maxlength='200'/> <input class='tbox' type='text' id='mirror_image' name='mirror_image' size='60' value='{$mirror_image}' maxlength='200'/>
<br /><input class='btn button' type ='button' style='cursor:pointer' size='30' value='".DOWLAN_42."' onclick='expandit(this)'/> <br /><input class='btn btn-default button' type ='button' style='cursor:pointer' size='30' value='".DOWLAN_42."' onclick='expandit(this)'/>
<div id='imagefile' style='display:none;{head}'>"; <div id='imagefile' style='display:none;{head}'>";
$text .= DOWLAN_140."<br/>"; $text .= DOWLAN_140."<br/>";
@ -1972,7 +1972,7 @@ $columnInfo = array(
<tr> <tr>
<td colspan='2' class='forumheader' style='text-align:center;'> <td colspan='2' class='forumheader' style='text-align:center;'>
".($edit ? "<input class='btn button' type='submit' name='submit_mirror' value='".DOWLAN_142."'/><input type='hidden' name='id' value='{$mirror_id}'/>" : "<input class='btn button' type='submit' name='submit_mirror' value='".DOWLAN_143."'/>")." ".($edit ? "<input class='btn btn-default button' type='submit' name='submit_mirror' value='".DOWLAN_142."'/><input type='hidden' name='id' value='{$mirror_id}'/>" : "<input class='btn button' type='submit' name='submit_mirror' value='".DOWLAN_143."'/>")."
</td> </td>
</tr> </tr>
@ -2164,7 +2164,7 @@ $columnInfo = array(
</div> </div>
</div> </div>
<div class='buttons-bar center'> <div class='buttons-bar center'>
<input class='btn button' type='submit' name='updatedownlaodoptions' value='".DOWLAN_64."'/> <input class='btn btn-default button' type='submit' name='updatedownlaodoptions' value='".DOWLAN_64."'/>
</div> </div>
</div> </div>

10
e107_plugins/forum/forum_admin.php
View File

@ -2025,8 +2025,8 @@ class forumAdmin
{ {
$text .= " $text .= "
<div style='text-align:left; padding-left: 30px'> <div style='text-align:left; padding-left: 30px'>
<a class='btn ' href='".e_SELF."?cat.edit.{$parent['forum_id']}'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-default ' href='".e_SELF."?cat.edit.{$parent['forum_id']}'>".ADMIN_EDIT_ICON."</a>
<a class='btn ' href='".e_SELF."?delete.{$parent['forum_id']}'>".ADMIN_DELETE_ICON."</a> <a class='btn btn-default ' href='".e_SELF."?delete.{$parent['forum_id']}'>".ADMIN_DELETE_ICON."</a>
</div> </div>
"; ";
} }
@ -2076,9 +2076,9 @@ class forumAdmin
$sub_total = count($subList[$forum['forum_parent']][$forum['forum_id']]); $sub_total = count($subList[$forum['forum_parent']][$forum['forum_id']]);
$text .= " $text .= "
<div style='text-align:left; padding-left: 30px'> <div style='text-align:left; padding-left: 30px'>
<a class='btn e-tip' href='".e_SELF."?create.edit.{$forum['forum_id']}' title=\"".LAN_EDIT."\">".ADMIN_EDIT_ICON."</a> <a class='btn btn-default e-tip' href='".e_SELF."?create.edit.{$forum['forum_id']}' title=\"".LAN_EDIT."\">".ADMIN_EDIT_ICON."</a>
<a class='btn e-tip' href='".e_SELF."?delete.{$forum['forum_id']}' title=\"".LAN_DELETE."\">".ADMIN_DELETE_ICON."</a> <a class='btn btn-default e-tip' href='".e_SELF."?delete.{$forum['forum_id']}' title=\"".LAN_DELETE."\">".ADMIN_DELETE_ICON."</a>
<a class='btn e-tip' href='".e_SELF."?subs.{$forum['forum_id']}' title='Create Sub-Forum. Total: {$sub_total}'>".$sub_img."</a> <a class='btn btn-default e-tip' href='".e_SELF."?subs.{$forum['forum_id']}' title='Create Sub-Forum. Total: {$sub_total}'>".$sub_img."</a>
</div> </div>
"; ";
} }

4
e107_plugins/newsletter/admin_config.php
View File

@ -199,7 +199,7 @@ class newsletter
<td>".$data['newsletter_id']."</td> <td>".$data['newsletter_id']."</td>
<td>".$data['newsletter_issue']."</td> <td>".$data['newsletter_issue']."</td>
<td>[ ".$data['newsletter_parent']." ] ".$data['newsletter_title']."</td> <td>[ ".$data['newsletter_parent']." ] ".$data['newsletter_title']."</td>
<td>".($data['newsletter_flag'] ? LAN_YES : "<input class='btn button' type='submit' name='nlmailnow_".$data['newsletter_id']."' value='".NLLAN_17."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_18)."') \" />")."</td> <td>".($data['newsletter_flag'] ? LAN_YES : "<input class='btn btn-default button' type='submit' name='nlmailnow_".$data['newsletter_id']."' value='".NLLAN_17."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_18)."') \" />")."</td>
<td><a class='btn btn-large' href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a><input type='image' title='".LAN_DELETE."' name='delete[issue_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_19." [ID: ".$data['newsletter_id']." ]")."') \"/> <td><a class='btn btn-large' href='".e_SELF."?edit.".$data['newsletter_id']."'>".ADMIN_EDIT_ICON."</a><input type='image' title='".LAN_DELETE."' name='delete[issue_".$data['newsletter_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(NLLAN_19." [ID: ".$data['newsletter_id']." ]")."') \"/>
</td> </td>
@ -607,7 +607,7 @@ class newsletter
{ {
$mes->addError(NLLAN_56); $mes->addError(NLLAN_56);
$vs_text .= "<div class='buttons-bar center'> $vs_text .= "<div class='buttons-bar center'>
<input class='btn button' type=button value='".LAN_BACK."' onClick=\"window.location='".e_SELF."'\"> <input class='btn btn-default button' type=button value='".LAN_BACK."' onClick=\"window.location='".e_SELF."'\">
</div>"; </div>";
$ns -> tablerender(NLLAN_65.' '.$p_id, $mes->render() . $vs_text); $ns -> tablerender(NLLAN_65.' '.$p_id, $mes->render() . $vs_text);
return; return;

4
e107_plugins/newsletter/nl_archive.php
View File

@ -103,7 +103,7 @@ else
if($limit_start + $page_size < $nl_count) if($limit_start + $page_size < $nl_count)
{ {
$text .= "<form id='nl' method='post' action='".e_PLUGIN."newsletter/nl_archive.php?showp.".$action_parent_id."'> $text .= "<form id='nl' method='post' action='".e_PLUGIN."newsletter/nl_archive.php?showp.".$action_parent_id."'>
<br /><input class='btn button' name='submit' type='submit' value='View older newsletters in archive'/> <br /><input class='btn btn-default button' name='submit' type='submit' value='View older newsletters in archive'/>
<input type='hidden' name='limit_start' value='".$limit_start."'/></form>"; <input type='hidden' name='limit_start' value='".$limit_start."'/></form>";
} }
} }
@ -125,7 +125,7 @@ else
// Display parent footer // Display parent footer
$text .= "$parent_newsletter_footer<br />"; $text .= "$parent_newsletter_footer<br />";
// Display back to newsletter overview button // Display back to newsletter overview button
$text .= "<br /><a href='javascript:history.go(-1);'><input class='btn button' type='submit' value='".NLLAN_71."'</a>"; $text .= "<br /><a href='javascript:history.go(-1);'><input class='btn btn-default button' type='submit' value='".NLLAN_71."'</a>";
} }
else else
{ {

2
e107_plugins/poll/poll_class.php
View File

@ -500,7 +500,7 @@ class poll
// disable submit when previewing the poll or when NOT viewing the poll in the forum // disable submit when previewing the poll or when NOT viewing the poll in the forum
if (('preview' == $type || $preview == TRUE) && strpos(e_REQUEST_SELF, "forum") === FALSE) if (('preview' == $type || $preview == TRUE) && strpos(e_REQUEST_SELF, "forum") === FALSE)
{ {
$SUBMITBUTTON = "<input class='button btn e-tip' type='button' name='null' title='Disabled' value='".POLLAN_30."' />"; $SUBMITBUTTON = "<input class='button btn btn-default e-tip' type='button' name='null' title='Disabled' value='".POLLAN_30."' />";
} }
$text .= "\n".preg_replace("/\{(.*?)\}/e", '$\1', ($type == "forum" ? $POLL_FORUM_NOTVOTED_END : $POLL_NOTVOTED_END))."\n</form>"; $text .= "\n".preg_replace("/\{(.*?)\}/e", '$\1', ($type == "forum" ? $POLL_FORUM_NOTVOTED_END : $POLL_NOTVOTED_END))."\n</form>";

2
e107_plugins/tinymce4/admin_config.php
View File

@ -715,7 +715,7 @@ function edit_theme()
</tr> </tr>
</table> </table>
<div class='buttons-bar center'>"; <div class='buttons-bar center'>";
$text .= "<input class='btn button' type='submit' name='save_settings' value='".LAN_SAVE."' />"; $text .= "<input class='btn btn-default button' type='submit' name='save_settings' value='".LAN_SAVE."' />";
$text .= " $text .= "
</div> </div>
</fieldset> </fieldset>

2
e107_plugins/tinymce4/plugins/e107/dialog.php
View File

@ -218,7 +218,7 @@ class e_bootstrap
</table> </table>
<div class='center'>". $frm->admin_button('insertButton','save','other',"Insert") ." <div class='center'>". $frm->admin_button('insertButton','save','other',"Insert") ."
<button class='btn ' id='e-cancel'>".LAN_CANCEL."</button> <button class='btn btn-default ' id='e-cancel'>".LAN_CANCEL."</button>
</div>"; </div>";

2
e107_plugins/trackback/modtrackback.php
View File

@ -77,7 +77,7 @@ else
<td class='forumheader3' style='width: 10%;'><input type='checkbox' name='trackback_delete[]' value='$trackback_id' /> ".TRACKBACK_L14."</td> <td class='forumheader3' style='width: 10%;'><input type='checkbox' name='trackback_delete[]' value='$trackback_id' /> ".TRACKBACK_L14."</td>
</tr>\n"; </tr>\n";
} }
$text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='btn button' type='submit' name='moderate' value='".TRACKBACK_L13."' /></td></tr></table></form></div>"; $text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='btn btn-default button' type='submit' name='moderate' value='".TRACKBACK_L13."' /></td></tr></table></form></div>";
} }
$ns->tablerender(TRACKBACK_L13, $text); $ns->tablerender(TRACKBACK_L13, $text);

19
e107_themes/bootstrap3/admin_theme.php
View File

@ -6,14 +6,23 @@ define("BOOTSTRAP", 3);
define('FONTAWESOME', 4); define('FONTAWESOME', 4);
e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"); e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js");
e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css'); // e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"); e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
e107::css('url', "//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css"); // be107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css");
e107::css('url', "//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
e107::css('theme','admin_style.css');
e107::css('url', '//maxcdn.bootstrapcdn.com/bootswatch/3.3.2/slate/bootstrap.min.css');
e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');
//e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
//e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
e107::css('theme','admin_style.css');
// e107::css('theme','admin_dark.css'); // e107::css('theme','admin_dark.css');
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->"); e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");

2
e107_web/utilities/dbgen.php
View File

@ -189,7 +189,7 @@ $text .= "
$text .= " $text .= "
<tr> <tr>
<td class='forumheader3' colspan='2' style='text-align:center'> <td class='forumheader3' colspan='2' style='text-align:center'>
<input class='btn button' type='submit' name='do_conversion' value='".'Parse Definition'."' /> <input class='btn btn-default button' type='submit' name='do_conversion' value='".'Parse Definition'."' />
</td> </td>
</tr>"; </tr>";

2
e107_web/utilities/passcalc.php
View File

@ -107,7 +107,7 @@ if (isset($_POST['show_password']))
$text .= " $text .= "
<tr> <tr>
<td class='forumheader3' colspan='3' style='text-align:center'> <td class='forumheader3' colspan='3' style='text-align:center'>
<input class='btn button' type='submit' name='show_password' value='".LAN_PCALC_04."' /> <input class='btn btn-default button' type='submit' name='show_password' value='".LAN_PCALC_04."' />
</td> </td>
</tr>"; </tr>";

2
e107_web/utilities/passconv.php
View File

@ -277,7 +277,7 @@ $text =
$text .= " $text .= "
<tr> <tr>
<td class='forumheader3' colspan='3' style='text-align:center'> <td class='forumheader3' colspan='3' style='text-align:center'>
<input class='btn button' type='submit' name='GetOnWithIt' value='".LAN_PCONV_04."' /> <input class='btn btn-default button' type='submit' name='GetOnWithIt' value='".LAN_PCONV_04."' />
</td> </td>
</tr>"; </tr>";

4
e107_web/utilities/resetcore.php
View File

@ -278,7 +278,7 @@ if (isset($_POST['reset_core_sub']) && $_POST['mode'] == 1)
} }
echo " echo "
<tr> <tr>
<td colspan='2' style='text-align:center'><br /><input class='btn button' type='submit' name='coreedit_sub' value='Save Core Settings' /></td> <td colspan='2' style='text-align:center'><br /><input class='btn btn-default button' type='submit' name='coreedit_sub' value='Save Core Settings' /></td>
</tr> </tr>
</table> </table>
<input type='hidden' name='a_name' value='".$_POST['a_name']."' /> <input type='hidden' name='a_name' value='".$_POST['a_name']."' />
@ -318,7 +318,7 @@ echo "<span class='headertext2'>
<tr> <tr>
<td colspan='2' style='text-align:center'> <td colspan='2' style='text-align:center'>
<br /> <br />
<input class='btn button' type='submit' name='usubmit' value='Continue' /> <input class='btn btn-default button' type='submit' name='usubmit' value='Continue' />
</td> </td>
</tr> </tr>
</table> </table>

2
userposts.php
View File

@ -239,7 +239,7 @@ elseif ($action == 'forums')
$vars->USERPOSTS_FORUM_SEARCH_VALUE = htmlspecialchars($_POST['f_query'], ENT_QUOTES, CHARSET); $vars->USERPOSTS_FORUM_SEARCH_VALUE = htmlspecialchars($_POST['f_query'], ENT_QUOTES, CHARSET);
$vars->USERPOSTS_FORUM_SEARCH_FIELD = "<input class='tbox input' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' />"; $vars->USERPOSTS_FORUM_SEARCH_FIELD = "<input class='tbox input' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' />";
$vars->USERPOSTS_FORUM_SEARCH_BUTTON = "<input class='btn btn-default button' type='submit' name='fsearch' value='".UP_LAN_12."' />"; $vars->USERPOSTS_FORUM_SEARCH_BUTTON = "<input class='btn btn-default button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
$vars->USERPOSTS_FORUM_SEARCH = "<input class='tbox' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' /> <input class='btn button' type='submit' name='fsearch' value='".UP_LAN_12."' />"; $vars->USERPOSTS_FORUM_SEARCH = "<input class='tbox' type='text' name='f_query' size='20' value='{$vars->USERPOSTS_FORUM_SEARCH_VALUE}' maxlength='50' /> <input class='btn btn-default button' type='submit' name='fsearch' value='".UP_LAN_12."' />";
// $userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START); // $userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START);
$userposts_forum_table_start = $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table_start'], $vars); $userposts_forum_table_start = $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table_start'], $vars);