Israat Zarin 1 year ago
parent
commit
975c0bc070

BIN
public/uploads/proposal/1679901730documentfile_.pdf


+ 7 - 5
resources/views/admin/admin_profile.blade.php

@@ -788,11 +788,13 @@ tbody, td, tfoot, th, thead, tr {
                                                         <button class="btn btn2 add_department" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                     </div>
                                                 </div>
-                                                <div class="left mb-2">
                                                     <div class="single_glance_row mt-5" style="border-bottom: 1px solid #e8eef1;">
-                                                        <div>
+                                                        <div style="display: flex">
+                                                        <div class="left" style="width: 80%;">
                                                             <span class="title" style="font-size:11px;">Math</span>
-                                                            <span class="title" style="font-size:11px; font-weight: 600; margin-left: 11.9rem;">
+                                                        </div>
+                                                        <div class="right" style="width: 20%;">
+                                                            <span class="title" style="font-size:11px; font-weight: 600;">
                                                                 <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
                                                                     <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
                                                                 </a>
@@ -800,6 +802,7 @@ tbody, td, tfoot, th, thead, tr {
                                                             <span class="title" style="font-size:11px; font-weight: 600;">
                                                                 <button type="button" class="btn btn2" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-trash"></i></button>
                                                             </span>
+                                                        </div>
                                                         </div>
                                                                 <!-- Tab -->
                                                         <div class="col-md-12">
@@ -824,8 +827,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                 </div>
                                                             </div> 
                                                         </div> 
-                                                    </div>   
-                                                </div>                                 
+                                                    </div>                              
                                             </div>
                                         </div>
                                     </div>

+ 19 - 16
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -5,23 +5,25 @@
     {{ csrf_field() }}
     <div class="container">
         <div class="col-md-12">
-            <p class="mb-3" style="font-size: 16px; font-weight: bold;">This proposal will be sent to the following supervisor</p>
-            <div class="alert p-3" style="background-color:white;">
-                <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
-                <input type="hidden" name="student_id" value="{{$student->id}}">
-                <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
-                <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br> 
-                @if(isset($teacher->department_name))
-                    <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
-                @else
-                    <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
-                @endif
-                <span>.</span>
-                <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+            <div class="middle p-3" style="background-color:white; border-radius:6px;">
+                <p style="font-size: 16px; font-weight: bold; margin: 0px;">This proposal will be sent to the following supervisor</p>
+                <div class="alert" style="padding: 0px; margin: 0px">
+                    <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
+                    <input type="hidden" name="student_id" value="{{$student->id}}">
+                    <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                    <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br> 
+                    @if(isset($teacher->department_name))
+                        <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
+                    @else
+                        <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
+                    @endif
+                    <span>.</span>
+                    <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+                </div>
             </div>
         </div>
 
-        <div class="middle p-3" style="background-color:white; border-radius:6px;">
+        <div class="middle p-3 mt-3" style="background-color:white; border-radius:6px;">
             <p style="font-size: 16px; font-weight: bold; margin-bottom: 0px !important;">Please select which proposal you want to send</p>
             <div class="alert mb-3 propose" style="padding: 0px; margin-bottom: 0px">
                 <div style="width:100%;">
@@ -29,8 +31,9 @@
                     <div class="p-2" style="border-bottom: 2px solid #eee;">
                         <div class="custom-control custom-radio custom-control-inline">
                             <div class="form-check mb-0">
-                                <input class="form-check-input" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
-                                <label class="form-check-label" for="flexRadioDefault1" style="font-weight: 400 !important; font-size: 13px;">({{ $row->proposal_ref}})-{{$row->title}}</label>
+                                <input class="form-check-input mt-2" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
+                                <label class="form-check-label" for="flexRadioDefault1" style="font-weight: 400 !important; font-size: 13px;">{{$row->title}}</label></br>
+                                <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd); font-weight: 400 !important; font-size: 10px;">Ref. ({{ $row->proposal_ref}})</span>
                             </div>
                         </div>
                     </div>

+ 33 - 23
resources/views/teacher_profile.blade.php

@@ -863,12 +863,18 @@ tbody, td, tfoot, th, thead, tr {
                                     <div class="col-md-4 bg-white rounded p-2 ms-2" style="width: 32.4%;">
                                         <div class="row">
                                             <div class="col-md-12 mt-2">
-                                                    <span class="title p-2" style="margin-bottom: 0px !important; font-weight:bold !important;">Profile</span>
-                                                        <span class="title" style="font-size:11px; font-weight: 600;">
-                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px; margin-left:18rem;"><i class="fa fa-pencil"></i></button>
-                                                            </a>
-                                                        </span>
+                                                    <div style="display: flex;">
+                                                        <div class="left" style="width: 90%;">
+                                                            <span class="title p-2" style="margin-bottom: 0px !important; font-weight:bold !important;">Profile</span>
+                                                        </div>
+                                                        <div class="right" style="width: 10%;">
+                                                            <span class="title" style="font-size:11px; font-weight: 600;">
+                                                                <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
+                                                                    <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
+                                                                </a>
+                                                            </span>
+                                                        </div>
+                                                    </div>
                                                     <div class="single_glance_row mt-5" style="border-bottom: 1px solid #e8eef1;">
                                                         <div class="col-md-12">
                                                             <div id="demo16" class="collapse mt-2">
@@ -971,7 +977,7 @@ tbody, td, tfoot, th, thead, tr {
                                     <div class="col-md-2 bg-white rounded p-2 ms-4" style="width:25%;">
                                         <div class="row">
                                             <div class="col-md-12">
-                                                    <h6 style="padding: 13px 10px 0px; margin-bottom: 0px;">Research Interest</h6>
+                                                <h6 style="padding: 13px 10px 0px; margin-bottom: 0px;">Research Interest</h6>
                                                 <div class="col-md-12 mt-2">
                                                     <div class="mb-2">
                                                         <div class="form-icon position-relative p-2" style="display: flex;">
@@ -979,17 +985,20 @@ tbody, td, tfoot, th, thead, tr {
                                                             <button class="btn btn2" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                         </div>
                                                     </div>
-                                                    <div class="left mb-2">
-                                                        <div class="single_glance_row mt-4">
-                                                        <div>
-                                                            <span class="title" style="font-size:11px;">Business 1</span>
-                                                            <span class="title" style="font-size:11px; margin-left: 11.4rem;">
-                                                                <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                    <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
-                                                                </a>
-                                                            </span>
+                                                    <div class="single_glance_row mt-4">
+                                                        <div style="display: flex;">
+                                                            <div class="left" style="width: 90%;">
+                                                                <span class="title" style="font-size:11px;">Business 1</span>
+                                                            </div>
+                                                            <div class="right" style="width: 10%;">
+                                                                <span class="title" style="font-size:11px;">
+                                                                    <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
+                                                                        <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
+                                                                    </a>
+                                                                </span>
+                                                            </div>
                                                         </div>
-                                                            <div class="col-md-12">
+                                                        <div class="col-md-12">
                                                             <div id="demo17" class="collapse mt-2">
                                                                 <div class="panel-body" style="padding:10px; background-color: #4b4c6824; border: 1px solid #e9e5e5; border-radius: 5px;">
                                                                     <form method="POST" action="">
@@ -1006,18 +1015,19 @@ tbody, td, tfoot, th, thead, tr {
                                                                                 <div class="text-end">
                                                                                     <button class="btn btn2">Update</button>                                                                                                                
                                                                                 </div>
-                                                                            </div> 
+                                                                            </div>
+                                                                        </div> 
                                                                     </form>
                                                                 </div>
                                                             </div> 
                                                         </div> 
-                                                        </div>                                    
-                                                    </div> 
-                                                </div>
+                                                    </div>                                    
+                                                </div> 
                                             </div>
                                         </div>
-                                    </div><!--end col-->
-                                </div>
+                                    </div>
+                                </div><!--end col-->
+                            </div>
                         </div>
                     </div><!--end teb pane-->
                 </div><!--end tab content-->