From: wbudic <redacted>
Date: Fri, 31 Aug 2018 08:14:28 +0000 (+1000)
Subject: Fixed CSS Formatting and removed CSS #id references.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=c32c3a3902490983fea927dd3abac2645ab648dd;p=LifeLog.git

Fixed CSS Formatting and removed CSS #id references.
---

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 1a01b15..efb9fcb 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -102,8 +102,11 @@ my %hshCats;
 $cats = $cats.'</select>';
 
 
-my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
-<table class="tbl"><tr class="tbl"><th>Date</th><th>Time</th><th>Log</th><th>Category</th><th>Del</th></tr>';
+my $tbl = qq(
+<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
+<table class="tbl">
+<tr class="r0"><th>Date</th><th>Time</th><th>Log</th><th>Category</th><th>Edit</th></tr>);
+
 my $tbl_rc = 0;
 
 ##################################
@@ -118,7 +121,7 @@ if($rv < 0) {
 	     print "<p>Error->"& $DBI::errstri &"</p>";
 }
 
-my $tfId = 1;
+my $tfId = 0;
 
  while(my @row = $sth->fetchrow_array()) {
 
@@ -131,9 +134,10 @@ my $tfId = 1;
 		 $tfId = 1;
 	 }
 
-	         $tbl = $tbl . '<tr class="tbl" id="r'.$tfId.'"><td id="y'.$row[0].'">'. 
+	         $tbl = $tbl . '<tr class="r'.$tfId.'"><td id="y'.$row[0].'">'. 
 		 	$dt->ymd . '</td>' . 
-		          '<td id="t'.$row[0].'">' . $dt->hms . "</td>" . '<td id="v'.$row[0].'" class="log">' . $row[3] . "</td>".
+		          '<td id="t'.$row[0].'">' . $dt->hms . "</td>" . '<td id="v'.$row[0].
+			  '" class="log">' . $row[3] . "</td>".
 			  '<td id="c'.$row[0].'">' . $ct .
 			  '</td>
 			  <td><input class="edit" type="button" value="Edit" onclick="edit(this);return false;"/><input name="chk" type="checkbox" value="'.$row[0].'"/>
@@ -144,28 +148,33 @@ my $tfId = 1;
  if($tbl_rc==1){
 	 $tbl = $tbl . "<tr><td colspan=\"5\"><b>Table is Empty!</b></td></tr>\n";
  }
- $tbl = $tbl . '<tr><td colspan="5" align="right">
+ $tbl = $tbl . '<tr class="r0"><td colspan="5" align="right">
  <input type="reset" value="Unselect All"/><input type="submit" value="Delete Selected"/>
  </td></tr>
  </table></form>';
 
 my  $frm = qq(
  <form name="frm_log" action="main.cgi" onSubmit="return formValidation();">
-	 <table class="entry"><tr>
+	 <table class="tbl">
+	 <tr class="r0"><td colspan="3"><b>* LOG ENTRY FORM *</b></td></tr>
+	 <tr><td colspan="3"><br/></td></tr>
+	 <tr>
 		 <td>Date:</td><td><input id="ed" type="text" name="date" value=") .$today->ymd ." ". $today->hms . qq("><button onclick="return setNow();">Now</button></td><td>Category:</td>
 		 </tr>
 		 <tr><td>Log:</td> <td><textarea id="el" name="log" rows="2" cols="60"></textarea></td>
  		 <td>).$cats.qq(</td></tr>
-		 <tr><td></td><td></td><td><input type="submit" value="Submit"/>
-		 <input type="hidden" name="submit_is_edit" id="submit_is_edit" value="0"/></td>
+		 <tr><td></td><td></td><td>
+		 <input type="submit" value="Submit"/>
+		 </td>
 	</tr></table>
+		 <input type="hidden" name="submit_is_edit" id="submit_is_edit" value="0"/>
 </form>
  );
 
 
 
