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

Bootstrap 4 fixes.

Browse Source
This commit is contained in:
Cameron
2019-03-02 07:47:37 -08:00
parent 749fd506e0
commit 30c5553dbd
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@@ -500,7 +500,7 @@ echo getAlert();
function getModal($caption = '', $type='') function getModal($caption = '', $type='')
{ {
if(deftrue('BOOTSTRAP') === 3) // see bootstrap3/admin_template.php if(deftrue('BOOTSTRAP')) // see bootstrap3/admin_template.php
{ {
return ''; return '';
} }

8
e107_handlers/form_handler.php
View File

@@ -2141,7 +2141,7 @@ class e_form
}); });
'); ');
if(deftrue('BOOTSTRAP') == 3) if(deftrue('BOOTSTRAP'))
{ {
$options['class'] .= ' form-control'; $options['class'] .= ' form-control';
} }
@@ -3495,7 +3495,7 @@ var_dump($select_options);*/
$opt = array(); $opt = array();
$homeicon = (deftrue('BOOTSTRAP') === 4) ? 'fa-home' : 'icon-home.glyph'; $homeicon = (deftrue('FONTAWESOME')) ? 'fa-home' : 'icon-home.glyph';
$homeIcon = e107::getParser()->toGlyph($homeicon,false); $homeIcon = e107::getParser()->toGlyph($homeicon,false);
@@ -6173,11 +6173,15 @@ var_dump($select_options);*/
case 'userclass': case 'userclass':
case 'userclasses': case 'userclasses':
$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler) $uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
unset($parms['classlist']); unset($parms['classlist']);
// $method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select'; // $method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
if(vartrue($attributes['type']) == 'userclasses'){ $parms['multiple'] = true; } if(vartrue($attributes['type']) == 'userclasses'){ $parms['multiple'] = true; }
$ret = vartrue($parms['pre']).$this->uc_select($key, $value, $uc_options, vartrue($parms, array())). vartrue($parms['post']); $ret = vartrue($parms['pre']).$this->uc_select($key, $value, $uc_options, vartrue($parms, array())). vartrue($parms['post']);
break; break;

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

@@ -395,7 +395,7 @@
$url = e_REQUEST_SELF . "?id=" . $this->postInfo['post_id'] . "&dl=" . $key; $url = e_REQUEST_SELF . "?id=" . $this->postInfo['post_id'] . "&dl=" . $key;
$saveicon = (deftrue('BOOTSTRAP') === 4) ? 'fa-save' : 'icon-save.glyph'; $saveicon = (deftrue('FONTAWESOME')) ? 'fa-save' : 'icon-save.glyph';
$saveicon = e107::getParser()->toGlyph($saveicon,false); $saveicon = e107::getParser()->toGlyph($saveicon,false);
if(defset("BOOTSTRAP")) if(defset("BOOTSTRAP"))

2
e107_plugins/rss_menu/rss_menu.php
View File

@@ -54,7 +54,7 @@
$arr = array('rss_topicid'=> $topic, 'rss_url'=>$type); $arr = array('rss_topicid'=> $topic, 'rss_url'=>$type);
if(deftrue('BOOTSTRAP') === 3) // v2.x if(deftrue('BOOTSTRAP')) // v2.x
{ {
$text = " $text = "
<div> <div>

2
e107_plugins/rss_menu/rss_shortcodes.php
View File

@@ -56,7 +56,7 @@ class rss_menu_shortcodes extends e_shortcode
$url4 = e107::url('rss_menu','atom', $row); $url4 = e107::url('rss_menu','atom', $row);
if(deftrue('BOOTSTRAP') === 3) // v2.x if(deftrue('BOOTSTRAP')) // v2.x
{ {
$text = " $text = "
<div> <div>