Merge remote-tracking branch 'origin/simplatform' into databank

src/main/webapp/WEB-INF/jsp/clinic/state.jsp

@@ -334,6 +334,7 @@ $(document).ready(function() {
         $(this).attr('id','pauseButton');
         $(this).find('i').removeClass('fa-play').addClass('fa-pause');
         $('#reloadIntervalSelect').prop('disabled',true);
+        $('#viewEntry').prop('disabled',true);
 
         // setPlayOnOff("on");
       }
@@ -343,6 +344,7 @@ $(document).ready(function() {
       $(this).attr('id','playButton');
       $(this).find('i').removeClass('fa-pause').addClass('fa-play');
       $('#reloadIntervalSelect').prop('disabled',false);
+      $('#viewEntry').prop('disabled',false);
 
       // setPlayOnOff("off");
     }

src/main/webapp/resources/css/common/classic.css

@@ -5,6 +5,9 @@
 body {
   overflow: auto;
 }
+label.error {
+  color: #ff0000 !important;
+}
 .preloader {
   position: fixed;
   z-index: 10000;
@@ -915,7 +918,6 @@ table.symptomDataTable tbody th {
   .sidebar + .main .footer {
     position: fixed;
     width: calc(100% - 256px);
-    bottom: 0;
     transition: width 0.35s ease-in-out;
     -webkit-transition: width 0.35s ease-in-out;
     -moz-transition: width 0.35s ease-in-out;
@@ -926,12 +928,14 @@ table.symptomDataTable tbody th {
   .sidebar.toggled + .main .footer {
     position: fixed;
     width: 100%;
+  }
+  .sidebar + .main .footer,
+  .sidebar.toggled + .main .footer {
     bottom: 0;
   }
   .sidebar + .main .navbar,
   .sidebar.toggled + .main .navbar {
     top: 0;
-    bottom: unset;
   }
   .tab-nav {
     padding: 0;