From 9319addead762a301e603cbe1e1c2f05be6c49c8 Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Fri, 22 Apr 2016 15:39:05 +0200
Subject: [PATCH] Fix UI

---
 plugin/ticket/src/myticket.php                      |  2 --
 plugin/ticket/src/ticket.class.php                  |  7 ++++---
 plugin/ticket/src/ticket_details.php                |  5 +----
 src/Chamilo/ContactBundle/Form/Type/ContactType.php | 10 +++++++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugin/ticket/src/myticket.php b/plugin/ticket/src/myticket.php
index 0d1a883a39..512246e3a6 100755
--- a/plugin/ticket/src/myticket.php
+++ b/plugin/ticket/src/myticket.php
@@ -403,7 +403,6 @@ if ($isAdmin) {
     }
 }
 
-
 if ($isAdmin) {
     $table->set_header(0, $plugin->get_lang('TicketNum'), true);
     $table->set_header(1, $plugin->get_lang('Date'), true);
@@ -414,7 +413,6 @@ if ($isAdmin) {
     $table->set_header(6, $plugin->get_lang('Status'), true);
     $table->set_header(7, $plugin->get_lang('Message'), true);
     $table->set_header(8, get_lang('Actions'), true);
-    $table->set_header(9, get_lang('Description'), true, array("style" => "width:200px"));
 } else {
     echo '<center><h1>' . $plugin->get_lang('MyTickets') . '</h1></center>';
     echo '<center><p>' . $plugin->get_lang('MsgWelcome') . '</p></center>';
diff --git a/plugin/ticket/src/ticket.class.php b/plugin/ticket/src/ticket.class.php
index dea5efd152..2ee3ba2a50 100755
--- a/plugin/ticket/src/ticket.class.php
+++ b/plugin/ticket/src/ticket.class.php
@@ -829,6 +829,7 @@ class TicketManager
                 status.name AS col7,
                 ticket.total_messages AS col8,
                 msg.message AS col9,
+                msg.subject AS subject,
                 ticket.request_user AS user_id,
                 ticket.assigned_last_user AS responsible
             FROM $table_support_tickets ticket,
@@ -1052,7 +1053,7 @@ class TicketManager
                 }
 
                 $ticket = array(
-                    $row['col0'],
+                    $row['col0'].' '.$row['subject'],
                     api_format_date($row['col1'], '%d/%m/%y - %I:%M:%S %p'),
                     api_format_date($row['col2'], '%d/%m/%y - %I:%M:%S %p'),
                     $row['col3'],
@@ -1061,7 +1062,7 @@ class TicketManager
                     $row['col7'],
                     $row['col8'],
                     $actions,
-                    $row['col9']
+                    //$row['col9']
                 );
             } else {
                 $actions = "";
@@ -1069,7 +1070,7 @@ class TicketManager
                                 'synthese_view.gif', get_lang('Info')
                         ) . '</a>&nbsp;&nbsp;';
                 $row['col0'] = Display::return_icon(
-                                $img_source, get_lang('Info')
+                        $img_source, get_lang('Info')
                         ) . '<a href="ticket_details.php?ticket_id=' . $row['col0'] . '">' . $row['ticket_code'] . '</a>';
                 $now = api_strtotime(api_get_utc_datetime());
                 $last_edit_date = api_strtotime($row['sys_lastedit_datetime']);
diff --git a/plugin/ticket/src/ticket_details.php b/plugin/ticket/src/ticket_details.php
index 5177b29ada..33cd29329b 100755
--- a/plugin/ticket/src/ticket_details.php
+++ b/plugin/ticket/src/ticket_details.php
@@ -330,7 +330,7 @@ if (!isset($_POST['compose'])) {
 
     $admins = UserManager::get_user_list_like(array("status" => "1"), array("username"), true);
     foreach ($admins as $admin) {
-        $select_admins.= "<option value = '" . $admin['user_id'] . "' " . (($user_id == $admin['user_id']) ? ("selected='selected'") : "") . ">" . $admin['lastname'] . " ," . $admin['firstname'] . "</option>";
+        $select_admins.= "<option value = '" . $admin['user_id'] . "' " . (($user_id == $admin['user_id']) ? ("selected='selected'") : "") . ">" . $admin['lastname'] . ", " . $admin['firstname'] . "</option>";
     }
     $select_admins .= "</select>";
     echo '<div id="dialog-form" title="' . $plugin->get_lang('AssignTicket') . '" >';
@@ -457,10 +457,8 @@ function show_form_send_message()
         );
     }
 
-
     $form->addElement('file', 'attach_1', get_lang('FilesAttachment'));
     $form->addLabel('', '<span id="filepaths"><div id="filepath_1"></div></span>');
-
     $form->addLabel('',
         '<span id="link-more-attach">
          <span class="btn btn-success" onclick="return add_image_form()">' . get_lang('AddOneMoreFile') . '</span>
@@ -468,7 +466,6 @@ function show_form_send_message()
          ('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')
     ');
 
-
     $form->addElement('html', '<br/>');
     $form->addElement(
         'button',
diff --git a/src/Chamilo/ContactBundle/Form/Type/ContactType.php b/src/Chamilo/ContactBundle/Form/Type/ContactType.php
index 63972b1754..fe63101f4d 100644
--- a/src/Chamilo/ContactBundle/Form/Type/ContactType.php
+++ b/src/Chamilo/ContactBundle/Form/Type/ContactType.php
@@ -26,13 +26,17 @@ class ContactType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('category', EntityType::class, ['class' => 'Chamilo\ContactBundle\Entity\Category'])
-             ->add('firstname')
+            ->add(
+                'category',
+                EntityType::class,
+                ['class' => 'Chamilo\ContactBundle\Entity\Category']
+            )
+            ->add('firstname')
             ->add('lastname')
             ->add('email')
             ->add('subject')
             ->add('message', 'textarea')
-            ->add('save', SubmitType::class, ['attr' => ['class' => 'btn btn-primary']])
+            ->add('send', SubmitType::class, ['attr' => ['class' => 'btn btn-primary']])
         ;
     }