Minor style fixes in platform settings

main/admin/settings.lib.php

@@ -1048,8 +1048,8 @@ function generate_settings_form($settings, $settings_by_access_list) {
     $table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     global $_configuration, $settings_to_avoid, $convert_byte_to_mega_list;
         
-    $form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']));
-    $form ->addElement('hidden', 'search_field', Security::remove_XSS($_GET['search_field']));
+    $form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']), null, array('sss'));
+    $form->addElement('hidden', 'search_field', Security::remove_XSS($_GET['search_field']));
     
     $default_values = array();    
     
@@ -1261,8 +1261,6 @@ function generate_settings_form($settings, $settings_by_access_list) {
     $form->addElement('html', '<div class="bottom_actions">');
     $form->addElement('style_submit_button', null, get_lang('SaveSettings'), 'class="save"');
     $form->addElement('html', '</div>');
-
-    
     return $form;
 }
 

main/admin/settings.php

@@ -79,6 +79,15 @@ if (isset($_GET['action']) &&  $_GET['action'] == 'delete_grading') {
 	api_delete_setting_option($id);
 }
 
+$form_search = new FormValidator('search_settings', 'get', api_get_self() , null, array('class'=>'well form-inline'));
+$form_search->addElement('text', 'search_field');
+$form_search->addElement('hidden', 'category', 'search_setting');
+$form_search->addElement('style_submit_button', 'submit_button', get_lang('Search'), 'value="submit_button", class="search"');         
+$form_search->setDefaults(array('search_field' => $_REQUEST['search_field']));
+
+$form_search_html = $form_search->return_form();
+
+
 $settings = null;
 
 // Build the form.
@@ -252,13 +261,12 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
     }
 }
 
-
 $htmlHeadXtra[] = '<script>    
     var hide_icon = "'.api_get_path(WEB_IMG_PATH).'shared_setting_na.png";
     var show_icon = "'.api_get_path(WEB_IMG_PATH).'shared_setting.png";
     var url       = "'.api_get_path(WEB_AJAX_PATH).'admin.ajax.php?a=update_changeable_setting";
         
-    $(function(){
+    $(function() {
         $(".share_this_setting").on("click", function() {
             var my_img = $(this).find("img");
             var link = $(this);
@@ -344,14 +352,12 @@ foreach ($resultcategories as $row) {
     }
     $action_array[] = $url;
 }
+
 echo Display::actions($action_array);
 
-$form_search = new FormValidator('search_settings', 'get', api_get_self() , null, array('class'=>'vertical'));
-$form_search->addElement('text', 'search_field');
-$form_search->addElement('hidden', 'category', 'search_setting');
-$form_search->addElement('style_submit_button', 'submit_button', get_lang('Search'), 'value="submit_button", class="search"');         
-$form_search->setDefaults(array('search_field' => $_REQUEST['search_field']));
-$form_search->display();
+echo '<br />';
+
+echo $form_search_html;
 
 if ($watermark_deleted) {    
     Display :: display_normal_message(get_lang('FileDeleted'));

main/css/base.css

@@ -319,7 +319,7 @@ a.tag {
 
 /* Admin index.php */
 #settings .span6 {
-    min-height: 180px;
+    min-height: 200px;
 }
 
 /* user_portal course status icon */
@@ -3847,8 +3847,7 @@ footer {
 
 .bottom_actions_fixed {
     position: fixed;
-      z-index: 9001;  
-       bottom: 0;   
-    left: 0px;
-    
+    z-index: 9001;  
+    bottom: 0;   
+    left: 0px;    
 }

main/inc/lib/formvalidator/FormValidator.class.php

@@ -51,8 +51,7 @@ class FormValidator extends HTML_QuickForm
      * @param array form_data 
      * @return FormValidator
      */
-    static function create($form_data)
-    {
+    static function create($form_data) {
         if (empty($form_data)) {
             return null;
         }
@@ -116,7 +115,6 @@ class FormValidator extends HTML_QuickForm
      * submitted by adding a special hidden field (default = true)
      */
     function __construct($form_name, $method = 'post', $action = '', $target = '', $attributes = null, $track_submit = true) {
-
         //Default form class
         if (is_array($attributes) && !isset($attributes['class']) || empty($attributes)) {
             $attributes['class'] = 'form-horizontal';
@@ -160,12 +158,9 @@ class FormValidator extends HTML_QuickForm
         $renderer->setFormTemplate($form_template);
 
         //Element template
-        if ($attributes['class'] == 'well form-inline') {
-            $element_template = '
-                    {label}  {element}                    
-            ';
+        if (isset($attributes['class']) && $attributes['class'] == 'well form-inline') {            
+            $element_template = ' {label}  {element} ';
         } else {
-
             $element_template = '   
             <div class="control-group {error_class}">				
                 <label class="control-label">
@@ -188,8 +183,8 @@ class FormValidator extends HTML_QuickForm
                     <!-- END error -->	
                 </div>
             </div>';
-        }
-
+        }        
+        
         $renderer->setElementTemplate($element_template);
 
         //Set Header template        
@@ -313,8 +308,8 @@ EOT;
     /**
      * Adds a button to the form to add resources.
      */
-    function add_resource_button()
-    {
+    function add_resource_button() {
+        $group = array();
         $group[] = $this->createElement('static', 'add_resource_img', null, '<img src="' . api_get_path(WEB_IMG_PATH) . 'attachment.gif" alt="' . get_lang('Attachment') . '"/>');
         $group[] = $this->createElement('submit', 'add_resource', get_lang('Attachment'), 'class="link_alike"');
         $this->addGroup($group);
@@ -331,8 +326,7 @@ EOT;
      * @param string $label (optional)			Custom label to be shown
      * submits the form and the start of the progress bar.
      */
-    function add_progress_bar($delay = 2, $label = '')
-    {
+    function add_progress_bar($delay = 2, $label = '') {
         if (empty($label)) {
             $label = get_lang('PleaseStandBy');
         }

main/inc/lib/pear/HTML/QuickForm.php

@@ -1742,8 +1742,7 @@ class HTML_QuickForm extends HTML_Common
      * @since     1.0
      * @access   public
      */
-    function toHtml ($in_data = null) {
-         
+    function toHtml ($in_data = null) {         
         if (!is_null($in_data)) {
             $this->addElement('html', $in_data);
         }