From b6fdad88c4d2b230a0cdb9a45ea6fb5da07cda29 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 16 Jul 2022 21:11:11 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php        |  1 -
 www/application/views/jobs/view_thisjob.php | 32 ++++++++++++++-------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index 0adbe09a..4ec05d60 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -379,7 +379,6 @@ class Proj extends Users_Controller {
 
                     $out = array();
                     $res = $this->backend_model->wrenchboard_api($msgArray, $out);
-                    // print_r( $out );            
                 }
             } else if ($_POST && isset($_POST['uploadForm']) && isset($_FILES["fileToUpload"])) {
                 $message = $this->process_files($_FILES["fileToUpload"]);
diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php
index eed6f14b..ae45ae83 100644
--- a/www/application/views/jobs/view_thisjob.php
+++ b/www/application/views/jobs/view_thisjob.php
@@ -86,10 +86,20 @@
                         <textarea cols="18" style="height:180px;" rows="3" id='jobmessage' name='jobmessage' class="textarea wysihtml5 wysihtml5-min form-control" placeholder="Enter message here ..."></textarea>
                     </div>
 
-                    <div class="text-right">
-                        <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-xs" onclick="document.message.ajax.value = '0';">Cancel</button>
-                        <button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-xs" onclick="SendMessage();return false;">Send Message</button>
+                    <div class="form-group">
+                        <table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
+                                
+                                <tbody>
+                                    <tr>
+                                        <td style="width: 20%;"><div id="sendmessagenote"></div></td>
+                                        <td style="width: 40%; text-align:right;"> <button id='btn_cancel' name='btn_cancel' type="submit" class="btn btn-danger btn-sm" onclick="document.message.ajax.value = '0';">Cancel</button></td>
+                                        <td style="width: 40%; text-align:right;"><button id='btm_submit' name='btn_submit' type="submit" class="btn btn-primary btn-sm" onclick="SendMessage();return false;">Send Message</button> </td>
+                                    </tr>
+                                </tbody>
+                        </table>
                     </div>
+
+
                 </form>
             </div>
             <div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel">
@@ -116,16 +126,16 @@
                                             <td>
                                                 If you have completed this task and will like the owner to review the work for acceptance, click "Completed" button.
                                             </td>
-                                            <td style="width:120px;">
-                                                <div id="req_completion"> <button type="submit" id="req_completion_submit"  class="btn btn-primary btn-xs" onclick="return requestCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled1; ?> >Completed</button></div>
+                                            <td style="width:140px;">
+                                                <div id="req_completion"> <button type="submit" id="req_completion_submit"  class="btn btn-primary btn-sm" onclick="return requestCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled1; ?> >Completed</button></div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
                                                 If you are unable to complete and will like this project canceled, click "Cancel task" button.
                                             </td>
-                                            <td style="width:120px;">
-                                                <div id="req_cancel">  <button type="submit" id="req_cancel_submit" onclick="return requestCancel('<?php echo $job_contract; ?>');" class="btn btn-danger  btn-xs" <?php echo $disabled2; ?> >Request Cancel</button> </div>
+                                            <td style="width:140px;">
+                                                <div id="req_cancel">  <button type="submit" id="req_cancel_submit" onclick="return requestCancel('<?php echo $job_contract; ?>');" class="btn btn-danger  btn-sm" <?php echo $disabled2; ?> >Request Cancel</button> </div>
                                             </td>
                                         </tr>
                                     </table>   
@@ -147,16 +157,16 @@
                                             <td>
                                                 Accept or reject the completion of the task below. We will notify the other partner and finalize payment for the task.
                                             </td>
-                                            <td style="width:120px;">
-                                                <div id="accept_completion"> <button type="submit" id="accept_completion_submit" class="btn btn-primary btn-xs" onclick="return acceptCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled11; ?> >Accept Completion</button></div>
+                                            <td style="width:140px;">
+                                                <div id="accept_completion"> <button type="submit" id="accept_completion_submit" class="btn btn-primary btn-sm" onclick="return acceptCompletion('<?php echo $job_contract; ?>');" <?php echo $disabled11; ?> >Accept Completion</button></div>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
                                                 If you reject the work done or want more review before accepting, click "Reject Completion."
                                             </td>
-                                            <td style="width:120px;">
-                                                <div id="reject_completion">  <button type="submit" id="reject_completion_submit" class="btn btn-danger btn-xs" <?php echo $disabled22; ?> onclick="return rejectCompletion('<?php echo $job_contract; ?>');" >Reject Completion</button></div>
+                                            <td style="width:140px;">
+                                                <div id="reject_completion">  <button type="submit" id="reject_completion_submit" class="btn btn-danger btn-sm" <?php echo $disabled22; ?> onclick="return rejectCompletion('<?php echo $job_contract; ?>');" >Reject Completion</button></div>
                                             </td>
                                         </tr>
                                     </table>