From f35d202de596d4cc6d2bbfe7450f8361ff1845e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Wed, 27 Feb 2019 11:50:58 -0500
Subject: [PATCH] fix social wall - refs BT#15171

---
 app/Resources/public/css/base.css           |  4 +-
 index.php                                   |  2 -
 main/inc/lib/pear/HTML/QuickForm/button.php | 53 ++++++++++++---------
 main/inc/lib/pear/HTML/QuickForm/file.php   |  6 ---
 main/inc/lib/social.lib.php                 | 15 ++++--
 5 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 2947f0b320..1be730e0ea 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -2847,7 +2847,7 @@ form .formw .freeze {
 }
 .js .input-file-trigger {
     display: inline-block;
-    padding: 5px 15px;
+    padding: 6px 15px;
     background: #f5f6f7;
     color: #7a7a7a;
     font-size: 12px;
@@ -2862,7 +2862,7 @@ form .formw .freeze {
     top: 0; left: 0;
     opacity: 0;
     padding: 5px 0;
-
+    width: 100%;
 }
 .js .input-file:hover + .input-file-trigger,
 .js .input-file:focus + .input-file-trigger,
diff --git a/index.php b/index.php
index c7708887c1..3ec41266e4 100755
--- a/index.php
+++ b/index.php
@@ -195,7 +195,5 @@ if (isset($_GET['firstpage'])) {
     api_delete_firstpage_parameter();
 }
 
-var_dump(api_get_user_info());
-
 $controller->setGradeBookDependencyBar(api_get_user_id());
 $controller->tpl->display_two_col_template();
diff --git a/main/inc/lib/pear/HTML/QuickForm/button.php b/main/inc/lib/pear/HTML/QuickForm/button.php
index 9c496d47ca..b6491eb857 100755
--- a/main/inc/lib/pear/HTML/QuickForm/button.php
+++ b/main/inc/lib/pear/HTML/QuickForm/button.php
@@ -211,6 +211,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
     public function getTemplate($layout)
     {
         $size = $this->getColumnsSize();
+        $attributes = $this->getAttributes();
 
         if (empty($size)) {
             $size = array(2, 8, 2);
@@ -234,30 +235,38 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
                 ';
                 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].'">
+                if (isset($attributes['custom']) && $attributes['custom'] == true) {
+                    $template = '
                         {icon}
                         {element}
-
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
+                    ';
+                } else {
+                    $template = '
+                        <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 help-block">{error}</span>
+                                <!-- END error -->
+                            </div>
+                            <div class="col-sm-'.$size[2].'">
+                                <!-- BEGIN label_3 -->
+                                    {label_3}
+                                <!-- END label_3 -->
+                            </div>
+                        </div>';
+                }
+                return $template;
                 break;
             case FormValidator::LAYOUT_BOX:
             case FormValidator::LAYOUT_BOX_NO_LABEL:
diff --git a/main/inc/lib/pear/HTML/QuickForm/file.php b/main/inc/lib/pear/HTML/QuickForm/file.php
index 92a9d8a1c6..b710c4c3c8 100755
--- a/main/inc/lib/pear/HTML/QuickForm/file.php
+++ b/main/inc/lib/pear/HTML/QuickForm/file.php
@@ -401,9 +401,6 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
             case FormValidator::LAYOUT_HORIZONTAL:
                 if (isset($attributes['custom']) && $attributes['custom'] == true) {
                     $template = '
-                        <div class="form-group">
-                            <div class="col-sm-1"></div>
-                            <div class="col-sm-10">
                                 <div class="input-file-container">  
                                     {element}
                                     <label tabindex="0" {label-for} class="input-file-trigger">
@@ -411,9 +408,6 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
                                     </label>
                                 </div>
                                 <p class="file-return"></p>
-                            </div>
-                            <div class="col-sm-1"></div>
-                        </div>
                         
                         <script type="text/javascript">
                             document.querySelector("html").classList.add(\'js\');
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 7bd2c8e203..a25662ef88 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -2398,15 +2398,24 @@ class SocialManager extends UserManager
                 'aria-label' => $socialWallPlaceholder,
             ]
         );
-
+        $form->addHtml('<div class="form-group">');
+        $form->addHtml('<div class="col-sm-4 col-md-offset-1">');
         $form->addFile('picture', get_lang('UploadFile'),['custom'=> true]);
-        $form->addHidden('url_content', '');
+        $form->addHtml('</div>');
+        $form->addHtml('<div class="col-sm-6">');
         $form->addButtonSend(
             get_lang('Post'),
             'wall_post_button',
             false,
-            ['cols-size' => [1, 10, 1]]
+            [
+                'cols-size' => [1, 10, 1],
+                'custom' => true
+            ]
         );
+        $form->addHtml('</div>');
+        $form->addHtml('</div>');
+
+        $form->addHidden('url_content', '');
         $html = Display::panel($form->returnForm(), get_lang('SocialWall'));
 
         return $html;