From: wbudic <redacted>
Date: Mon, 27 Aug 2018 02:29:36 +0000 (+1000)
Subject: css changes
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=05b2bc1cff17062d5d1e31212fd1ec2eb6d5b54a;p=LifeLog.git

css changes
---

diff --git a/htdocs/cgi-bin/.main.cgi.swp b/htdocs/cgi-bin/.main.cgi.swp
new file mode 100644
index 0000000..165b6a5
Binary files /dev/null and b/htdocs/cgi-bin/.main.cgi.swp differ
diff --git a/htdocs/cgi-bin/.remove.cgi.swp b/htdocs/cgi-bin/.remove.cgi.swp
new file mode 100644
index 0000000..63b729e
Binary files /dev/null and b/htdocs/cgi-bin/.remove.cgi.swp differ
diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 527ca71..2aeceaa 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -102,7 +102,7 @@ $cats = $cats.'</select>';
 
 
 my $tbl = '<form name="frm_log_del" action="remove.cgi" onSubmit="return formDelValidation();">
-<table border="1px"><tr><th>Date</th><th>Time</th><th>Log</th><th>Category</th><th>Del</th></tr>';
+<table class="tbl"><tr class="tbl"><th>Date</th><th>Time</th><th>Log</th><th>Category</th><th>Del</th></tr>';
 my $tbl_rc = 0;
 
 ##################################
@@ -124,10 +124,10 @@ if($rv < 0) {
 	 my $ct = $hshCats{@row[1]};
 	 my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] );
 
-	         $tbl = $tbl . "<tr><td>". $dt->ymd . "</td>" . 
+	         $tbl = $tbl . '<tr class="tbl"><td>'. $dt->ymd . '</td>' . 
 		          "<td>" . $dt->hms . "</td>" . "<td>" . $row[3] . "</td>".
 			  "<td>" . $ct .
-			  "</td><td><input name=\"chk\"type=\"checkbox\" value=\"".$row[0]."\"/> </td></tr>\n";
+			  "</td><td><input name=\"chk\" type=\"checkbox\" value=\"".$row[0]."\"/> </td></tr>\n";
 	$tbl_rc +=1;	
  }
 
@@ -141,8 +141,8 @@ if($rv < 0) {
 
 my  $frm = qq(
  <form name="frm_log" action="main.cgi" onSubmit="return formValidation();">
-	 <table><tr>
-		 <td>Date:</td><td><input type="text" name="date" value=") .$today->ymd ." ". $today->hms . qq("></td><td>Category:</td>
+	 <table class="entry"><tr>
+		 <td>Date:</td><td><input 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 name="log" rows="2" cols="40"></textarea></td>
  		 <td>).$cats.qq(</td></tr>
diff --git a/htdocs/cgi-bin/remove.cgi b/htdocs/cgi-bin/remove.cgi
index 6d64d60..88a3b9e 100755
--- a/htdocs/cgi-bin/remove.cgi
+++ b/htdocs/cgi-bin/remove.cgi
@@ -43,7 +43,7 @@ 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 border="1px" width="580px"><tr><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><tr><th class="tbl">Date</th><th class="tbl">Time</th><th>Log</th><th>Category</th></tr>';
 my $confirmed = $q->param('confirmed');
 if (!$confirmed){
      print $q->header(-expires=>"+6os");    
@@ -105,9 +105,9 @@ if($rv < 0) {
 	 my $ct = $hshCats{@row[1]};
 	 my $dt = DateTime::Format::SQLite->parse_datetime( $row[2] );
 
-	         $tbl = $tbl . "<tr><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>';	
+	 $tbl = $tbl . "<tr><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>';	
  }
 
  $tbl = $tbl .  '<tr><td colspan="4">
diff --git a/htdocs/cgi-bin/wsrc/.main.css.swp b/htdocs/cgi-bin/wsrc/.main.css.swp
new file mode 100644
index 0000000..9e2e3a7
Binary files /dev/null and b/htdocs/cgi-bin/wsrc/.main.css.swp differ
diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index 0ace2e5..5987fe0 100644
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -9,6 +9,24 @@ p {
 	font-weight: bold;
 }
 
-table{
+table {
+	    border-collapse: collapse;
+}
+
+table, th, td{
+ width: 640px;
+ border: 1px solid black;
+}
+
+.tbl {
+ border: 1px solid black;
+}
+.entry, th, td{
  width: 640px;
+ border: 0px;
+ border-collapse: collapse;
 }
+#frm{
+	padding: 5px;
+}
+
diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 2d8460b..f9e5cd7 100644
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -23,3 +23,12 @@ function validLog(log){
 	}
 return true;
 }
+
+function setNow(){
+
+	var date = document.frm_log.date;
+	var dt = new Date();
+	date.value = dt.getFullYear()+"-"+dt.getMonth()+"-"+dt.getUTCDate() + " " + dt.getHours() + ":" dt.getMinutes() +":"+dt.getSeconds();
+
+return false;
+}