]> lifelog.hopto.org Git - LifeLog.git/commitdiff
L-Tags help specs added on config page.
authorMetabox <redacted>
Sat, 27 Apr 2019 03:05:36 +0000 (13:05 +1000)
committerMetabox <redacted>
Sat, 27 Apr 2019 03:05:36 +0000 (13:05 +1000)
.vstags
dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff [new file with mode: 0644]
htdocs/cgi-bin/config.cgi
htdocs/cgi-bin/main.cgi
htdocs/cgi-bin/main.cnf

diff --git a/.vstags b/.vstags
index 1ce5995cea1a56ec63cc9518caaea76729e30966..b41586d9811125aa2d6a646d563697f23e25402c 100644 (file)
--- a/.vstags
+++ b/.vstags
@@ -7,21 +7,21 @@
 ConfirmedDelition      htdocs/cgi-bin/remove.cgi       150;"   s
 DisplayDateDiffs       htdocs/cgi-bin/remove.cgi       103;"   s
 NotConfirmed   htdocs/cgi-bin/remove.cgi       170;"   s
-authenticate   htdocs/cgi-bin/main.cgi 587;"   s
+authenticate   htdocs/cgi-bin/main.cgi 608;"   s
 big_money      htdocs/cgi-bin/stats.cgi        126;"   s
 boldDate       htdocs/cgi-bin/remove.cgi       144;"   s
 build  htdocs/cgi-bin/search.cgi       85;"    s
-buildNavigationButtons htdocs/cgi-bin/main.cgi 543;"   s
-changeSystemSettings   htdocs/cgi-bin/config.cgi       330;"   s
+buildNavigationButtons htdocs/cgi-bin/main.cgi 564;"   s
+changeSystemSettings   htdocs/cgi-bin/config.cgi       366;"   s
 checkCreateTables      htdocs/cgi-bin/login_ctr.cgi    113;"   s
 dateDiff       htdocs/cgi-bin/remove.cgi       136;"   s
-exportCategoriesToCSV  htdocs/cgi-bin/config.cgi       397;"   s
-exportLogToCSV htdocs/cgi-bin/config.cgi       366;"   s
-getConfiguration       htdocs/cgi-bin/config.cgi       526;"   s
-getConfiguration       htdocs/cgi-bin/main.cgi 630;"   s
+exportCategoriesToCSV  htdocs/cgi-bin/config.cgi       433;"   s
+exportLogToCSV htdocs/cgi-bin/config.cgi       402;"   s
+getConfiguration       htdocs/cgi-bin/config.cgi       562;"   s
+getConfiguration       htdocs/cgi-bin/main.cgi 655;"   s
 getConfiguration       htdocs/cgi-bin/remove.cgi       228;"   s
-importCatCSV   htdocs/cgi-bin/config.cgi       429;"   s
-importLogCSV   htdocs/cgi-bin/config.cgi       470;"   s
+importCatCSV   htdocs/cgi-bin/config.cgi       465;"   s
+importLogCSV   htdocs/cgi-bin/config.cgi       506;"   s
 insertDefCats  htdocs/cgi-bin/login_ctr.cgi    254;"   s
 main   htdocs/cgi-bin/login_ctr.cgi    6;"     p
 main::checkCreateTables        htdocs/cgi-bin/login_ctr.cgi    113;"   s
@@ -30,15 +30,15 @@ main::populateConfig        htdocs/cgi-bin/login_ctr.cgi    203;"   s
 main::processSubmit    htdocs/cgi-bin/login_ctr.cgi    87;"    s
 main::removeOldSessions        htdocs/cgi-bin/login_ctr.cgi    270;"   s
 main::selSQLTbl        htdocs/cgi-bin/login_ctr.cgi    249;"   s
-parseDate      htdocs/cgi-bin/main.cgi 444;"   s
+parseDate      htdocs/cgi-bin/main.cgi 465;"   s
 populateConfig htdocs/cgi-bin/login_ctr.cgi    203;"   s
-processSubmit  htdocs/cgi-bin/config.cgi       225;"   s
+processSubmit  htdocs/cgi-bin/config.cgi       261;"   s
 processSubmit  htdocs/cgi-bin/login_ctr.cgi    87;"    s
