From 81533b93fe43304dd834bb88b04ebe06c106bc08 Mon Sep 17 00:00:00 2001
From: Tristan Ancelet <tristanancelet@yahoo.com>
Date: Sat, 27 May 2023 16:42:12 -0500
Subject: [PATCH] added css changes to hide the double_width menu_bar when it
 deosn't have children.

---
 crontab.php    |  6 +++---
 css/main.css   | 33 +++++++++++++++++++++++----------
 database.php   |  6 +++---
 index.php      | 10 ++--------
 test_query.php | 11 -----------
 5 files changed, 31 insertions(+), 35 deletions(-)
 delete mode 100755 test_query.php

diff --git a/crontab.php b/crontab.php
index 3a28843..1d479f0 100644
--- a/crontab.php
+++ b/crontab.php
@@ -19,7 +19,7 @@ $db = new SQLite3("../webcron.db");
         <nav>
             <a class='nav-button' href='index.php'>Log Management</a>
             <?php
-                $items = scandir(".");
+                $items = scandir($root);
                 foreach ($items as $item){
                     if (preg_match('/\.php$/', $item) && $item != "index.php"){
                         $item_name=ucfirst(explode('.', $item)[0]);
@@ -31,7 +31,7 @@ $db = new SQLite3("../webcron.db");
 
         <div class="content_area bordered rounded_border">
 
-            <div class="menu_bar bordered_right cell">
+            <div class="single_width menu_bar bordered_right cell border_rounded_left">
                 <button class="menu_button" onclick="setCrontabStats()"> View Crontab Statistics </button>
                 <button class="menu_button" onclick="getTable('job_history')">View Script Run History</button>
                 <button class="menu_button" onclick="listCrontabs()">View Crontabs</button>
@@ -41,7 +41,7 @@ $db = new SQLite3("../webcron.db");
             <div id="content" class="content cell">
            </div>
 
-        <div class="double_width_menu_bar bordered_left cell">
+        <div class="double_width menu_bar bordered_left cell border_rounded_right">
            <?php
            $columns = array(
             'crontab_path AS "Crontab Path"',
diff --git a/css/main.css b/css/main.css
index 4bb6939..fc20093 100644
--- a/css/main.css
+++ b/css/main.css
@@ -16,6 +16,7 @@ body {
     border-radius: 5px;
     border: 1px solid black;
     padding: 0.5rem 1.2rem;
+    margin-right: 0.5rem;
 }
 
 .nav-button:hover {
@@ -38,10 +39,6 @@ body {
 }
 
 .content_area {
-    /*
-    display: flex;
-    flex-direction: row;
-    */
     display: table;
     width: 100%;
 }
@@ -52,12 +49,12 @@ body {
     margin-bottom: 0.5rem;
 }
 
-.double_width_menu_bar {
-    display: flexbox;
-    background-color: #569DAA;
-    padding: 1rem;
+.single_width {
+    width: 15rem;
+}
+
+.double_width {
     width: 30rem;
-    margin-right: 1rem;
 }
 
 .wrapper {
@@ -78,6 +75,7 @@ body {
     display: table-cell;
     text-align: center;
     background-color: #bcc5c3;
+    padding: 0.2rem;
 }
 
 .table_header:not(:last-child){
@@ -99,6 +97,7 @@ body {
 
 .table_cell {
     display: table-cell;
+    padding: 0.2rem;
 }
 
 .table_cell:not(:last-child){
@@ -107,12 +106,26 @@ body {
 
 .menu_bar {
     display: flexbox;
+    visibility: visible;
     background-color: #569DAA;
     padding: 1rem;
-    width: 10rem;
     margin-right: 1rem;
 }
 
+.menu_bar.double_width:not(:has(.log_table)){
+    display:none;
+    visibility: hidden;
+}
+
+
+.border_rounded_left {
+    border-radius: 5px 0px 0px 5px;
+}
+
+.border_rounded_right {
+    border-radius: 0px 5px 5px 0px;
+}
+
 .cell {
     display: table-cell;
 }
diff --git a/database.php b/database.php
index 05189a8..70b1cb0 100644
--- a/database.php
+++ b/database.php
@@ -34,7 +34,7 @@ $db = new SQLite3("../webcron.db");
 
         <div class="content_area bordered rounded_border">
 
-            <div class="menu_bar bordered_right cell">
+            <div class="single_width menu_bar bordered_right cell border_rounded_left">
                 <button class="menu_button" onclick="setDatabaseVersion()"> View Database Version</button>
                 <button class="menu_button" onclick="listTables()"> View Tables </button>
             </div>
@@ -42,8 +42,8 @@ $db = new SQLite3("../webcron.db");
             <div id="content" class="content cell">
             </div>
 
-            <div class="double_width_menu_bar bordered_left cell">
-                
+            <div class="double_width menu_bar bordered_left cell border_rounded_right">
+
             </div>
         </div>
 
diff --git a/index.php b/index.php
index 97a446f..175074a 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,6 @@ $db = new SQLite3("../webcron.db");
 -->
 <html>
     <head>
-        <!-- <script src="https://cdn.tailwindcss.com"></script> -->
         <link rel="stylesheet" href="css/main.css">
         <script src="main.js"> </script>
         <title>Overview</title>
@@ -31,7 +30,7 @@ $db = new SQLite3("../webcron.db");
 
         <div class="content_area bordered rounded_border">
 
-            <div class="menu_bar bordered_right cell">
+            <div class="single_width menu_bar bordered_right cell border_rounded_left">
                 <button class="menu_button" onclick="getLogHistory()"> Check Logs </button>
             </div>
 
@@ -48,20 +47,16 @@ $db = new SQLite3("../webcron.db");
                 ?>
             </div>
 
-            <div class="double_width_menu_bar bordered_left cell">
+            <div class="double_width menu_bar bordered_left cell border_rounded_right">
                 <?php
                 $table = new Table("log_statistics_last_7_days");
                 $table->set_pretty_name("Log Statistics (Last 7 Days)");
-                $query = $table->get_query();
                 $table->Load($db);
-                echo $query->get_query_string();
                 echo $table->get_html();
 
                 $table = new Table("last_ten_failed_jobs");
                 $table->set_pretty_name("Script Failures (Last 10)");
-                $query = $table->get_query();
                 $table->Load($db);
-                echo $query->get_query_string();
                 echo $table->get_html();
                 
 
@@ -71,7 +66,6 @@ $db = new SQLite3("../webcron.db");
                 $query->set_order_by_column("job_timestamp DESC");
                 $query->set_limit(10);
                 $table->Load($db);
-                echo $query->get_query_string();
                 echo $table->get_html();
                 ?>
             </div>
diff --git a/test_query.php b/test_query.php
deleted file mode 100755
index 66a7af0..0000000
--- a/test_query.php
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/php
-
-<?php
-require("Libraries/db/query.php");
-use db\Query;
-
-$query = new Query("crontabs");
-$query->set_limit(-1);
-
-echo $query->get_query_string();
-?>