UI changes

main/gradebook/index.php

@@ -801,7 +801,7 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                 if (!empty($grade_models)) {
                     $form_grade = new FormValidator('grade_model_settings');
                     $obj->fill_grade_model_select_in_form($form_grade, 'grade_model_id', $grade_model_id);
-                    $form_grade->addElement('style_submit_button', 'submit', get_lang('Save'), 'class="save"');
+                    $form->addButtonSave(get_lang('Save'));
 
                     if ($form_grade->validate()) {
                         $value = $form_grade->exportValue('grade_model_id');

main/gradebook/lib/fe/dataform.class.php

@@ -46,7 +46,7 @@ class DataForm extends FormValidator
 		$this->addElement('header', get_lang('ChooseOrientation'));
 		$this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
 		$this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
-		$this->addElement('style_submit_button', 'submit', get_lang('Export'), 'class="upload"');
+		$this->addButtonExport(get_lang('Export'));
 		$this->setDefaults(array (
 			'orientation' => 'portrait'
 		));
@@ -58,7 +58,7 @@ class DataForm extends FormValidator
 		$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
 		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
 		$this->addElement('radio', 'file_type', null, 'PDF (Portable Document Format)', 'pdf');
-		$this->addElement('style_submit_button', 'submit', get_lang('Export'), 'class="upload"');
+		$this->addButtonExport(get_lang('Export'));
 		$this->setDefaults(array (
 			'file_type' => 'csv'
 		));
@@ -70,7 +70,7 @@ class DataForm extends FormValidator
 		$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
 		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
 		$this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled'));
-		$this->addElement('style_submit_button', 'submit', get_lang('Export'), 'class="upload"');
+		$this->addButtonExport(get_lang('Export'));
 		$this->setDefaults(array (
 			'file_type' => 'csv'
 		));

main/newscorm/learnpath.class.php

@@ -7229,7 +7229,7 @@ class learnpath
             reset($arrLP);
         }
 
-        $form->addElement('style_submit_button', 'submit_button', get_lang('SaveSection'), 'class="save"');
+        $form->addButtonSave(get_lang('SaveSection'), 'submit_button');
 
         if ($item_type == 'module' || $item_type == 'dokeos_module') {
             $form->addElement('hidden', 'parent', '0');
@@ -7357,7 +7357,7 @@ class learnpath
         $result = Database::query($sql);
         $arrLP = array ();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' 				=> $row['id'],
                 'item_type' 		=> $row['item_type'],
                 'title' 			=> $row['title'],
@@ -7545,26 +7545,28 @@ class learnpath
                             $relative_prefix = '../../';
                         }
 
-                        $editor_config = array( 'ToolbarSet' 			=> 'LearningPathDocuments',
+                        $editor_config = array(
+                            'ToolbarSet'=> 'LearningPathDocuments',
                             'Width' 				=> '100%',
                             'Height' 				=> '500',
                             'FullPage' 				=> true,
                             'CreateDocumentDir' 	=> $relative_prefix,
                             'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/',
                             'BaseHref' 				=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/'.$relative_path
-
                         );
 
                         if ($_GET['action'] == 'add_item') {
                             $class = 'add';
                             $text = get_lang('LPCreateDocument');
-                        } else
+                        } else {
                             if ($_GET['action'] == 'edit_item') {
                                 $class = 'save';
                                 $text = get_lang('SaveDocument');
                             }
+                        }
 
-                        $form->addElement('style_submit_button', 'submit_button', $text, 'class="' . $class . '"');
+                        //$form->addElement('style_submit_button', 'submit_button', $text, 'class="' . $class . '"');
+                        $form->addButtonSave($text, 'submit_button');
                         $renderer = $form->defaultRenderer();
                         $renderer->setElementTemplate('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}', 'content_lp');
                         $form->addElement('html', '<div>');
@@ -7573,7 +7575,8 @@ class learnpath
                         $defaults['content_lp'] = $content;
                     }
                 } elseif (is_numeric($extra_info)) {
-                    $form->addElement('style_submit_button', 'submit_button', get_lang('SaveDocument'), 'class="save"');
+                    $form->addButtonSave(get_lang('SaveDocument'), 'submit_button');
+
                     $return = $this->display_document($extra_info, true, true, true);
                     $form->addElement('html', $return);
                 }
@@ -7585,15 +7588,16 @@ class learnpath
             $form->addElement('hidden', 'description', $item_description);
         }
         if (is_numeric($extra_info)) {
-            $form->addElement('style_submit_button', 'submit_button', get_lang('SaveDocument'), 'value="submit_button", class="save"');
+            $form->addButtonSave(get_lang('SaveDocument'), 'submit_button');
             $form->addElement('hidden', 'path', $extra_info);
         } elseif (is_array($extra_info)) {
-            $form->addElement('style_submit_button', 'submit_button', get_lang('SaveDocument'), 'class="save"');
+            $form->addButtonSave(get_lang('SaveDocument'), 'submit_button');
             $form->addElement('hidden', 'path', $extra_info['path']);
         }
         $form->addElement('hidden', 'type', TOOL_DOCUMENT);
         $form->addElement('hidden', 'post_time', time());
         $form->setDefaults($defaults);
+
         return $form->return_form();
     }
 
@@ -8246,6 +8250,7 @@ class learnpath
 
     /**
      * Return HTML form to allow prerequisites selection
+     * @todo use FormValidator
      * @param	integer Item ID
      * @return	string	HTML form
      */
@@ -8374,7 +8379,7 @@ class learnpath
         $return .= '</tr>';
         $return .= '</table>';
         $return .= '<div style="padding-top:3px;">';
-        $return .= '<button class="save" name="submit_button" type="submit">' . get_lang('ModifyPrerequisites') . '</button>';
+        $return .= '<button class="btn btn-default" name="submit_button" type="submit">' . get_lang('ModifyPrerequisites') . '</button>';
         $return .= '</form>';
 
         return $return;

main/template/default/layout/show_header.tpl

@@ -7,11 +7,11 @@
 #}
 {% if show_header == true %}
     {% if plugin_content_top is not null %}
-        <div id="plugin_content_top" class="span12">
+        <div id="plugin_content_top" class="col-md-12">
             {{ plugin_content_top }}
         </div>
     {% endif %}
-    <div class="span12">
+    <div class="col-md-12">
         {% include template ~ "/layout/page_body.tpl" %}
         <section id="main_content">
 {% endif %}