From: Will Budic <redacted>
Date: Wed, 26 Feb 2020 18:52:39 +0000 (+1100)
Subject: isView page selection, layout fixes.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=d412f47324227fdbefa7e7e4c0ad8e947b38ad37;p=LifeLog.git

isView page selection, layout fixes.
---

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 5b8ce50..9759ea0 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -352,8 +352,9 @@ qq(<form id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
     my $id        = 0;
     my $log_start = index $sqlVWL, "<=";
     my $re_a_tag  = qr/<a\s+.*?>.*<\/a>/si;
+    my $isView = rindex ($sqlVWL, 'PID<=') > 0 || rindex ($sqlVWL, 'ID_CAT=') > 0;
 
-    print $cgi->pre("###[Session PARAMS->vc=$prm_vc|xc=$prm_xc|xc_lst=$prm_xc_lst|xc_lst=@xc_lst|keepExcludes=".&Settings::keepExcludes."] -> ".$sqlVWL) if $DEBUG;
+    print $cgi->pre("###[Session PARAMS->isV:$isView|vc=$prm_vc|xc=$prm_xc|xc_lst=$prm_xc_lst|xc_lst=@xc_lst|keepExcludes=".&Settings::keepExcludes."] -> ".$sqlVWL) if $DEBUG;
 
     if ( $log_start > 0 ) {
 
@@ -378,8 +379,8 @@ qq(<form id="frm_log" action="data.cgi" onSubmit="return formDelValidation();">
 
     #place sticky or view param.ed entries first!
     buildLog(traceDBExe($sqlVWL));
-
-    if(index ($sqlVWL, 'PID <=') < 1 && !$prm_vc  && !$prm_xc && !$rs_keys && !$rs_dat_from){
+    #Following is saying is in page selection, not view selection, or accounting on type of sticky entries.
+    if( !$isView && !$prm_vc  && !$prm_xc && !$rs_keys && !$rs_dat_from ){
         $sqlVWL = "SELECT ID, ID_CAT, ID_RTF, DATE, LOG, AMOUNT, AFLAG, STICKY FROM VW_LOG WHERE STICKY != 1  ORDER BY DATE DESC LIMIT ".&Settings::viewAllLimit.";";
         print $cgi->pre("###2 -> ".$sqlVWL)  if $DEBUG;
         ;
@@ -1029,7 +1030,7 @@ try {
 
                     }
 
-                    $sqlVWL = qq(SELECT PID, ID_CAT, ID_RTF, DATE, LOG, AMOUNT, AFLAG, STICKY from VW_LOG where PID <= $rs_cur and STICKY != 1 $sand)." LIMIT ".&Settings::viewAllLimit.";";
+                    $sqlVWL = qq(SELECT PID, ID_CAT, ID_RTF, DATE, LOG, AMOUNT, AFLAG, STICKY from VW_LOG where PID<=$rs_cur and STICKY!=1 $sand)." LIMIT ".&Settings::viewAllLimit.";";
                     return;
                 }
             }
diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index 9b97503..508d80f 100644
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -64,7 +64,7 @@ th,
 }
 .span_cat {
     border:1px solid #b2f8ef;
-    border-style: inset; 
+    border-style: inset;
     padding: 2px;
     padding-right: 5px;
     width: 180px;
@@ -73,9 +73,9 @@ th,
 .r0 {
     background-color: #e6ffff;
     border: 1px solid black;
-    border-right: 2px solid black;
+    border-right: 1px solid black;
     vertical-align: top;
-    padding:2px;
+    apadding:2px;
 }
 .r1 {
     background-color: #ccffff;