fix cols size boostrap grill textarea CT#7539

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

@@ -418,7 +418,7 @@ EOT;
      *
      * @return HTML_QuickForm_button
      */
-    public function addButtonSend($label, $name = 'submit', $createElement = false)
+    public function addButtonSend($label, $name = 'submit', $createElement = false, $attributes = array())
     {
         return $this->addButton(
             $name,
@@ -427,7 +427,7 @@ EOT;
             'primary',
             null,
             null,
-            array(),
+            $attributes,
             $createElement
         );
     }

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

@@ -43,7 +43,8 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
      * @access    private
      */
     public $_value = null;
-
+    
+    private $columnsSize;
     // }}}
     // {{{ constructor
 
@@ -60,6 +61,8 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
     public function __construct($elementName=null, $elementLabel=null, $attributes=null)
     {
         $attributes['class'] = isset($attributes['class']) ? $attributes['class'] : 'form-control';
+        $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
+        $this->setColumnsSize($columnsSize);
         parent::__construct($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
         $this->_type = 'textarea';
@@ -129,7 +132,7 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
 
     // }}}
     // {{{ setWrap()
-
+    
     /**
      * Sets wrap type for textarea element
      *
@@ -221,5 +224,119 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         }
         return $html . $this->_getPersistantData();
     }
+    
+    /**
+     * @return null
+     */
+    public function getInputSize()
+    {
+        return $this->inputSize;
+    }
+
+    /**
+     * @param null $inputSize
+     */
+    public function setInputSize($inputSize)
+    {
+        $this->inputSize = $inputSize;
+    }
+    /**
+     * @return null
+     */
+    public function getColumnsSize()
+    {
+        return $this->columnsSize;
+    }
 
+    /**
+     * @param null $columnsSize
+     */
+    public function setColumnsSize($columnsSize)
+    {
+        $this->columnsSize = $columnsSize;
+    }
+    
+    /**
+     * @param string $layout
+     *
+     * @return string
+     */
+    public function getTemplate($layout)
+    {
+        $size = $this->getColumnsSize();
+        $this->removeAttribute('cols-size');
+
+        if (empty($size)) {
+            $sizeTemp = $this->getInputSize();
+            if (empty($size)) {
+                $sizeTemp = 8;
+            }
+            $size = array(2, $sizeTemp, 2);
+        } else {
+            if (is_array($size)) {
+                if (count($size) != 3) {
+                    $sizeTemp = $this->getInputSize();
+                    if (empty($size)) {
+                        $sizeTemp = 8;
+                    }
+                    $size = array(2, $sizeTemp, 2);
+                }
+                // else just keep the $size array as received
+            } else {
+                $size = array(2, intval($size), 2);
+            }
+        }
+        
+
+        switch ($layout) {
+            case FormValidator::LAYOUT_INLINE:
+                return '
+                <div class="form-group {error_class}">
+                    <label {label-for} >
+                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                        {label}
+                    </label>
+                    {element}
+                </div>';
+                break;
+            case FormValidator::LAYOUT_HORIZONTAL:
+                return '
+                <div class="form-group {error_class}">
+                    <label {label-for} class="col-sm-'.$size[0].' control-label" >
+                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                        {label}
+                    </label>
+                    <div class="col-sm-'.$size[1].'">
+                        {icon}
+                        {element}
+
+                        <!-- BEGIN label_2 -->
+                            <p class="help-block">{label_2}</p>
+                        <!-- END label_2 -->
+
+                        <!-- BEGIN error -->
+                            <span class="help-inline">{error}</span>
+                        <!-- END error -->
+                    </div>
+                    <div class="col-sm-'.$size[2].'">
+                        <!-- BEGIN label_3 -->
+                            {label_3}
+                        <!-- END label_3 -->
+                    </div>
+                </div>';
+                
+                break;
+            case FormValidator::LAYOUT_BOX_NO_LABEL:
+                return '
+                        <label {label-for}>{label}</label>
+                        <div class="input-group">
+                            
+                            {icon}
+                            {element}
+                        </div>';
+                break;
+        }
+    }
+    
+ 
 }

main/inc/lib/social.lib.php

@@ -1843,7 +1843,8 @@ class SocialManager extends UserManager
             'post',
             api_get_path(WEB_CODE_PATH).'social/profile.php',
             null,
-            array('enctype' => 'multipart/form-data')
+            array('enctype' => 'multipart/form-data') ,
+            FormValidator::LAYOUT_HORIZONTAL    
         );
 
         $form->addTextarea(
@@ -1851,12 +1852,12 @@ class SocialManager extends UserManager
             null,
             [
                 'placeholder' => get_lang('SocialWallWhatAreYouThinkingAbout'),
-                'style' => 'width : 100%'
+                'cols-size' => [1, 10, 1]
             ]
         );
         $form->addHtml('<div class="form-group "><div class="url_preview col-md-9 panel-body"></div></div>');
         $form->addHidden('url_content', '');
-        $form->addButtonSend(get_lang('Post'));
+        $form->addButtonSend(get_lang('Post'), null, false, ['cols-size' => [1, 10, 1]]);
         $html = Display::panel($form->returnForm(), get_lang('SocialWall'));
 
         return $html;

main/social/profile.php

@@ -294,7 +294,7 @@ $socialAutoExtendLink = Display::url(
 // Added a Jquery Function to return the Preview of OpenGraph URL Content
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
-    $("label").remove();
+    /* $("label").remove(); */
     $("[name=\'social_wall_new_msg_main\']").on("paste", function(e) {
         $.ajax({
             contentType: "application/x-www-form-urlencoded",