Browse Source

updated lhr

Peter Muturi 1 year ago
parent
commit
62d2b09351

+ 1 - 2
public/css/lh.css

@@ -130,7 +130,7 @@
   border: 1px solid rgba(0, 0, 0, 0.08);
   box-sizing: border-box;
   border-radius: 4px;
-  padding: 25px 10px;
+  padding: 10px 10px;
 }
 
 
@@ -241,4 +241,3 @@
 input.form-control {
 	background-color: lightyellow !important;
 }
-

+ 2 - 2
public/css/style.css

@@ -2010,11 +2010,11 @@ footer a:hover {
 .calendar-nav a:last-child {
   right: 0;
 }*/
-/* @media screen and (min-width:1200px) {
+@media screen and (min-width:1200px) {
   .container {
     max-width: 1200px !important;
   }
-} */
+}
 @media screen and (max-width:1099px) {
   .navbar-nav.me-auto {
     margin-left: auto !important;

+ 15 - 15
public/moe-video/moe-video.js

@@ -44,9 +44,9 @@
 
                     // record button
                     $('<button type="button" />')
-                        .addClass('btn btn-sm btn-outline-info px-4 py-2 text-nowrap mr-3 mb-2')
+                        .addClass('btn btn-sm btn-outline-info px-4 py-2 text-nowrap me-3 mb-2')
                         .attr('moe-show-popup', 1)
-                        .html('<i class="fa fa-video mr-2"></i>Record Answer')
+                        .html('<i class="fa fa-video me-2"></i>Record Answer')
                         .appendTo(buttonsDiv);
 
                     // upload button
@@ -59,7 +59,7 @@
                         .append(
                             $('<button type="button" />')
                                 .addClass('btn btn-sm btn-outline-default border border-dark px-4 py-2 text-nowrap file')
-                                .html('<i class="fa fa-upload mr-2"></i>' +
+                                .html('<i class="fa fa-upload me-2"></i>' +
                                     'Upload Video' +
                                     '<input type="file" class="input-file" name="hcp_intro" accept="video/*;capture=camcorder">')
                         )
@@ -180,23 +180,23 @@
                 '</div>' +
                 '<div class="card-footer">' +
                     '<div class="d-flex align-items-center justify-content-center">' +
-                        '<button type="button" class="btn btn-danger btn-sm mr-3" moe-start-recording>' +
-                            '<i class="fa fa-video mr-2"></i>Record' +
+                        '<button type="button" class="btn btn-danger btn-sm me-3" moe-start-recording>' +
+                            '<i class="fa fa-video me-2"></i>Record' +
                         '</button>' +
-                        '<button type="button" class="btn btn-danger btn-sm mr-3" moe-stop-recording>' +
-                            '<i class="fa fa-stop mr-2"></i>Stop' +
+                        '<button type="button" class="btn btn-danger btn-sm me-3" moe-stop-recording>' +
+                            '<i class="fa fa-stop me-2"></i>Stop' +
                         '</button>' +
-                        '<button type="button" class="btn btn-info btn-sm mr-3" moe-play-recording>' +
-                            '<i class="fa fa-play mr-2"></i>Play' +
+                        '<button type="button" class="btn btn-info btn-sm me-3" moe-play-recording>' +
+                            '<i class="fa fa-play me-2"></i>Play' +
                         '</button>' +
-                        '<button type="button" class="btn btn-info btn-sm mr-3" moe-restart-recording>' +
-                            '<i class="fa fa-play mr-2"></i>Play' +
+                        '<button type="button" class="btn btn-info btn-sm me-3" moe-restart-recording>' +
+                            '<i class="fa fa-play me-2"></i>Play' +
                         '</button>' +
-                        '<button type="button" class="btn btn-success btn-sm mr-3" moe-submit-recording>' +
-                            '<i class="fa fa-check mr-2"></i>Submit' +
+                        '<button type="button" class="btn btn-success btn-sm me-3" moe-submit-recording>' +
+                            '<i class="fa fa-check me-2"></i>Submit' +
                         '</button>' +
-                        '<button type="button" class="btn btn-default bg-light border border-default btn-sm mr-3" moe-close-popup>' +
-                            '<i class="fa fa-times mr-2"></i>Close' +
+                        '<button type="button" class="btn btn-default bg-light border border-default btn-sm me-3" moe-close-popup>' +
+                            '<i class="fa fa-times me-2"></i>Close' +
                         '</button>' +
                         '<span moe-wait>Please wait...</span>' +
                     '</div>' +

+ 24 - 15
resources/views/layouts/app.blade.php

@@ -9,13 +9,26 @@
     <meta name="description"
           content="The Leadership Health program was developed in collaboration with the University of Maryland School of Public Health through a Maryland Industrial Partnerships (MIPS) project.">
     <link rel="icon" href={{asset('img/icon.svg')}}>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-          integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;900&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css">
-    <link href={{asset('css/style.css')}} rel=stylesheet>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Libre+Baskerville&family=Roboto&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@splidejs/splide@latest/dist/css/splide.min.css">
+    <link href="/css/layout.css" rel=stylesheet>
+    <link href="/EuclidCircularA-Light/style.css" rel=stylesheet>
+    <link href="/css/lh.css" rel=stylesheet>
+    <link rel="stylesheet" href="{{ asset('/css/toastr.min.css') }}">
+    <link href="{{asset('css/style.css')}}?_=2" rel=stylesheet>
+    <link href="{{asset('css/pristine.css')}}?_=1" rel=stylesheet>
     <script src="https://cdn.jsdelivr.net/npm/vue@2.6.0"></script>
-    <script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
+    <script src="/js/jquery-3.5.1.min.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script src="{{ asset('js/toastr.min.js') }}" type="application/javascript"></script>
+    <link href="/select2/select2.min.css" rel=stylesheet>
+    <script src="/select2/select2.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@splidejs/splide@latest/dist/js/splide.min.js"></script>
     <script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
 
     <link rel="stylesheet" href="/moe-video/moe-video.css"/>
@@ -57,8 +70,8 @@
         <div>
             <a href="{{route('logout')}}" class="btn btn-sm btn-outline-info px-4 py-1"><i
                     class="fas fa-sign-out-alt"></i> Logout</a>
-            <button class="navbar-toggler btn btn-outline-light hidden" type="button" data-toggle="collapse"
-                    data-target="#navbarNavDropdown"
+            <button class="navbar-toggler btn btn-outline-light hidden" type="button" data-bs-toggle="collapse"
+                    data-bs-target="#navbarNavDropdown"
                     aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
                 <i class="fas fa-bars"></i>
             </button>
@@ -91,19 +104,15 @@
     </div>
 </footer>
 </body>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-        integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-        crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
-        integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
-        crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/dist/umd/popper.min.js" integrity="sha384-zYPOMqeu1DAVkHiLqWBUTcbYfZ8osu1Nd6Z89ify25QV9guujx43ITvfi12/QExE" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.min.js" integrity="sha384-Y4oOpwW3duJdCWv5ly8SCFYWqFDsfob/3GkgExXKV4idmbt98QcxXYs9UoXAB7BZ" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.16/jquery.mask.min.js"></script>
 
 <script src="/moe-video/moe-video.js"></script>
 
 <script type="text/javascript">
     $(document).ready(function () {
-        // $('.phone').mask('(000) 000-0000');
+        $('.phone').mask('(000) 000-0000');
         // $('.zip').mask('00000');
     });
 </script>

+ 22 - 51
resources/views/layouts/login.blade.php

@@ -25,8 +25,7 @@
     <meta name="keywords"
           content="Scholar, Health, Leadership, covid-19, Coronavirus, Deaf, Hard of Hearing, Maryland, MIPS, Industrial, Partnership">
     <link rel="icon" type="image/png" href="{{asset('img/icon.svg')}}">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-          integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css">
     <link href="{{ asset('/css/strengthify.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/layout.css') }}" rel=stylesheet>
@@ -65,50 +64,16 @@
 </div>
 <div id="moe-form-mask" style="background: rgba(0, 0, 0, .1) no-repeat scroll center center; position: fixed; top: 0px; left: 0px; z-index: 97; width: 100%; height: 100%; display: none;">
 </div>
-<<<<<<< HEAD
-<nav class="navbar navbar-expand-lg py-1">
-    <div class="container main-nav position-relative">
-        <a href="https://leadershiphealth.org"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navBar" aria-controls="navBar"
-                aria-expanded="false" aria-label="Toggle navigation">
-            <i class="fas fa-bars"></i>
-        </button>
-        <div class="collapse navbar-collapse mobile" id="navBar">
-            <ul class="navbar-nav mobile">
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/programs">For Patients</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/health-plans">Health Plans</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/employers">Employers</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/providers">For Providers</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/about">About Us</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="https://leadershiphealth.org/careers">Careers</a>
-                </li>
-            </ul>
-            <ul class="navbar-nav ml-auto">
-                <li class="nav-item web">
-                    <a class="d-flex align-items-center nav-link" href="tel:{{config('app.phone')}}"><img class="mr-1" height="20" src="{{asset('img/phone.svg')}}">{{config('app.phone')}}</a>
-=======
 
 <nav class="navbar navbar-expand-lg top-links">
     <div class="container justify-content-end">
         <div>
             <ul class="navbar-nav align-items-center">
                 <li class="nav-item ps-2">
-                    <a class="d-flex align-items-center" href="{{ config('app.backToLeadershipHealthUrl') }}"><i class="mr-2 fas fa-home"></i> Back to LeadershipHealth.org</a>
->>>>>>> 85dea5764fc069ceb6740c4bd6d8496c9ced810a
+                    <a class="d-flex align-items-center" href="{{ config('app.backToLeadershipHealthUrl') }}"><i class="me-2 fas fa-home"></i> Back to LeadershipHealth.org</a>
                 </li>
                 <li class="nav-item">
-                    <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="mr-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
+                    <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="me-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
                 </li>
             </ul>
         </div>
@@ -116,12 +81,12 @@
 </nav>
 <nav class="navbar navbar-expand-lg shadow-sm" id="mainNav">
   <div class="container position-relative p-0">
-      <a href="{{route('login')}}"><img class="logo" src="{{asset('img/logo.svg')}}"></a>
+      <a href="https://leadershiphealth.org"><img class="logo" src="https://leadershiphealth.org/img/logo.svg"></a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
           <img src="https://leadershiphealth.org/img/menu.svg" alt="">
       </button>
         <div class="collapse navbar-collapse" id="navBar">
-            <ul class="navbar-nav ml-auto">
+            <ul class="navbar-nav ms-auto">
               <li class="nav-item d-lg-none d-inline">
                 <a class="nav-link" href="https://leadershiphealth.org/services">Our Services</a>
               </li>
@@ -133,7 +98,7 @@
                   <div class="d-flex align-items-start">
                     <ul class="nav nav-tabs" id="myTab" role="tablist">
                       <li class="nav-item" role="presentation">
-                        <button class="nav-link" id="one-tab" data-bs-toggle="tab" data-bs-target="#one" type="button" role="tab" aria-controls="one" aria-selected="true">Comprehensive Practice Management <i class="ms-1 fas fa-caret-right"></i></button>
+                        <button class="nav-link active" id="one-tab" data-bs-toggle="tab" data-bs-target="#one" type="button" role="tab" aria-controls="one" aria-selected="true">Comprehensive Practice Management <i class="ms-1 fas fa-caret-right"></i></button>
                       </li>
                       <li class="nav-item" role="presentation">
                         <button class="nav-link" id="two-tab" data-bs-toggle="tab" data-bs-target="#two" type="button" role="tab" aria-controls="two" aria-selected="false" tabindex="-1">Tech-Enabled Healthcare <i class="ms-1 fas fa-caret-right"></i></button>
@@ -142,14 +107,14 @@
                         <button class="nav-link" id="three-tab" data-bs-toggle="tab" data-bs-target="#three" type="button" role="tab" aria-controls="three" aria-selected="false" tabindex="-1">Provider Services <i class="ms-1 fas fa-caret-right"></i></button>
                       </li>
                       <li class="nav-item" role="presentation">
-                        <button class="nav-link active" id="four-tab" data-bs-toggle="tab" data-bs-target="#four" type="button" role="tab" aria-controls="four" aria-selected="false" tabindex="-1">HR &amp; Staff Development <i class="ms-1 fas fa-caret-right"></i></button>
+                        <button class="nav-link" id="four-tab" data-bs-toggle="tab" data-bs-target="#four" type="button" role="tab" aria-controls="four" aria-selected="false" tabindex="-1">HR &amp; Staff Development <i class="ms-1 fas fa-caret-right"></i></button>
                       </li>
                       <li class="nav-item" role="presentation">
                         <button class="nav-link" id="five-tab" data-bs-toggle="tab" data-bs-target="#five" type="button" role="tab" aria-controls="five" aria-selected="false" tabindex="-1">Strategic Business Services <i class="ms-1 fas fa-caret-right"></i></button>
                       </li>
                     </ul>
                     <div class="tab-content" id="specialtiesTab">
-                      <div class="tab-pane fade" id="one" role="tabpanel" aria-labelledby="one-tab" tabindex="0">
+                      <div class="tab-pane fade show active" id="one" role="tabpanel" aria-labelledby="one-tab" tabindex="0">
                         <div class="container">
                           <div class="row">
                             <div class="col-lg-12">
@@ -189,7 +154,7 @@
                           </div>
                         </div>
                       </div>
-                      <div class="tab-pane fade show active" id="four" role="tabpanel" aria-labelledby="four-tab" tabindex="0">
+                      <div class="tab-pane fade" id="four" role="tabpanel" aria-labelledby="four-tab" tabindex="0">
                         <div class="container">
                           <div class="row">
                             <div class="col-lg-12">
@@ -303,6 +268,19 @@
     </div>
 </footer>
 </body>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.7/dist/umd/popper.min.js" integrity="sha384-zYPOMqeu1DAVkHiLqWBUTcbYfZ8osu1Nd6Z89ify25QV9guujx43ITvfi12/QExE" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.min.js" integrity="sha384-Y4oOpwW3duJdCWv5ly8SCFYWqFDsfob/3GkgExXKV4idmbt98QcxXYs9UoXAB7BZ" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.16/jquery.mask.min.js"></script>
+<script type="text/javascript">
+    $('button.nav-link').hover(function(){
+      $('button.nav-link').removeClass('active');
+      $(this).addClass('active');
+      $('.tab-pane.fade').removeClass('show active');
+
+      var target = $(this).attr('aria-controls');
+      $('#'+target).addClass('show active');
+    })
+</script>
 <script>
     $(document).ready(function() {
         $('.phone').mask('(000) 000-0000');
@@ -311,11 +289,4 @@
         // })
     });
 </script>
-<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-        integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-        crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
-        integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
-        crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.16/jquery.mask.min.js"></script>
 </html>

+ 3 - 3
resources/views/layouts/login_with_content.blade.php

@@ -49,7 +49,7 @@
             <div>
                 <ul class="navbar-nav align-items-center">
                     <li class="nav-item">
-                        <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="mr-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
+                        <a class="d-flex align-items-center" href="tel:{{config('app.phone')}}"><i class="me-2 fas fa-mobile-alt"></i> {{config('app.phone')}}</a>
                     </li>
                 </ul>
             </div>
@@ -62,10 +62,10 @@
                 <img src="https://leadershiphealth.org/img/menu.svg" alt="">
             </button>
             <div class="collapse navbar-collapse" id="navBar">
-                <ul class="navbar-nav ml-auto">
+                <ul class="navbar-nav ms-auto">
                     <li class="nav-item">
                         <a class="nav-link" href="{{ config('app.backToLeadershipHealthUrl') }}">
-                            <img class="mr-1" height="20" src="{{asset('img/chart.svg')}}">Back to LeadershipHealth.org
+                            <img class="me-1" height="20" src="{{asset('img/chart.svg')}}">Back to LeadershipHealth.org
                         </a>
                     </li>
                 </ul>