From: Will Budic Date: Thu, 30 Nov 2023 08:48:10 +0000 (+1100) Subject: Started work, revisit of L&F. X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=b6fa6710cb64ef152ad788940f1e4c2849c7f69f;p=LifeLog.git Started work, revisit of L&F. --- diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi index 1640cd6..71913fb 100755 --- a/htdocs/cgi-bin/login_ctr.cgi +++ b/htdocs/cgi-bin/login_ctr.cgi @@ -23,6 +23,7 @@ BEGIN { } my $cgi = CGI->new(); + my $session = CGI::Session->new("driver:File",$cgi, {Directory=>&Settings::logPath, SameSite=>'Lax'}); my $sssCreatedDB = $session->param("cdb"); my $sid=$session->id(); @@ -57,10 +58,11 @@ try{ my ($css,$colBG,$colSHDW) = (Settings::theme('css'),Settings::theme('colBG'),Settings::theme('colSHDW')); print $cgi->header(-expires=>"0s", -charset=>"UTF-8", -cookie=>$cookie); print $cgi->start_html( + -dtd=>"html", -title => "Personal Log Login", # -BGCOLOR => $colBG, - -script=> [ {-type => 'text/javascript', -src => 'wsrc/main.js'}, - {-type => 'text/javascript', -src => 'wsrc/feeds.js'}, + -script=> [ {-type => 'text/javascript', -src => 'wsrc/main.js'}, + {-type => 'text/javascript', -src => 'wsrc/feeds.js'}, {-type => 'text/javascript', -src => 'wsrc/jquery.js'}, {-type => 'text/javascript', -src => 'wsrc/jquery-ui.js'}], -style => [ @@ -68,21 +70,20 @@ try{ {-type => 'text/css', -src => 'wsrc/feeds.css'}, {-type => 'text/css', -src => 'wsrc/jquery-ui.css'}, {-type => 'text/css', -src => 'wsrc/jquery-ui.theme.css'}, - {-type => 'text/css', -src => $css} + {-type => 'text/css', -src => $css} ], -onload => "onBodyLoadGeneric()" ); - my @ht = split(m/\s/,`hostname -I`); - my $hst = ""; - $hst = `hostname` . "($ht[0])" if (@ht); + my @ht = (`hostname -I` =~ m/(.*)\s/g); + my $host = `hostname`; $host =~ s/\s*$//g; $host .= "($ht[0])" if (@ht); $frm = < - + @@ -98,42 +99,43 @@ try{ Make sure you note down your password. - +
Welcome to Life Log

Welcome to Life Log
Alias:
Host -> $hst
Host -> $host
HTML - print qq(
-
-
- - - - -   Menu   - - - - -
- Index
- Demo
- Feeds
- Contact
+ print qq( +

 + + + +
+
+ + + +
); Settings::printDebugHTML($DBG) if Settings::debug(); print $cgi->end_html; @@ -938,4 +940,3 @@ EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) Source : https://github.com/wbudic/LifeLog Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md =cut copyright - diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index 0799a7a..3ba9442 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -828,6 +828,7 @@ if($isPUBViewMode){ +

Please Wait...
 HTML } @@ -849,12 +850,7 @@ my $frm = qq(     - - -
Please Wait... -    Category:  - @@ -870,7 +866,7 @@ my $frm = qq( - Amount: + Amount:   Marks as: @@ -1074,7 +1070,7 @@ else{
- Log
+ Log

    @@ -1121,12 +1117,12 @@ my $audio = &Settings::audioEnabled ? qq( toBuf ( qq( $sideMenu -
- +
$frm
$quill
$srh
$help
+
\n$log_output\n

$tail
@@ -1397,6 +1393,7 @@ sub authenticate { print $cgi->header( -expires => "+0s", -charset => "UTF-8" ); print $cgi->start_html( + -dtd=>"html", -title => "Personal Log Login", -BGCOLOR => Settings::theme('colBG'), -script =>{ -type => 'text/javascript', -src => 'wsrc/main.js' }, @@ -1613,6 +1610,7 @@ sub outputPage { #Bug 26 -Fixed here by prefixing to collected html body buffer. $BUFFER = $cgi->start_html( + -dtd=>"html", -title => "Personal Log", -BGCOLOR => Settings::theme('colBG'), -onload => "onBodyLoad('$toggle','".&Settings::language."','".&Settings::timezone."','$today','".&Settings::sessionExprs."','$rs_cur',".&Settings::dbVLSZ.");", diff --git a/htdocs/cgi-bin/static b/htdocs/cgi-bin/static index 884d083..a473970 120000 --- a/htdocs/cgi-bin/static +++ b/htdocs/cgi-bin/static @@ -1 +1 @@ -/home/will/LifeLog/htdocs/ \ No newline at end of file +/home/will/dev_new/LifeLog/htdocs/ \ No newline at end of file diff --git a/htdocs/cgi-bin/system/modules/CNFParser.pm b/htdocs/cgi-bin/system/modules/CNFParser.pm index 24ff05f..61c7c0f 100644 --- a/htdocs/cgi-bin/system/modules/CNFParser.pm +++ b/htdocs/cgi-bin/system/modules/CNFParser.pm @@ -19,7 +19,7 @@ require CNFDateTime; ##no critic qw(Subroutines::RequireFinalReturn) ##no critic Perl::Critic::Policy::ControlStructures::ProhibitMutatingListFunctions -use constant VERSION => '3.0'; +use constant VERSION => '3.1'; our @files; our %lists; our %properties; @@ -43,7 +43,7 @@ our %ANONS; our %RESERVED_WORDS = map +($_, 1), qw{ CONST CONSTANT DATA DATE VARIABLE VAR FILE TABLE TREE INDEX - VIEW SQL MIGRATE DO LIB PROCESSOR + VIEW SQL MIGRATE DO LIB PROCESSOR APP_SETTINGS PLUGIN MACRO %LOG INCLUDE INSTRUCTOR }; sub isReservedWord { my ($self, $word)=@_; return $word ? $RESERVED_WORDS{$word} : undef } @@ -211,7 +211,7 @@ package PropertyValueStyle { } sub setPlugin{ my ($self, $obj) = @_; - $self->{plugin} = $obj; + $self->{plugin} = \$obj; } sub result { my ($self, $value) = @_; @@ -322,6 +322,7 @@ sub property { my($self, $name) = @_; if($ref eq 'ARRAY'){ return @{$ret} }elsif($ref eq 'PropertyValueStyle'){ + return ${$ret->{plugin}} if $ret->{instructor} eq 'APP_SETTINGS'; return $ret; } else{ @@ -543,6 +544,9 @@ sub doInstruction { my ($self,$e,$t,$v) = @_; elsif($t eq 'MACRO'){ $instructs{$e}=$v; } + elsif($t eq 'APP_SETTINGS'){ + $self->instructPlugin(InstructedDataItem -> new($e, 'APP_SETTINGS', $v)); + } elsif(exists $instructors{$t}){ if(not $instructors{$t}->instruct($e, $v) && $self->{STRICT}){ CNFParserException->throw("Instruction processing failed for '<<$e<$t>>'!\t"); @@ -939,7 +943,7 @@ sub parse { my ($self, $cnf_file, $content, $del_keys) = @_; }elsif($type eq 'InstructedDataItem'){ my $t = $struct->{ins}; if($t eq 'PLUGIN'){ - instructPlugin($self,$struct,$anons); + instructPlugin($self,$struct); } }else{warn "What is -> $struct type:$type ?"} } @@ -1003,15 +1007,15 @@ sub doInclude { my ($self, $prp_file) = @_; } sub instructPlugin { - my ($self, $struct, $anons) = @_; + my ($self, $struct) = @_; try{ - $properties{$struct->{'ele'}} = doPlugin($self, $struct, $anons); + $properties{$struct->{'ele'}} = doPlugin($self, $struct); $self->log("Plugin instructed ->". $struct->{'ele'}); }catch($e){ if($self->{STRICT}){ CNFParserException->throw(error=>$e); }else{ - $self->trace("Error @ Plugin -> ". $struct->toString() ." Error-> $@") + $self->trace("Error @ ".$struct->{ins}." -> ". $struct->toString() ." Error-> $@") } } } @@ -1143,16 +1147,27 @@ sub runPostParseProcessors { ### # Setup and pass to pluging CNF functionality. -# @TODO Current Under development. +# @TODO Currently Under development. ### sub doPlugin { - my ($self, $struct, $anons) = @_; - my ($elem, $script) = ($struct->{'ele'}, $struct->{'val'}); + my ($self, $struct) = @_; + my ($elem, $instructor, $script) = ($struct->{'ele'}, $struct-> {'ins'}, $struct->{'val'}); my $plugin = PropertyValueStyle->new($elem, $script); my $pck = $plugin->{package}; my $prp = $plugin->{property}; my $sub = $plugin->{subroutine}; - if($pck && $prp && $sub){ + if($instructor eq 'APP_SETTINGS'){ + $pck = 'ClassicAppSettings' if ! $pck; + ## no critic (RequireBarewordIncludes) + require "$pck.pm"; + my $obj = $pck -> new($plugin); + $sub = 'setup_with' if !$sub; + $obj-> $sub($self); + $plugin->setPlugin($obj); + $plugin->{instructor} = $instructor; + return $plugin; + } + elsif($pck && $prp && $sub){ ## no critic (RequireBarewordIncludes) require "$pck.pm"; #Properties are global, all plugins share a %Settings property if specifed, otherwise the default will be set from here only. @@ -1167,6 +1182,7 @@ sub doPlugin { my $res = $obj-> $sub($self, $prp); if($res){ $plugin->setPlugin($obj); + $plugin->{instructor} = $instructor; return $plugin; }else{ die "Sorry, the PLUGIN feature has not been Implemented Yet!" @@ -1458,4 +1474,9 @@ __END__ - MACRO 1. Value is searched and replaced by a property value, outside the property scripted. 2. Parsing abruptly stops if this abstract property specified is not found. - 3. Macro format specifications, have been aforementioned in this document. However make sure that your macro an constant also including the *$* signifier if desired. \ No newline at end of file + 3. Macro format specifications, have been aforementioned in this document. However make sure that your macro an constant also including the *$* signifier if desired. + - APP_SETTINGS - Provides external expected application settings defaults to the configuration. + 1. These are added and processed in place as they appear sequentionaly in the script. + 1. It can be made possible in the future, to meta instruct to run APP_SETTING at the processing or post processing stages of CNF parsing. + 2. These can be externally added constance type CNF items if are found missing or not specified in current cnf file or from includes. + 3. An application usually obtains its settings object as an CNF property. Decoupling the CNF from handling this, making it abstract to the parser. diff --git a/htdocs/cgi-bin/wsrc/effects.css b/htdocs/cgi-bin/wsrc/effects.css index 6a6926b..0601d71 100644 --- a/htdocs/cgi-bin/wsrc/effects.css +++ b/htdocs/cgi-bin/wsrc/effects.css @@ -48,8 +48,7 @@ } #menu_page a:hover { color: #04eefa; - font-style:bold; - } +} .menu_head { border: 2px solid #00000017; diff --git a/htdocs/cgi-bin/wsrc/feeds.css b/htdocs/cgi-bin/wsrc/feeds.css index 7919645..84379ac 100644 --- a/htdocs/cgi-bin/wsrc/feeds.css +++ b/htdocs/cgi-bin/wsrc/feeds.css @@ -121,4 +121,9 @@ display: flow-root; - +body::after{ + /* hide images */ + position:absolute; width:0; height:0; overflow:hidden; z-index:-1; + /* load images */ + content: url('images/Wedges-9.1s-64px.png') url('images/Sun-Rotating.gif'); + } diff --git a/htdocs/cgi-bin/wsrc/feeds.js b/htdocs/cgi-bin/wsrc/feeds.js index 51e3249..e3bf89b 100644 --- a/htdocs/cgi-bin/wsrc/feeds.js +++ b/htdocs/cgi-bin/wsrc/feeds.js @@ -3,7 +3,7 @@ function fetchFeeds(id){ ID = id?id:"#feeds"; var pnl =$(ID); pnl.html( - '
  P l e a s e    W a i t   !  
' + '
  P l e a s e    W a i t   !  
' ); pnl.show(); pnl.css('visibility','visible'); @@ -21,7 +21,7 @@ function fetchFeed(feed) { ID = '#feeds'; var pnl = $(ID); pnl.html( - '
    Please   Wait -> '+feed+' loading...  
' + '
    Please   Wait -> '+feed+' loading...  
' ); pnl.show(); pnl.css('visibility','visible'); diff --git a/htdocs/cgi-bin/images/Wedges-9.1s-64px.png b/htdocs/cgi-bin/wsrc/images/Wedges-9.1s-64px.png similarity index 100% rename from htdocs/cgi-bin/images/Wedges-9.1s-64px.png rename to htdocs/cgi-bin/wsrc/images/Wedges-9.1s-64px.png diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css index 9bd6815..345e8ea 100644 --- a/htdocs/cgi-bin/wsrc/main.css +++ b/htdocs/cgi-bin/wsrc/main.css @@ -8,7 +8,7 @@ body{ background-attachment: fixed; background-size: cover; } -.content { +.content{ margin: 0; padding:0; } @@ -72,15 +72,27 @@ th, #cat_desc { position: absolute; + max-width: 480px; + + display: flex; + align-items: center; + justify-content: center; + height: 40px; + padding: 15px; + margin: auto; + margin-left: 10px; + top: calc(100vh - 100px); + border: 2px solid #94cde7; - padding: 5px; - text-align: center; - background: #ccffff; - margin-top: 15px; - margin-left: 200px; - width: 280px; + font-weight: bolder; + background-color: #ccffff; + color: black; + text-decoration-style: wavy; +} +ui-menu,.ui-autocomplete { + background: #ccffff; } .span_cat { @@ -179,8 +191,6 @@ div#rz { } #al { - align-items: left; - align-content: left; text-align: left; } @@ -260,7 +270,7 @@ img { background-image: none; color: #000000 !important; } -.ui-selectmenu-button:{ +.ui-selectmenu-button{ background-image: none; } .ui-selectmenu-button:hover{ @@ -268,7 +278,23 @@ img { background: #00ddfa; } - +.dropdown-menu table td{ + color:rgb(226, 34, 34); + background: #98e6e6; + border-radius: 2pt; + padding:0px; + margin:2px; + text-align: left; + vertical-align: text-top; +} +.dropdown-menu tr td ul { + min-width:140px; + list-style:none; + background: #98e6e6; + box-shadow:0 3px 5px rgba(0,0,0,0.1); + padding:0; + margin:1px; +} @@ -279,8 +305,7 @@ img { font-weight: bold; } .ui-widget-content { - background: #183c76; - color: #362b36; + background: #98e6e6; } .ui-menu { list-style: none; @@ -306,7 +331,6 @@ img { display: block; padding: .2em .4em; line-height: 1.5; - zoom: 1; } .ui-menu .ui-menu-item a.ui-state-hover, @@ -356,7 +380,6 @@ a:visited { color: #472f80; } a:hover { - color: #ff4d21; font-style:normal; } a:active { diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js index 5c75218..380c148 100644 --- a/htdocs/cgi-bin/wsrc/main.js +++ b/htdocs/cgi-bin/wsrc/main.js @@ -23,6 +23,7 @@ var TIMEZONE; var DBI_LVAR_SZ; var EDIT_LOG_TXT = ""; + function onBodyLoadGeneric() { $("input[type=submit], input[type=reset], .ui-widget-content, button, .a_").button(); $("#btn_save_doc").button(); @@ -31,6 +32,8 @@ function onBodyLoadGeneric() { if(!LOCALE || LOCALE==="English"){ LOCALE = "en-US"; } + show("#menu_page"); + } function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) { @@ -256,16 +259,27 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) { }}); + // jQuery.fn.dispPos = function () { + // this.css("position","absolute"); + // this.css("top", Math.max(0, (($(window).height() - $(this).outerHeight())-320 ) + + // $(window).scrollTop()) + "px"); + // this.css("left", Math.max(0, (($(window).width() - $(this).outerWidth()) / 6) - 100 + + // $(window).scrollLeft()) + "px"); + // this.css( "zIndex", 8 ); + // return this; + // } + // margin-left: 10px; + // top: calc(100vh - 100px); + jQuery.fn.dispPos = function () { this.css("position","absolute"); - this.css("top", Math.max(0, (($(window).height() - $(this).outerHeight())-320 ) + - $(window).scrollTop()) + "px"); - this.css("left", Math.max(0, (($(window).width() - $(this).outerWidth()) / 6) - 100 + - $(window).scrollLeft()) + "px"); + // this.css("top", Math.max(0, $(window).height() - "100px")); + this.css("left", "10px"); this.css( "zIndex", 8 ); return this; } + jQuery.fn.dropdownPos = function (e,desc) { var pnl = $("#cat_desc"); var top = e.css('top'); @@ -418,8 +432,8 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) { source: AUTOWORDS }); }); - $('#main_table').css('visibility', 'visible'); display("Log page is ready!", 5); + $('#main_table').css('visibility', 'visible'); } @@ -1518,4 +1532,3 @@ function setPageSessionTimer(expires) { } return false; } - diff --git a/htdocs/cgi-bin/wsrc/main_earth.css b/htdocs/cgi-bin/wsrc/main_earth.css index db04c8a..522b4ce 100644 --- a/htdocs/cgi-bin/wsrc/main_earth.css +++ b/htdocs/cgi-bin/wsrc/main_earth.css @@ -74,14 +74,22 @@ th, #cat_desc { position: absolute; + max-width: 480px; + + display: flex; + align-items: center; + justify-content: center; + height: 40px; + padding: 15px; + margin: auto; + margin-left: 10px; + top: calc(100vh - 100px); + border: 2px solid #7a3d03; - padding: 5px; - text-align: center; - background: #d1663c; + font-weight: bolder; + background-color: #d1663c; color: #d8d8d8; - margin-top: 20px; - margin-left: 200px; - width: 280px; + text-decoration-style: wavy; } diff --git a/htdocs/cgi-bin/wsrc/main_moon.css b/htdocs/cgi-bin/wsrc/main_moon.css index 1b82d02..a7f4e66 100644 --- a/htdocs/cgi-bin/wsrc/main_moon.css +++ b/htdocs/cgi-bin/wsrc/main_moon.css @@ -80,16 +80,25 @@ th, #cat_desc { position: absolute; + max-width: 480px; + + display: flex; + align-items: center; + justify-content: center; + height: 40px; + padding: 15px; + margin: auto; + margin-left: 10px; + top: calc(100vh - 100px); + border: 2px solid #9bb6c3; - padding: 5px; - text-align: center; - background: #0f0f0f; + font-weight: bolder; + background-color: #0f0f0f; color: #d8d8d8; - margin-top: 20px; - margin-left: 200px; - width: 280px; + text-decoration-style: wavy; } + .span_cat { border:1px solid #9bb6c3; border-style: outset; diff --git a/htdocs/cgi-bin/wsrc/main_sun.css b/htdocs/cgi-bin/wsrc/main_sun.css index 5e9e9d8..e4001aa 100644 --- a/htdocs/cgi-bin/wsrc/main_sun.css +++ b/htdocs/cgi-bin/wsrc/main_sun.css @@ -40,6 +40,7 @@ div { } #div_log { + display: none; font-weight: bold; } #div_srh { @@ -73,19 +74,28 @@ th, padding-left: 5px; text-align: left; } + #cat_desc { position: absolute; + max-width: 480px; + + display: flex; + align-items: center; + justify-content: center; + height: 40px; + padding: 15px; + margin: auto; + margin-left: 10px; + top: calc(100vh - 100px); + border: 2px solid black; - padding: 5px; - text-align: center; - background: #D4AF37; - color:black; - margin-top: 20px; - margin-left: 200px; - width: 280px; - text-decoration-style: wavy; + font-weight: bolder; + background-color: gold; + color: black; + text-decoration-style: wavy; } + .span_cat { font-family: Bookman; border: 1px solid #b2f8ef; @@ -95,7 +105,8 @@ th, padding-right: 10px; padding-left: 10px; box-sizing: border-box; - width: auto;} + width: auto; +} #cat_lst { visibility: hidden; } @@ -177,14 +188,12 @@ div#rz { } #al { - align-items: left; - align-content: left; text-align: left; } .log { max-width:550px; - text-align: left; + /* text-align: left; */ word-wrap: break-word; white-space: normal; padding-left: 5px; @@ -257,7 +266,7 @@ img { background-image: none; color: #000000 !important; } -.ui-selectmenu-button:{ +.ui-selectmenu-button{ background-image: none; } .ui-selectmenu-button:hover{ @@ -268,7 +277,7 @@ img { .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active { border: 1px solid #ead5ae; background-color: #d4af37; - background: #fbff00; + background: gold; } .dropdown-menu table td{ color:rgb(226, 34, 34); @@ -289,13 +298,12 @@ img { } .ui-widget-header { border: 1px solid #40413e; - background: #fbff00; + background: #f0cc57;; color: #222222; - font-weight: bold; } .ui-widget-content{ border: 1px solid #dddddd; - background: #e9ff27; + background: #f0cc57; color: #362b36; }