From 2aa689a14a95dcf5e77b3a4cb07792a685c0de02 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 19 Apr 2018 14:20:02 -0400
Subject: [PATCH] Use a class instead of an id for consoleTable

---
 web/api/app/Plugin/CakePHP-Enum-Behavior      |  2 +-
 web/skins/classic/css/base/views/console.css  | 20 ++--
 .../classic/css/classic/views/console.css     | 92 +-----------------
 web/skins/classic/css/dark/skin.css           | 14 ---
 web/skins/classic/css/dark/views/console.css  | 95 +------------------
 5 files changed, 14 insertions(+), 209 deletions(-)

diff --git a/web/api/app/Plugin/CakePHP-Enum-Behavior b/web/api/app/Plugin/CakePHP-Enum-Behavior
index ea90c0cd7..ca91b87fd 160000
--- a/web/api/app/Plugin/CakePHP-Enum-Behavior
+++ b/web/api/app/Plugin/CakePHP-Enum-Behavior
@@ -1 +1 @@
-Subproject commit ea90c0cd7f6e24333a90885e563b5d30b793db29
+Subproject commit ca91b87fda8e006e4fca2ed870f24f9a29c2905d
diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css
index 21f85424a..4a5470b6b 100644
--- a/web/skins/classic/css/base/views/console.css
+++ b/web/skins/classic/css/base/views/console.css
@@ -51,46 +51,46 @@
     width: 20%;
 }
 
-#consoleTable {
+.consoleTable {
     width: 100%;
 }
 
-#consoleTable tr.highlight {
+.consoleTable tr.highlight {
     background-color: #eeeeee;
 }
 
-#consoleTable thead th {
+.consoleTable thead th {
     padding-bottom: 4px;
     vertical-align: middle;
 }
 
-#consoleTable tfoot td {
+.consoleTable tfoot td {
     padding-top: 4px;
     vertical-align: middle;
 }
 
-#consoleTable th,td {
+.consoleTable th,td {
     text-align: left;
 }
 
-#consoleTable .colMark {
+.consoleTable .colMark {
     width: 52px;
     text-align: center;
 }
 
-#consoleTable .colEvents {
+.consoleTable .colEvents {
     text-align: right;
 }
 
-#consoleTable .colZones {
+.consoleTable .colZones {
     text-align: right;
 }
-#consoleTable .colFunction {
+.consoleTable .colFunction {
     width: 120px;
     text-align: center;
 }
 
-#consoleTable .colLeftButtons {
+.consoleTable .colLeftButtons {
     text-align: left;
 }
 .FunctionFilter select {
diff --git a/web/skins/classic/css/classic/views/console.css b/web/skins/classic/css/classic/views/console.css
index 8f90f9eb4..14d02ad4e 100644
--- a/web/skins/classic/css/classic/views/console.css
+++ b/web/skins/classic/css/classic/views/console.css
@@ -1,96 +1,8 @@
-#systemTime {
-    float: left;
-}
 
-#title {
-    margin: 0 auto;
-    text-align: center;
-    width: 50%;
-}
-
-#systemStats {
-    float: right;
-}
-
-#systemStats .warning {
-    color: orange;
-}
-
-#systemStats .error {
-    color: red;
-}
-
-#systemStats .critical {
-    color: red;
-    text-decoration: blink;
-}
-
-#monitorSummary {
-    float: left;
-    text-align: left;
-    width: 20%;
-}
-
-#devices {
-    float: left;
-}
-
-#loginBandwidth {
-    margin: 0 auto;
-    text-align: center;
-    width: 40%;
-}
-
-#cycleMontage {
-    float: right;
-}
-
-#options {
-    float: right;
-    text-align: right;
-    width: 20%;
-}
-
-#consoleTable {
-    width: 100%;
-}
-
-#consoleTable tr.highlight {
-    background-color: #eeeeee;
-}
-
-#consoleTable thead th {
-    padding-bottom: 4px;
-    vertical-align: middle;
-}
-
-#consoleTable tfoot td {
-    padding-top: 4px;
-    vertical-align: middle;
-}
-
-#consoleTable th,td {
-    height: 16px;
-    text-align: left;
-}
-
-#consoleTable .colMark {
+.consoleTable .colMark {
     width: 72px;
-    text-align: center;
 }
 
-#consoleTable .colEvents {
-    text-align: right;
-}
-
-#consoleTable .colZones {
-    text-align: right;
-}
-
-#consoleTable .colLeftButtons {
-    text-align: left;
-}
-
-#consoleTable .colLeftButtons input {
+.consoleTable .colLeftButtons input {
     margin-right: 24px;
 }
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index 4ef70091d..13bfa125e 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -495,20 +495,6 @@ input[type=submit]:disabled,
   border-color: #666666;
 }
 
-/*
- * Console table for the main event table
- */
-
-#consoleTable td, #consoleTable th {
-    padding: 5px;
-    border-bottom: 1px solid #000000;
-}
-
-#consoleTable input[type=button] {
-    margin-right: 3px !important;
-}
-
-
 .navbar{
   margin-bottom: 0 !important;
   border-radius: 0;
diff --git a/web/skins/classic/css/dark/views/console.css b/web/skins/classic/css/dark/views/console.css
index e28a15b79..48c0b6d86 100644
--- a/web/skins/classic/css/dark/views/console.css
+++ b/web/skins/classic/css/dark/views/console.css
@@ -1,96 +1,3 @@
-#systemTime {
-    float: left;
-}
-
-#title {
-    margin: 0 auto;
-    text-align: center;
-    width: 50%;
-}
-
-#systemStats {
-    float: right;
-}
-
-#systemStats .warning {
-    color: orange;
-}
-
-#systemStats .error {
-    color: red;
-}
-
-#systemStats .critical {
-    color: red;
-    text-decoration: blink;
-}
-
-#monitorSummary {
-    float: left;
-    text-align: left;
-    width: 20%;
-}
-
-#devices {
-    float: left;
-}
-
-#loginBandwidth {
-    margin: 0 auto;
-    text-align: center;
-    width: 40%;
-}
-
-#cycleMontage {
-    float: right;
-}
-
-#options {
-    float: right;
-    text-align: right;
-    width: 20%;
-}
-
-#consoleTable {
-    width: 100%;
-}
-
-#consoleTable tr.highlight {
+.consoleTable tr.highlight {
     background-color: #111111;
 }
-
-#consoleTable thead th {
-    padding-bottom: 4px;
-    vertical-align: middle;
-}
-
-#consoleTable tfoot td {
-    padding-top: 4px;
-    vertical-align: middle;
-}
-
-#consoleTable th,td {
-    height: 16px;
-    text-align: left;
-}
-
-#consoleTable .colMark {
-    width: 62px;
-    text-align: center;
-}
-
-#consoleTable .colEvents {
-    text-align: right;
-}
-
-#consoleTable .colZones {
-    text-align: right;
-}
-
-#consoleTable .colLeftButtons {
-    text-align: left;
-}
-
-#consoleTable .colLeftButtons input {
-    margin-right: 24px;
-}