-print "<div id=\"frm\">\n" . $frm ."</div>";
-print "<div id=\"tbl\">\n" . $tbl ."</div>";
+print "<div>\n" . $frm ."</div>\n<br/>";
+print "<div>\n" . $tbl ."</div>";
 print $q->end_html;
 
 $dbh->disconnect();
diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/remove.cgi
index efa752a..658d01d 100755
--- a/htdocs/cgi-bin/remove.cgi
+++ b/htdocs/cgi-bin/remove.cgi
@@ -43,7 +43,9 @@ my $tbl_rc =0;
 
 my $stmS = "SELECT rowid, ID_CAT, DATE, LOG from LOG WHERE";
 my $stmE = " ORDER BY rowid DESC, DATE DESC;";
-my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();"><table><tr class="tbl"><th>Date</th><th>Time</th><th>Log</th><th>Category</th></tr>';
+my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
+		<table class="tbl">
+		<tr class="r0"><th>Date</th><th>Time</th><th>Log</th><th>Category</th></tr>';
 my $confirmed = $q->param('confirmed');
 if (!$confirmed){
      print $q->header(-expires=>"+6os");    
@@ -99,23 +101,28 @@ if($rv < 0) {
 }
 
 
-
- while(my @row = $sth->fetchrow_array()) {
+my $r_cnt = 0;
+while(my @row = $sth->fetchrow_array()) {
 
 	 my $ct = $hshCats{@row[1]};
 	 my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] );
 
-	 $tbl = $tbl . '<tr class="tbl"><td>'. $dt->ymd . "</td>" . 
+	 $tbl = $tbl . '<tr class="r1"><td>'. $dt->ymd . "</td>" . 
 		  "<td>" . $dt->hms . "</td>" . "<td>" . $row[3] . "</td>\n".
 		  "<td>" . $ct. '<input type="hidden" name="chk" value="'.$row[0].'"></td></tr>';	
- }
+	$r_cnt++;
+}
+my $plural = "";
+if($r_cnt>1){
+	$plural = "s";
+}
 
- $tbl = $tbl .  '<tr><td colspan="4">
+ $tbl = $tbl .  '<tr class="r0"><td colspan="4">
  <center>
- <h2>Please Confirm You Want This Deleted!</h2>
+ <h2>Please Confirm You Want <br/>The Above Record'.$plural.' Deleted?</h2>
  (Or hit you Browsers Back Button!)</center>
  </td></tr>
- <tr><td colspan="4"><center>
+ <tr class="r0"><td colspan="4"><center>
  <input type="submit" value="I AM CONFIRMING!">
  </center>
  <input type="hidden" name="confirmed" value="1">
diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index bb0dd1d..5303060 100644
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -1,7 +1,7 @@
 [type="submit"] {
 	clear: left;
-	margin: 10px 0 0 30px;
-	font-size:12px
+	margin: 10px 5px 10px 40px;
+	font-size:12px;
 }
 
 p {
@@ -9,49 +9,42 @@ p {
 	font-weight: bold;
 }
 
-table {
-	    border-collapse: collapse;
 
+table, th, td{
+	border-collapse: collapse;
+	width: 680px;
+	padding-bottom: 5px;
 }
 
-table, th, td{
- width: 660px;
- border: 1px solid black;
+div{
+
+	width: 700px;
+	text-align: center;
+	vertical-align: middle;
 }
 
 .tbl {
- border: 1px solid black;
-	background-color: #e6fff2;
+	border: 1px solid black;
+	padding-top: 5px;
+	padding-right: 5px;
+	padding-bottom: 5px;
+	padding-left: 5px;
 }
 
-#r0{
+.r0{
 	background-color: #e6ffff;
+	border: 1px solid black;
 }
 
-#r1{
+.r1{
 	background-color: #ccffff;
 }
 
-.entry, th, td{
- width: 660px;
- border: 0px;
- border-collapse: collapse;
-}
-#frm{
-	padding: 5px;
-}
 
-#log{
-	width:82px;
-	text-align: justify;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-}
 
 .edit{
 	margin: 0;
-	padding 1px;
+	padding 5px;
 	font-size:7pt;
 	border=:0px;
 }