From 65322ee1327bc48abb0e7f390188f42467411724 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 9 Apr 2020 17:42:44 -0700 Subject: [PATCH] Issue #3058 - Tweak to avoid conflict with other boolean fields. --- e107_handlers/form_handler.php | 6 +++++- e107_themes/bootstrap3/admin_style.css | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c4cf0ea60..46b139d95 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -5475,8 +5475,12 @@ var_dump($select_options);*/ $wparms = (vartrue($parms['reverse'])) ? array(0=>$true, 1=>$false) : array(0=>$false, 1=>$true); $dispValue = $wparms[$value]; + $styleClass = ''; - $styleClass = ($value === 1) ? 'admin-true-icon' : 'admin-false-icon'; + if($true ==='✔') + { + $styleClass = ($value === 1) ? 'admin-true-icon' : 'admin-false-icon'; + } return $this->renderInline($field, $id, $attributes['title'], $value, $dispValue, 'select', $wparms, array('class'=>'e-editable-boolean '.$styleClass)); diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index d3416a3ab..0d8b700a0 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -571,8 +571,10 @@ table.adminlist td .video-responsive { height: auto; padding:0 } .admin-true-icon { color: #51a351; font-weight:bold; font-size:1.2em; } .admin-false-icon { color: #ee5f5b; font-weight:bold; font-size:1.2em; } -select.e-editable-boolean option[value='1'] { color: #51a351; } -select.e-editable-boolean option[value='0'] { color: #ee5f5b; } + select.e-editable-boolean.admin-true-icon option[value='1'], + select.e-editable-boolean.admin-false-icon option[value='1'] { color: #51a351; } + select.e-editable-boolean.admin-true-icon option[value='0'], + select.e-editable-boolean.admin-false-icon option[value='0'] { color: #ee5f5b; } span.e-search input[type='text'] { padding-left:15px; font-style: italic }