浏览代码

UI polish

Vijayakrishnan 3 年之前
父节点
当前提交
3c2ad6e732

+ 1 - 3
resources/views/app/patient/note/dashboard.blade.php

@@ -404,12 +404,10 @@
                 </div>
             </div>
 
-            @if($note->is_signed_by_hcp)
             <div class="px-2 border-left screen-only">
                 <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i> Print</a>
             </div>
-            @endif
-
+            
             @if($pro->pro_type === 'ADMIN' || $pro->is_enrolled_as_mcp)
             <div class="px-2 border-left screen-only">
                 <a native target="_blank"

+ 1 - 0
resources/views/app/patient/note/dashboard_script.blade.php

@@ -280,6 +280,7 @@
                             if(newEffectiveTop < prevEffectiveTop) {
                                 docRoot.scrollTop(docRoot.scrollTop() - (prevEffectiveTop - newEffectiveTop));
                             }
+                            editParent.find('.ql-editor').first().focus();
                             editParent.trigger('edit-mode-activated');
                         }
 

+ 1 - 1
resources/views/app/patient/note/note-segment-list-slim.blade.php

@@ -16,7 +16,7 @@
 
 	    ?>
         <div class="note-content-node note-content-heading">
-            <div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary {{ $previousHeading ? 'mt-4 border-top' : '' }}">
+            <div class="py-2 px-2 border-bottom font-size-16 font-weight-bold bg-light text-dark {{ $previousHeading ? 'mt-4 border-top' : '' }}">
                 {{ $segment->heading }}
             </div>
             <div class="note-content-children ml-5 border-left">

+ 3 - 3
resources/views/app/patient/note/segment-slim.blade.php

@@ -10,15 +10,15 @@ $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) ==
      data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
      data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
 
-    <div class="d-flex align-items-start bg-light text-secondary p-1">
+    <div class="d-flex align-items-start bg-light text-secondary {{$segment->heading ? 'p-1' : 'py-1 pr-1'}}">
 
     <!-- title -->
 
             <?php
-            $minWidthClass = $segment->heading ? 'min-width-110px' : 'min-width-140px';
+            $extraClass = $segment->heading ? 'min-width-110px' : 'min-width-140px pl-2';
             ?>
 
-            <div style="color: black; text-decoration: underline; font-size: 13px;" class="font-weight-bold mr-2 {{$minWidthClass}}">
+            <div class="text-dark font-weight-bold font-size-13 mr-2 {{$extraClass}}">
                 {{$segment->display_title}}:
             </div>
 

+ 2 - 2
resources/views/app/patient/segment-templates/omega_informed_consent/edit.blade.php

@@ -13,8 +13,8 @@ if (!!@$point->data) {
     $contentData = json_decode($point->data, true);
 }
 ?>
-<div visit-moe close-on-save close-on-cancel class="d-block px-3 py-2">
-    <form show url="/api/visitPoint/<?= $endPoint ?>" class="mcp-theme-1 mt-2">
+<div visit-moe close-on-save close-on-cancel class="d-block pb-2">
+    <form show url="/api/visitPoint/<?= $endPoint ?>" class="mcp-theme-1">
         <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
         <input type="hidden" name="category" value="<?= $category ?>">
         <input type="hidden" name="data" value="{{json_encode($contentData)}}">

+ 1 - 1
resources/views/app/patient/segment-templates/omega_vitals/edit.blade.php

@@ -90,7 +90,7 @@ $copyTriggerAdded = [];
         <table class="table table-sm table-bordered mb-2 table-edit-sheet">
             <thead>
             <tr class="bg-light">
-                <th class="px-2 text-secondary border-bottom-0 w-25">Vital</th>
+                <th class="px-2 text-secondary border-bottom-0 width-150px">Vital</th>
                 <th class="px-2 text-secondary border-bottom-0 w-25">{{friendly_date($contentData['date'])}}</th>
                 @if(!$previousData || !count($previousData))
                     <th class="px-2 text-secondary border-bottom-0">Previous</th>