Allow save question titles with HTML - refs BT#12538

pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent 0f30608b58
commit f34970e21f
  1. 4
      app/Resources/public/css/base.css
  2. 32
      main/exercise/question.class.php
  3. 1
      main/exercise/question_list_admin.inc.php
  4. 12
      main/inc/lib/exercise.lib.php
  5. 2
      main/install/configuration.dist.php

@ -1675,7 +1675,7 @@ div.admin_section h4 {
}
.main-question .question_title{
font-size: 20px;
font-weight: bold;
/*font-weight: bold;*/
margin: 15px 0px;
color:#666666 ;
}
@ -6385,7 +6385,7 @@ ul#toolnavbox-two li a.btn{
}
.main-question .question_title {
font-size: 16px;
font-weight: bold;
/*font-weight: bold;*/
margin: 15px 0px;
color: #666666;
line-height: 20px;

@ -191,7 +191,29 @@ abstract class Question
*/
public function selectTitle()
{
return $this->question;
if (!api_get_configuration_value('question_title_html')) {
return $this->question;
}
return Display::div($this->question, ['style' => 'display: inline-block;']);
}
/**
* @param int $itemNumber
* @return string
*/
public function getTitleToDisplay($itemNumber)
{
$showQuestionTitleHtml = api_get_configuration_value('question_title_html');
$title = $showQuestionTitleHtml ? '' : '<strong>';
$title .= $itemNumber.'. '.$this->selectTitle();
$title .= $showQuestionTitleHtml ? '' : '</strong>';
return Display::div(
$title,
['class' => 'question_title']
);
}
/**
@ -1536,7 +1558,13 @@ abstract class Question
</script>';
// question name
$form->addElement('text', 'questionName', get_lang('Question'));
if (api_get_configuration_value('question_title_html')) {
$editorConfig = ['ToolbarSet' => 'Minimal'];
$form->addHtmlEditor('questionName', get_lang('Question'), false, false, $editorConfig, true);
} else {
$form->addElement('text', 'questionName', get_lang('Question'));
}
$form->addRule('questionName', get_lang('GiveQuestion'), 'required');
// default content

@ -250,6 +250,7 @@ if (!$inATest) {
), array('class'=>'btn-actions'));
$title = Security::remove_XSS($objQuestionTmp->selectTitle());
$title = strip_tags($title);
$move = Display::returnFontAwesomeIcon("arrows moved", 'lg');
// Question name

@ -65,10 +65,8 @@ class ExerciseLib
$questionDescription = $objQuestionTmp->selectDescription();
if ($show_title) {
TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
echo Display::div(
$current_item . '. ' . $objQuestionTmp->selectTitle(),
array('class' => 'question_title')
);
echo $objQuestionTmp->getTitleToDisplay($current_item);
}
if (!empty($questionDescription)) {
echo Display::div(
@ -1211,7 +1209,8 @@ HTML;
if (!$only_questions) {
if ($show_title) {
TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>';
echo $objQuestionTmp->getTitleToDisplay($current_item);
}
//@todo I need to the get the feedback type
echo <<<HOTSPOT
@ -1280,7 +1279,8 @@ HOTSPOT;
if (!$only_questions) {
if ($show_title) {
TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
echo '<div class="question_title">'.$current_item.'. '.$objQuestionTmp->selectTitle().'</div>';
echo $objQuestionTmp->getTitleToDisplay($current_item);
}
echo '
<input type="hidden" name="hidden_hotspot_id" value="'.$questionId.'" />

@ -345,3 +345,5 @@ $_configuration['agenda_legend'] = [
'red' => 'red caption',
'#f0f' => 'another caption'
];*/
// Save question titles with HTML
$_configuration['question_title_html'] = false;

Loading…
Cancel
Save