Răsfoiți Sursa

Shorten "current work xxx" and move to the left of topnav refresh icon

Vijayakrishnan 4 ani în urmă
părinte
comite
4d006ed67d

+ 5 - 2
public/css/style.css

@@ -819,15 +819,18 @@ body .node input[type="number"] {
     background: aliceblue;
 }
 .current-work-indicator {
+    /*
     position: fixed;
     top: 55px;
     right: 0;
     z-index: 9999;
-    background: #1c45879c;
+    */
+    background: #305ba0;
     color: #fff;
     font-size: 12px;
     padding: 3px 8px;
-    border-bottom-left-radius: 5px;
+    border-radius: 3px;
+/*    border-bottom-left-radius: 5px;*/
 }
 
 /* stag popups */

+ 3 - 5
resources/views/app/current-work.blade.php

@@ -1,11 +1,9 @@
 <?php $currentWork = $pro->currentWork(); ?>
 @if($currentWork)
-    <div class="current-work-indicator">
-        <i class="fa fa-clock mr-1"></i>
-        Current work:
-        <a class="text-white font-weight-bold" href="/patients/view/{{ $currentWork->client->uid }}">
+    <div class="current-work-indicator" title="Started: {{ friendly_time($currentWork->start_time) }}">
+        <i class="fa fa-folder-open mr-1"></i>
+        <a class="text-white font-weight-bold text-sm" href="/patients/view/{{ $currentWork->client->uid }}">
             {{ $currentWork->client->displayName() }}
         </a>
-        <span class="pl-3">Started: <b>{{ friendly_time($currentWork->start_time) }}</b></span>
     </div>
 @endif

+ 4 - 5
resources/views/layouts/template.blade.php

@@ -80,6 +80,10 @@
                     </div>
                 </li>
             </ul>
+            {{-- if pro is working on a client and is not in tht client --}}
+            <div class="current-work mr-2">
+                @include('app/current-work')
+            </div>
             <a href="#" class="mr-2 text-white small" onclick="fastReload()"><i class="fa fa-sync"></i></a>
             <div class="d-inline-flex pr-2 mcp-theme-1 position-relative">
                 <input id="patient-search" type="search" class="form-control form-control-sm outline-0" autocomplete="off" placeholder="Search Patients">
@@ -132,11 +136,6 @@
 
     </main><!-- /.container -->
 
-    {{-- if pro is working on a client and is not in tht client --}}
-    <div class="current-work">
-        @include('app/current-work')
-    </div>
-
     <!-- shortcut/suggest component -->
     <link href="/css/shortcut.css" rel=stylesheet>
     <script src="/js/shortcut.js" type="application/javascript"></script>