Sticky rows bg colour

diff --git a/Current Development Check List.md b/Current Development Check List.md
index ad4fbd35dd51a3e08b6b995b8c2e9c767be1e3df..0237177717b0050e4f79601b885fb532d54dafbe 100644 (file)
--- a/Current Development Check List.md
+++ b/Current Development Check List.md
@@ -9,6 +9,7 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 ### v.1.7 Encountered
 
+* ✔ Sticky rows bg colour, to be a shade different to other normal rows.
 * Login system log and out to be implemented. With system variable $TRACK_LOGINS to disable/enable.
 * RTF Documents header lister page, to provide for, new log entry assignment, deletion, edits.
 * ✔Change all code to use Exceptions as project is becoming hard to manage.
@@ -56,7 +57,8 @@ This version is not compatible in data structure to prior versions. Data migrati
 
 ## Planned New Possible Features of Minor Relevance
 
-* Make session timeot sub page page aware via JSON.
+* Make session timeot sub pages aware via JSON.
+* Multiple category assignment table (set via hashtags and end of a post).
 * Log cards Export/Import. Send log entries via email or USB, why not?
 * Provide sub alias login that sets data visible to only a set of categories.
   * View specific based login on a different password.

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 7ce6c88bffbbfb6f42110893008ced32c24c5338..e4f7677be575ccfedb1f1ef5d4dc549c485550b3 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -436,7 +436,7 @@ sub buildLog {
         if ( $log_rc_prev == 0 ) {
             $log_rc_prev = $id;
         }
-        if ( $tfId == 1 ) {
+        if ( $tfId > 0) {
             $tfId = 0;
         }
         else {
@@ -622,9 +622,13 @@ sub buildLog {
         }
 
         my $ssymb = "Edit";
-        $ssymb = "Edit ✵" if $sticky;
+        my $ssid  = $tfId;
+        if ($sticky){
+            $ssymb = "Edit ✵";
+            $ssid = $tfId + 2;
+        }
 
-        $log_output .= qq(<tr class="r$tfId">
+        $log_output .= qq(<tr class="r$ssid">
                <td width="15%">$dtf<input id="y$id" type="hidden" value="$dty"/></td>
                <td id="t$id" width="10%" class="tbl">$dth</td>
                <td id="v$id" class="log" width="40%">$log</td>

diff --git a/htdocs/cgi-bin/system/modules/Settings.pm b/htdocs/cgi-bin/system/modules/Settings.pm
index 67fc9023d5ebee773ccee093ee3c548999a583eb..1b1a36cc469a78c6cf01c1fd4929e596209f6977 100644 (file)
--- a/htdocs/cgi-bin/system/modules/Settings.pm
+++ b/htdocs/cgi-bin/system/modules/Settings.pm
@@ -158,7 +158,7 @@ sub getTheme {
         switch ($THEME){
             case "Sun"   { $BGCOL = '#D4AF37'; $TH_CSS = "main_sun.css"; }
             case "Moon"  { $BGCOL = '#000000'; $TH_CSS = "main_moon.css"; }
-            case "Earth" { $BGCOL = '#26be54'; $TH_CSS = "main_earth.css"; }
+            case "Earth" { $BGCOL = '#26ac0c'; $TH_CSS = "main_earth.css";} # Used to be $BGCOL = '#26be54';
             else{
                 # Standard;
                 $BGCOL    = '#c8fff8';

diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css
index 760c382933ddc719cb68694556d1b2e933b77953..7ddb753f2ecc755c9f0c624f43c0b215ba312e16 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.css
+++ b/htdocs/cgi-bin/wsrc/main.css
@@ -56,13 +56,34 @@ th,
     border-right: 1px solid black;
     vertical-align: top;
 }
-
 .r1 {
     background-color: #ccffff;
     border: 1px solid black;
     border-right: 1px solid black;
     vertical-align: top;
 }
+.r2 {
+    background-color: #ccfff0;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.r3 {
+    background-color: #b2f8ef;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.rz {
+    border: 1px solid black;
+    text-align: left;
+    background-color: #e6ffff;
+    vertical-align: top;
+    align-self: baseline;
+    height: auto;
+    padding: 2%;
+    margin: 0px auto;
+}
 
 .hdr {
     font-style: normal;
@@ -93,16 +114,7 @@ th,
     padding-left: 5px;
 }
 
-.rz {
-    border: 1px solid black;
-    text-align: left;
-    background-color: #e6ffff;
-    vertical-align: top;
-    align-self: baseline;
-    height: auto;
-    padding: 2%;
-    margin: 0px auto;
-}
+
 
 div#rz {
     border: 1px solid black;
@@ -253,5 +265,5 @@ a:hover {
     font-size: large;
     font-style: normal;
     font-weight: bold;
-    color:crimson; 
+    color:crimson;
 }
\ No newline at end of file

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 74a3d8a31f65a298cc1c4bb4d35931d0f5100d5f..0b9476a0899ba391c670901be05fe9fe6a9c07ea 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -893,8 +893,7 @@ function setPageSessionTimer(expires) {
                 var sec = ((dif % 60000) / 1000).toFixed(0);
                 var out = (min < 10 ? '0' : '') + min + ":" + (sec < 10 ? '0' : '') + sec;
                 var tim = new moment().tz(TIMEZONE).format("hh:mm:ss a");
-                $("#sss_status").html("Current Time:" + tim + " Session expires in " + out);
-                //$("#sss_status").html(" Session expires  " + timeout.from(now));//timeout.format("ddd, hA, HH:mm:ss"));
+                $("#sss_status").html("<font size='1px'>[" + tim + "]</font> Session expires in " + out);
                 if(now.isAfter(timeout)){
                     $("#sss_status").html("<span id='sss_expired'><a href='login_ctr.cgi'>Page Session has Expired!</a></span>");
                     clearInterval(timer);

diff --git a/htdocs/cgi-bin/wsrc/main_earth.css b/htdocs/cgi-bin/wsrc/main_earth.css
index 53fd9ecacc711201afa543bffde64d0e2967501c..683f19ede921ac07ed0b998c94182c8165e24e41 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main_earth.css
+++ b/htdocs/cgi-bin/wsrc/main_earth.css
@@ -51,18 +51,39 @@ th,
 }
 
 .r0 {
-    background-color: #e46331;
+    background-color: #d1663c;
     border: 1px solid black;
     border-right: 1px solid black;
     vertical-align: top;
 }
-
 .r1 {
     background-color: #a5682f;
     border: 1px solid black;
     border-right: 1px solid black;
     vertical-align: top;
 }
+.r2 {
+    background-color: #e97f56;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.r3 {
+    background-color: #ee9440;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.rz {
+    border: 1px solid black;
+    text-align: left;
+    background-color: #4d9b46;
+    vertical-align: top;
+    align-self: baseline;
+    height: auto;
+    padding: 2%;
+    margin: 0px auto;
+}
 
 .hdr {
     font-style: normal;
@@ -93,21 +114,10 @@ th,
     padding-left: 5px;
 }
 
-.rz {
-    border: 1px solid black;
-    text-align: left;
-    background-color: #118107;
-    vertical-align: top;
-    align-self: baseline;
-    height: auto;
-    padding: 2%;
-    margin: 0px auto;
-}
-
 div#rz {
     border: 1px solid black;
     text-align: left;
-    background-color: #08fa08;
+    background-color: #6ed16e;
     vertical-align: top;
     align-self: baseline;
     height: auto;
@@ -142,7 +152,7 @@ img {
     position: fixed;
     float: left;
     margin: 0;
-    border: 2px solid #118107;
+    border: 2px solid #23771c;
     padding: 5px;
     text-align: center;
     background: #c28a4a;
@@ -162,7 +172,7 @@ img {
 .ui-button,
 .ui-button-text .ui-button {
     font-size: 12px !important;
-    background: #b5e7a1 !important;    
+    background: #b5e7a1 !important;
 }
 
 .ui-menu {
@@ -211,12 +221,12 @@ img {
     max-height: 480px;
     border-top: 1px solid gray;
     border-right: 1px solid gray;
-    background-color: #118107;
+    background-color: #40ad36;
 }
 
 #toolbar-container {
     border: 1px solid black;
-    background-color: #118107;
+    background-color: #40ad36;
     margin-bottom: 3px;
 }
 

diff --git a/htdocs/cgi-bin/wsrc/main_moon.css b/htdocs/cgi-bin/wsrc/main_moon.css
index 81e800e95aec1386f712b31b3f09618776060907..ddff7fd231233a44e2cc61419088230445a2c373 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main_moon.css
+++ b/htdocs/cgi-bin/wsrc/main_moon.css
@@ -1,7 +1,7 @@
 p {
     font-family: Bookman;
     margin-left: 70px;
-    font-weight: bold;    
+    font-weight: bold;
 }
 pre{
     color: #d8d8d8;
@@ -21,8 +21,8 @@ td {
 div {
     font-family: Bookman;
     text-align: center;
-    vertical-align: middle; 
-    color: #d8d8d8;  
+    vertical-align: middle;
+    color: #d8d8d8;
 }
 
 #div_srh {
@@ -42,7 +42,7 @@ th,
     padding-bottom: 5px;
     padding-left: 5px;
     margin-bottom: 0px;
-    margin-top: 5px;    
+    margin-top: 5px;
 }
 
 .tbl_rem {
@@ -62,13 +62,46 @@ th,
     border-right: 1px solid white;
     vertical-align: top;
 }
-
 .r1 {
     background-color: #272626;
     border: 1px solid white;
     border-right: 1px solid white;
     vertical-align: top;
 }
+.r2 {
+    background-color: #636969;
+    border: 1px solid white;
+    border-right: 1px solid white;
+    vertical-align: top;
+}
+.r3 {
+    background-color: #918383;
+    border: 1px solid white;
+    border-right: 1px solid white;
+    vertical-align: top;
+}
+.rz {
+    border: 1px solid white;
+    text-align: left;
+    background-color: #363531;
+    color: #cfcfe6;
+    vertical-align: top;
+    align-self: baseline;
+    height: auto;
+    margin: 0px auto;
+    padding:10px;
+}
+div#rz {
+    border: 1px solid white;
+    text-align: left;
+    background-color:#363531;
+    color:#f3f0e6;
+    vertical-align: top;
+    align-self: baseline;
+    height: auto;
+    padding: 2px;
+    margin: 0px auto;
+}
 
 .hdr {
     font-style: normal;
@@ -99,30 +132,6 @@ th,
     padding-left: 5px;
 }
 
-.rz {
-    border: 1px solid white;
-    text-align: left;
-    background-color: #363531;
-    color: #cfcfe6;
-    vertical-align: top;
-    align-self: baseline;
-    height: auto;    
-    margin: 0px auto;
-    padding:10px;
-}
-
-div#rz {
-    border: 1px solid white;
-    text-align: left;
-    background-color:#363531;
-    color:#f3f0e6;
-    vertical-align: top;
-    align-self: baseline;
-    height: auto;
-    padding: 2px;
-    margin: 0px auto;
-}
-
 #tag_FRM {
     border: 2px solid #2b3d46;
     padding: 5px;
@@ -153,7 +162,7 @@ img {
     margin: 0;
     border: 2px solid #9bb6c3;
     padding: 5px;
-    text-align: center;    
+    text-align: center;
     margin-left: 90%;
     color: white;
     background-color: #363531;

diff --git a/htdocs/cgi-bin/wsrc/main_sun.css b/htdocs/cgi-bin/wsrc/main_sun.css
index 68c65f561b91f92c0a0c85e9062b76b0b75357d9..68ffbcf496cd3d13ebe4a7d209c94426f5687b75 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main_sun.css
+++ b/htdocs/cgi-bin/wsrc/main_sun.css
@@ -56,14 +56,35 @@ th,
     border-right: 1px solid black;
     vertical-align: top;
 }
-
 .r1 {
-    background-color: #CFB53B;
+    background-color: #FFEA00;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.r2 {
+    background-color: #ffdd44;
+    border: 1px solid black;
+    border-right: 1px solid black;
+    vertical-align: top;
+}
+.r3 {
+    background-color: #ffcf35;
     border: 1px solid black;
     border-right: 1px solid black;
     vertical-align: top;
 }
 
+.rz {
+    border: 1px solid black;
+    text-align: left;
+    background-color: #D4AF37 vertical-align: top;
+    align-self: baseline;
+    height: auto;
+    padding: 2%;
+    margin: 0px auto;
+}
+
 .hdr {
     font-style: normal;
     font-weight: bold;
@@ -93,15 +114,7 @@ th,
     padding-left: 5px;
 }
 
-.rz {
-    border: 1px solid black;
-    text-align: left;
-    background-color: #D4AF37 vertical-align: top;
-    align-self: baseline;
-    height: auto;
-    padding: 2%;
-    margin: 0px auto;
-}
+
 
 div#rz {
     border: 1px solid black;
@@ -237,5 +250,5 @@ img {
  font-size: large;
  font-style: normal;
  font-weight: bold;
- color:crimson; 
+ color:crimson;
 }
\ No newline at end of file