From 976e45267cab49c38c269231e36e6fc38560000b Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 26 Apr 2019 11:17:48 -0500 Subject: [PATCH 1/4] Remove show-tick class from selects elements --- app/Resources/public/css/base.css | 5 ++++- main/admin/dashboard_add_users_to_user.php | 2 +- main/inc/lib/api.lib.php | 2 +- main/inc/lib/dashboard.lib.php | 2 +- main/inc/lib/pear/HTML/QuickForm/select.php | 2 +- main/session/add_courses_to_session.php | 2 +- main/session/session_category_list.php | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7316c9090e..267f137616 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -7371,9 +7371,12 @@ div#chat-remote-video video { padding-left: 15px; } -#toolbar-agenda .show-tick { +#toolbar-agenda .bootstrap-select { width: 420px; } +#toolbar-agenda .bootstrap-select .dropdown-menu li a { + margin-left: 0px; +} .files-table { padding-top: 20px; diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php index 5a4fc2291b..37ad0b9a1a 100755 --- a/main/admin/dashboard_add_users_to_user.php +++ b/main/admin/dashboard_add_users_to_user.php @@ -441,7 +441,7 @@ $result = Database::query($sql);

- diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index b2123635a4..29e84f2c00 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -4629,7 +4629,7 @@ function api_get_languages_combo($name = 'language') $languages = $language_list['name']; $folder = $language_list['folder']; - $ret .= ''; foreach ($languages as $key => $value) { if ($folder[$key] == $default) { $selected = ' selected="selected"'; diff --git a/main/inc/lib/dashboard.lib.php b/main/inc/lib/dashboard.lib.php index 9e5eb0bcbb..533b8d7054 100755 --- a/main/inc/lib/dashboard.lib.php +++ b/main/inc/lib/dashboard.lib.php @@ -395,7 +395,7 @@ class DashboardManager $html .= ''.$block['name'].''; $html .= ''.$block['description'].''; $html .= ' - diff --git a/main/inc/lib/pear/HTML/QuickForm/select.php b/main/inc/lib/pear/HTML/QuickForm/select.php index 7f49c82ac0..abf5c58b6e 100755 --- a/main/inc/lib/pear/HTML/QuickForm/select.php +++ b/main/inc/lib/pear/HTML/QuickForm/select.php @@ -79,7 +79,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element if (empty($attributes)) { $attributes = []; // Initialize variable to avoid warning in PHP 7.1 } - $attributes['class'] = $oldClass . ' selectpicker show-tick form-control'; + $attributes['class'] = $oldClass . ' selectpicker form-control'; $attributes['data-live-search'] = 'true'; if (isset($attributes['disable_js']) && $attributes['disable_js']) { diff --git a/main/session/add_courses_to_session.php b/main/session/add_courses_to_session.php index 3681f6cdd8..1514ce9316 100644 --- a/main/session/add_courses_to_session.php +++ b/main/session/add_courses_to_session.php @@ -251,7 +251,7 @@ unset($Courses);
: -
- From 310467271dadea6cdc5cb1224c661fca0b52e815 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 26 Apr 2019 11:39:49 -0500 Subject: [PATCH 2/4] Quiz: Fix questions titles in scenario when save_titles_as_html is enabled --- app/Resources/public/css/base.css | 8 ++++++++ main/exercise/UniqueAnswerImage.php | 6 ++---- main/exercise/hotspot_admin.inc.php | 6 ++++-- main/exercise/unique_answer.class.php | 6 ++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 267f137616..378b8bb4ca 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -10072,6 +10072,14 @@ ul.dropdown-menu.inner > li > a { grid-row-gap: 16px; grid-template-columns: repeat(2, 1fr); } + +#question_admin_form .bootstrap-select .dropdown-menu li a span.text { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 100%; +} + @media (min-width: 768px) { .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) { clear: left; diff --git a/main/exercise/UniqueAnswerImage.php b/main/exercise/UniqueAnswerImage.php index 332689e631..b8a3f42470 100644 --- a/main/exercise/UniqueAnswerImage.php +++ b/main/exercise/UniqueAnswerImage.php @@ -97,10 +97,8 @@ class UniqueAnswerImage extends UniqueAnswer } $question = Question::read($questionid); - $selectQuestion[$questionid] = 'Q'.$key.' :'.cut( - $question->selectTitle(), - 20 - ); + $questionTitle = strip_tags($question->selectTitle()); + $selectQuestion[$questionid] = "Q$key: $questionTitle"; } } diff --git a/main/exercise/hotspot_admin.inc.php b/main/exercise/hotspot_admin.inc.php index e35e3f377c..fe0ef2378b 100755 --- a/main/exercise/hotspot_admin.inc.php +++ b/main/exercise/hotspot_admin.inc.php @@ -662,7 +662,8 @@ if (isset($modifyAnswers)) { foreach ($question_list as $key => $questionid) { $selected = ''; $question = Question::read($questionid); - $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL); + $questionTitle = strip_tags($question->selectTitle()); + $val = "Q$key: $questionTitle"; if (isset($select_question[$i]) && $questionid == $select_question[$i]) { $selected = 'selected="selected"'; @@ -1017,7 +1018,8 @@ if (isset($modifyAnswers)) { foreach ($question_list as $key => $questionid) { $selected = ''; $question = Question::read($questionid); - $val = 'Q'.$key.' :'.substrwords($question->selectTitle(), ICON_SIZE_SMALL); + $questionTitle = $question->selectTitle(); + $val = "Q$key: $questionTitle"; if ($questionid == $selectQuestionNoError) { $selected = 'selected="selected"'; } diff --git a/main/exercise/unique_answer.class.php b/main/exercise/unique_answer.class.php index e1d776ee08..c6ec4571ea 100755 --- a/main/exercise/unique_answer.class.php +++ b/main/exercise/unique_answer.class.php @@ -104,10 +104,8 @@ class UniqueAnswer extends Question continue; } $question = Question::read($questionid); - $select_question[$questionid] = 'Q'.$key.' :'.cut( - $question->selectTitle(), - 20 - ); + $questionTitle = strip_tags($question->selectTitle()); + $select_question[$questionid] = "Q$key: $questionTitle"; } } $select_question[-1] = get_lang('ExitTest'); From 528fa01497e424bbb422e57960f5945ec4d94dae Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 26 Apr 2019 11:53:58 -0500 Subject: [PATCH 3/4] Minor - Format code --- main/exercise/hotspot_admin.inc.php | 423 +++++++++++++--------------- 1 file changed, 196 insertions(+), 227 deletions(-) diff --git a/main/exercise/hotspot_admin.inc.php b/main/exercise/hotspot_admin.inc.php index fe0ef2378b..7e9040901f 100755 --- a/main/exercise/hotspot_admin.inc.php +++ b/main/exercise/hotspot_admin.inc.php @@ -9,9 +9,9 @@ use ChamiloSession as Session; * * @package chamilo.exercise * - * @author Toon Keppens + * @author Toon Keppens */ -$modifyAnswers = (int) $_GET['hotspotadmin']; +$modifyAnswers = (int)$_GET['hotspotadmin']; if (!is_object($objQuestion)) { $objQuestion = Question::read($modifyAnswers); @@ -576,30 +576,27 @@ if (isset($modifyAnswers)) { echo Display::return_message($msgErr, 'normal'); //main API } - $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&hotspotadmin='.$modifyAnswers.'&exerciseId='.$exerciseId; ?> + $hotspot_admin_url = api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'&' + .http_build_query(['hotspotadmin' => $modifyAnswers, 'exerciseId' => $exerciseId]); ?>
- + - + - + @@ -628,74 +625,74 @@ if (isset($modifyAnswers)) { get_flat_list(); - - for ($i = 1; $i <= $nbrAnswers; $i++) { - // is an delineation - if ($answerType == HOT_SPOT_DELINEATION) { - $option_lp = ''; - - // setting the LP - $isSelected = false; - foreach ($flat_list as $id => $details) { - $selected = ''; - if (isset($lp[$i]) && $id == $lp[$i]) { - $isSelected = true; - $selected = 'selected="selected"'; - } - $option_lp .= ''; - } + // Loading list of LPs + $flat_list = $list->get_flat_list(); + + for ($i = 1; $i <= $nbrAnswers; $i++) { + // is an delineation + if ($answerType == HOT_SPOT_DELINEATION) { + $option_lp = ''; + + // setting the LP + $isSelected = false; + foreach ($flat_list as $id => $details) { + $selected = ''; + if (isset($lp[$i]) && $id == $lp[$i]) { + $isSelected = true; + $selected = 'selected="selected"'; + } + $option_lp .= ''; + } - if ($isSelected) { - $option_lp = ''.$option_lp; - } else { - $option_lp = ''.$option_lp; + } else { + $option_lp = ''.$option_lp; - } + } - // Feedback SELECT - $question_list = $objExercise->selectQuestionList(); - $option_feed = ''; - $option_feed .= ''; + // Feedback SELECT + $question_list = $objExercise->selectQuestionList(); + $option_feed = ''; + $option_feed .= ''; - foreach ($question_list as $key => $questionid) { - $selected = ''; - $question = Question::read($questionid); - $questionTitle = strip_tags($question->selectTitle()); - $val = "Q$key: $questionTitle"; + foreach ($question_list as $key => $questionid) { + $selected = ''; + $question = Question::read($questionid); + $questionTitle = strip_tags($question->selectTitle()); + $val = "Q$key: $questionTitle"; - if (isset($select_question[$i]) && $questionid == $select_question[$i]) { - $selected = 'selected="selected"'; - } + if (isset($select_question[$i]) && $questionid == $select_question[$i]) { + $selected = 'selected="selected"'; + } - $option_feed .= ''; - } + $option_feed .= ''; + } - if (isset($select_question[$i]) && $select_question[$i] == -1) { - $option_feed .= ''; - } else { - $option_feed .= ''; - } + if (isset($select_question[$i]) && $select_question[$i] == -1) { + $option_feed .= ''; + } else { + $option_feed .= ''; + } - //-------- IF it is a delineation - if ($_SESSION['tmp_answers']['hotspot_type'][$i] == 'delineation') { - $option1 = $option2 = $option3 = ''; - for ($k = 1; $k <= 100; $k++) { - $selected1 = $selected2 = $selected3 = ''; - if ($k == $threadhold1[$i]) { - $selected1 = 'selected="selected"'; - } - if ($k == $threadhold2[$i]) { - $selected2 = 'selected="selected"'; - } - if ($k == $threadhold3[$i]) { - $selected3 = 'selected="selected"'; - } - $option1 .= ''; - $option2 .= ''; - $option3 .= ''; - } ?> + //-------- IF it is a delineation + if ($_SESSION['tmp_answers']['hotspot_type'][$i] == 'delineation') { + $option1 = $option2 = $option3 = ''; + for ($k = 1; $k <= 100; $k++) { + $selected1 = $selected2 = $selected3 = ''; + if ($k == $threadhold1[$i]) { + $selected1 = 'selected="selected"'; + } + if ($k == $threadhold2[$i]) { + $selected2 = 'selected="selected"'; + } + if ($k == $threadhold3[$i]) { + $selected3 = 'selected="selected"'; + } + $option1 .= ''; + $option2 .= ''; + $option3 .= ''; + } ?>