mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 20:30:39 +02:00
Bootstrap 4 fixes.
This commit is contained in:
@@ -500,7 +500,7 @@ echo getAlert();
|
||||
function getModal($caption = '', $type='')
|
||||
{
|
||||
|
||||
if(deftrue('BOOTSTRAP') === 3) // see bootstrap3/admin_template.php
|
||||
if(deftrue('BOOTSTRAP')) // see bootstrap3/admin_template.php
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
@@ -2141,7 +2141,7 @@ class e_form
|
||||
});
|
||||
');
|
||||
|
||||
if(deftrue('BOOTSTRAP') == 3)
|
||||
if(deftrue('BOOTSTRAP'))
|
||||
{
|
||||
$options['class'] .= ' form-control';
|
||||
}
|
||||
@@ -3495,7 +3495,7 @@ var_dump($select_options);*/
|
||||
|
||||
$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);
|
||||
|
||||
|
||||
@@ -6173,11 +6173,15 @@ var_dump($select_options);*/
|
||||
|
||||
case 'userclass':
|
||||
case 'userclasses':
|
||||
|
||||
|
||||
$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
|
||||
unset($parms['classlist']);
|
||||
|
||||
|
||||
// $method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
|
||||
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']);
|
||||
break;
|
||||
|
||||
|
@@ -395,7 +395,7 @@
|
||||
|
||||
$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);
|
||||
|
||||
if(defset("BOOTSTRAP"))
|
||||
|
@@ -54,7 +54,7 @@
|
||||
$arr = array('rss_topicid'=> $topic, 'rss_url'=>$type);
|
||||
|
||||
|
||||
if(deftrue('BOOTSTRAP') === 3) // v2.x
|
||||
if(deftrue('BOOTSTRAP')) // v2.x
|
||||
{
|
||||
$text = "
|
||||
<div>
|
||||
|
@@ -56,7 +56,7 @@ class rss_menu_shortcodes extends e_shortcode
|
||||
$url4 = e107::url('rss_menu','atom', $row);
|
||||
|
||||
|
||||
if(deftrue('BOOTSTRAP') === 3) // v2.x
|
||||
if(deftrue('BOOTSTRAP')) // v2.x
|
||||
{
|
||||
$text = "
|
||||
<div>
|
||||
|
Reference in New Issue
Block a user