From 63214df8f16badd5c75a974dd10a73f63c097f64 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Wed, 5 Apr 2017 18:03:10 -0500 Subject: [PATCH 1/4] fix btn convert answer --- main/exercise/question.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php index 5c97634ca4..106c50554b 100755 --- a/main/exercise/question.class.php +++ b/main/exercise/question.class.php @@ -1537,10 +1537,10 @@ abstract class Question switch ($this->type) { case UNIQUE_ANSWER: - $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'info'); + $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'default'); break; case MULTIPLE_ANSWER: - $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'info'); + $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'default'); break; } From fe8b1a70ea2805b17c6a73caf8a8762e5a3bfa2e Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Fri, 7 Apr 2017 14:58:07 -0500 Subject: [PATCH 2/4] fix get template tpl ckeditor --- main/inc/lib/javascript/ckeditor/config_js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/javascript/ckeditor/config_js.php b/main/inc/lib/javascript/ckeditor/config_js.php index fd5cd4cf47..33db432ca8 100644 --- a/main/inc/lib/javascript/ckeditor/config_js.php +++ b/main/inc/lib/javascript/ckeditor/config_js.php @@ -14,5 +14,5 @@ $template->assign('moreButtonsInMaximizedMode', $moreButtonsInMaximizedMode); $template->assign('course_condition', api_get_cidreq()); header('Content-type: application/x-javascript'); -$template->display('default/javascript/editor/ckeditor/config_js.tpl'); +$template->display($template->get_template('javascript/editor/ckeditor/config_js.tpl')); From 29a47c19a1369f129d4cfdd533f8b5e0a580d396 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 7 Apr 2017 15:40:22 -0500 Subject: [PATCH 3/4] Allow set PDF footer from tpl - refs BT#12441 --- app/Resources/public/css/print.css | 18 ++++++ main/inc/lib/pdf.lib.php | 71 +++------------------ main/template/default/export/pdf_footer.tpl | 10 +++ 3 files changed, 38 insertions(+), 61 deletions(-) create mode 100644 main/template/default/export/pdf_footer.tpl diff --git a/app/Resources/public/css/print.css b/app/Resources/public/css/print.css index 34f753e8c7..8c8c616495 100644 --- a/app/Resources/public/css/print.css +++ b/app/Resources/public/css/print.css @@ -691,3 +691,21 @@ table.border-thin td { .text-center { text-align: center; } +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} + +table.page-footer { + font-family: serif; + font-size: 10pt; +} +table.page-footer td{ + padding: 0; +} + +.border-top { + border-top: 1px solid #000; +} diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php index ca7172f1e1..7b9c3de64f 100755 --- a/main/inc/lib/pdf.lib.php +++ b/main/inc/lib/pdf.lib.php @@ -622,67 +622,16 @@ class PDF */ public function set_footer() { - $this->pdf->defaultfooterfontsize = 12; // in pts - $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI - $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer - $platform_name = api_get_setting('Institution'); - $left_content = $platform_name; - $center_content = ''; - $right_content = '{PAGENO} / {nb}'; - - //@todo remove this and use a simpler way - $footer = array( - 'odd' => array( - 'L' => array( - 'content' => $left_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'C' => array( - 'content' => $center_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'R' => array( - 'content' => $right_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'line' => 1, - ), - 'even' => array( - 'L' => array( - 'content' => $left_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'C' => array( - 'content' => $center_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'R' => array( - 'content' => $right_content, - 'font-size' => 10, - 'font-style' => 'B', - 'font-family' => 'serif', - 'color' => '#000000' - ), - 'line' => 1, - ), - ); - // defines footer for Odd and Even Pages - placed at Outer margin see http://mpdf1.com/manual/index.php?tid=151&searchstring=setfooter - $this->pdf->SetFooter($footer); + $this->pdf->defaultfooterfontsize = 12; // in pts + $this->pdf->defaultfooterfontstyle = 'B'; // blank, B, I, or BI + $this->pdf->defaultfooterline = 1; // 1 to include line below header/above footer + + $view = new Template('', false, false, false, true, false, false); + $template = $view->get_template('export/pdf_footer.tpl'); + $footerHTML = $view->fetch($template); + + $this->pdf->SetHTMLFooter($footerHTML, 'E'); //Even pages + $this->pdf->SetHTMLFooter($footerHTML, 'O'); //Odd pages } /** diff --git a/main/template/default/export/pdf_footer.tpl b/main/template/default/export/pdf_footer.tpl new file mode 100644 index 0000000000..0703fa0389 --- /dev/null +++ b/main/template/default/export/pdf_footer.tpl @@ -0,0 +1,10 @@ + + + + + +
+ {{ _s.institution }} + + {PAGENO} / {nb} +
From 5687f738b3c3c5a2ebaf4b57da72ab28dd4fe74e Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Fri, 7 Apr 2017 15:50:03 -0500 Subject: [PATCH 4/4] fix add btb question --- main/exercise/question.class.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php index d9cffdb402..f822f32c65 100755 --- a/main/exercise/question.class.php +++ b/main/exercise/question.class.php @@ -1572,13 +1572,21 @@ abstract class Question // Categories $tabCat = TestCategory::getCategoriesIdAndName(); $form->addElement('select', 'questionCategory', get_lang('Category'), $tabCat); - + + global $text; + switch ($this->type) { case UNIQUE_ANSWER: - $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'default'); + $buttonGroup = array(); + $buttonGroup[] = $form->addButton('convertAnswer', get_lang('ConvertToMultipleAnswer'), 'dot-circle-o', 'default', null, null, null, true); + $buttonGroup[] = $form->addButtonSave($text, 'submitQuestion', true); + $form->addGroup($buttonGroup); break; case MULTIPLE_ANSWER: - $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'default'); + $buttonGroup = array(); + $buttonGroup[] = $form->addButton('convertAnswer', get_lang('ConvertToUniqueAnswer'), 'check-square-o', 'default'); + $buttonGroup[] = $form->addButtonSave($text, 'submitQuestion', true); + $form->addGroup($buttonGroup); break; }