-processSubmit  htdocs/cgi-bin/main.cgi 458;"   s
+processSubmit  htdocs/cgi-bin/main.cgi 479;"   s
 removeOldSessions      htdocs/cgi-bin/login_ctr.cgi    270;"   s
 selSQLTbl      htdocs/cgi-bin/login_ctr.cgi    249;"   s
 selectSQL      htdocs/cgi-bin/stats.cgi        115;"   s
-updConfSetting htdocs/cgi-bin/config.cgi       353;"   s
-updateCATDB    htdocs/cgi-bin/config.cgi       443;"   s
-updateLOGDB    htdocs/cgi-bin/config.cgi       486;"   s
+updConfSetting htdocs/cgi-bin/config.cgi       389;"   s
+updateCATDB    htdocs/cgi-bin/config.cgi       479;"   s
+updateLOGDB    htdocs/cgi-bin/config.cgi       522;"   s
 wanted htdocs/cgi-bin/e_vars.pl        211;"   s
diff --git a/dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff b/dbLifeLog/cgisess_8fcc7f435d33c50c6099f5e6eb67e6ff
new file mode 100644 (file)
index 0000000..e4267c6
--- /dev/null
@@ -0,0 +1 @@
+$D = {'_SESSION_ID' => '8fcc7f435d33c50c6099f5e6eb67e6ff','_SESSION_REMOTE_ADDR' => '127.0.0.1','_SESSION_CTIME' => 1556331290,'_SESSION_ATIME' => 1556334218,'_SESSION_ETIME' => 1800,'database' => 'data_admin_log.db','alias' => 'admin','passw' => '42FAP5H0JUSZM'};;$D
\ No newline at end of file
index d97705b0dd45021b2b97b31fdf434d8616199b33..bca25285d2aedda9930fafda1b2349d80d099cd8 100755 (executable)
@@ -189,8 +189,10 @@ my $prc_hdr = $PRC_WIDTH-2;
        print "\n<div >\n" . $frmVars."\n</div>\n";     
        print "\n<div>\nSTATUS:" .$status. "\n</div>\n";        
        print qq(
-                     <br><div><a href="main.cgi">Back to Main Log</a></div><br><hr>\n
-                                       <table border=0>
+                     <br><div id="rz" style="text-align:center; position:relative;width:"$PRC_WIDTH%" padding:0px;">
+                                       <a href="main.cgi"><h2>Back to Main Log</h2></a></div><br><hr>\n
+                                       
+                                       <table border="0">
                                                <tr><td><H3>CSV File Format</H3></td></tr>\n
                                                <form action="config.cgi" method="post" enctype="multipart/form-data">\n
                                                <tr style="border-left: 1px solid black;"><td>\n
@@ -205,13 +207,47 @@ my $prc_hdr = $PRC_WIDTH-2;
                                                         <input type="submit" name="Submit" value="Submit"/></p></td></tr>\n
                                                </form>\n
                                                 <tr><td style="text-align:right"><H3>To Server -> $sys -> $dbname</H3></td></tr>
-                                       </table><hr>
-
-
+                                       </table>
+                                       </div>
+                                       
                                        <br><div><a href="#top">&#x219F;</a>&nbsp;&nbsp;&nbsp;[<a href="config.cgi?csv=1">Export Log to CSV</a>] &nbsp;
                                         [<a href="config.cgi?csv=2">View the Log in CSV Format</a>]</div>\n                                    
                                        <br><div>[<a href="config.cgi?csv=3">Export Categories to CSV</a>] &nbsp;
-                                       [<a href="config.cgi?csv=4">View the Categories in CSV Format</a>]<a name="bottom"/></div>\n                                    
+                                       [<a href="config.cgi?csv=4">View the Categories in CSV Format</a>]</div>\n
+                                       <hr>
+
+                                       <center>
+                                       <div id="rz" style="text-align:left; position:relative;width:600px;">
+                                       <h2>E-Tags Specs</h2>                                   
+                                       <p>
+                                       <b>&#60;&#60;B&#60;<i>{Text To Bold}</i><b>&#62;</b>
+                                       </p>
+                                       <p>
+                                       <b>&#60;&#60;TITLE&#60;<i>{Title Text}</i><b>&#62;</b>
+                                       </p>
+                                       <p>
+                                       <b>&#60;&#60;IMG&#60;<i>{url to image}</i><b>&#62;</b>
+                                       </p>
+                                       <p>
+                                               <b>&#60;&#60;FRM&#60;<i>{file name}_frm.png}</i><b>&#62;</b><br><br>
+                                               *_frm.png images file pairs are located in the ./images folder of the cgi-bin directory.<br>
+                                               These are manually resized by the user. Next to the original.
+                                               Otherwise considered as stand alone icons. *_frm.png Image resized to ->  width="210" height="120"
+                                               <br><i>Example</i>:
+                                               <pre>
+               ../cgi-bin/images/
+                       my_cat_simon_frm.png
+                       my_cat_simon.jpg                                                                                                                         
+                                               </pre>In loge entry, place:
+                                               <pre>
+       &#60;&#60;FRM&#62;my_cat_simon_frm.png&#62; &#60;&#60;TITLE&#60;Simon The Cat&#62;
+       This is my pet, can you hold him for a week while I am on holiday?
+            </pre>
+                                               <h3>Log Page Particulars</h3>
+                                               &#x219F; or &#x21A1; - Jump links to top or bottom of page respectivelly.
+                                       </p>
+                                       </div>
+                                       </center><a name="bottom"/>
                                        <hr>
        );
 
index b4ea4b8b990c2f97b442c283175e5a28221e8e30..9f63156579316fa6bc1ffbe4c081e0bb76afe55b 100755 (executable)
@@ -30,7 +30,7 @@ our $LOG_PATH    = '../../dbLifeLog/';
 our $SESSN_EXPR  = '+30m';
 our $DATE_UNI    = '0';
 our $RELEASE_VER = '1.3';
-our $AUTHORITY   = 'admin';
+our $AUTHORITY   = '';
 #END OF SETTINGS
 
 my $cgi = CGI->new;
@@ -258,7 +258,8 @@ while(my @row = $st->fetchrow_array()) {
                                        $lnk =~ s/.jpg/.gif/;
                                }
                        }
-                       $lnk = qq(\n<a href="./images/$lnk" style="border=0;" target="_IMG"><img src="./images/$sub" width="210" height="120" class="tag_FRM"/></a>);
+                       $lnk = qq(\n<a href="./images/$lnk" style="border=0;" target="_IMG">
+                       <img src="./images/$sub" width="210" height="120" class="tag_FRM"/></a>);
                }else{
                        #TODO fetch from web locally the original image.
                        $lnk = qq(\n<img src="$lnk" width="210" height="120" class="tag_FRM"/>);
@@ -266,7 +267,7 @@ while(my @row = $st->fetchrow_array()) {
                $tags .= qq(<input id="tag$id" type="hidden" value="$log"/>\n); 
            $log=~s/<<FRM<(.*?)>/$lnk/o;
        }
-       else{
+       
                        #Replace with a full link an HTTP URI
                        my @chnks = split(/($re_a_tag)/si , $log) ;  
                                foreach my $ch_i ( @chnks ) {
@@ -275,7 +276,7 @@ while(my @row = $st->fetchrow_array()) {
                                                        $ch_i =~ s/($RE{URI}{HTTP})/<a href="$1" target=_blank>$1<\/a>/gsi;
                        }       
                        $log = join('' , @chnks);
-       }
+       
 
        while ($log =~ /<<B</){
           my $idx = $-[0];
index a6dc3efda55efe7525651de648e6e0d71ce2dbba..86ca7232bdfa3eacede6a576401e0f2048ec01db 100644 (file)
@@ -2,7 +2,7 @@
 00|$RELEASE_VER = 1.3
 01|$REC_LIMIT   = 25
 03|$TIME_ZONE   = Australia/Sydney
-05|$PRC_WIDTH   = 60;
+05|$PRC_WIDTH   = 70
 08|$LOG_PATH    = ../../dbLifeLog/
 10|$SESSN_EXPR  = +30m
 12|$DATE_UNI    = 0