From: Will Budic Date: Wed, 4 Oct 2023 06:01:20 +0000 (+1100) Subject: upd. nav. style l&f. X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=c22ec94d99989cdeebf547b17540dd7278925cd5;p=LifeLog.git upd. nav. style l&f. --- diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi index da10bb5..207f220 100755 --- a/htdocs/cgi-bin/config.cgi +++ b/htdocs/cgi-bin/config.cgi @@ -83,13 +83,15 @@ Config
Log
Stats
-Jump to Sections
-[Categories]
-[System]
-[DB Fix]
-[Pass]
-[Backup] - +
+ Jump to Sections 
+Categories
+System
+DB Fix
+Pass
+Backup
+
+

LOGOUT @@ -363,7 +365,7 @@ my $frmDB = qq( Extra ActionDescription Reset SettingsResets system settings to default values. Wipe SettingsWipes system settings to be forced from the config file (will initiate logoff). - Reset CategoriesResets Categories to factory values (will initiate logoff). + Reset CategoriesResets Categories to factory values (will initiate logoff). Delete by Category
$catsSelects and displays by category logs to delete. Delete from Date
@@ -449,14 +451,14 @@ print qq( ↟ Configuration status -> $status ↡
-
+
- + - + - + @@ -476,7 +478,7 @@ print qq( - + +

Backup File Format

$bck_list
$bck_list
Notice - Uploads might fail on large backups, corrupt file, and/or due to browser settings.
@@ -464,7 +466,7 @@ print qq(

CSV File Format

Notice: (This is an obsolete feature, use is not recommended!)
Export Categories:   @@ -488,7 +490,7 @@ print qq(
Export Log:$inpCVS -

↟ Go to Top of page
@@ -514,13 +516,13 @@ print qq(
  • Restoration might not be possible after an server application upgrade.
  • Restoration of old backups is not made possible or is safe, on new stable application releases.
    • Upgrade your application after restoring it first, as an upgrade will/might migrate structure and data.
    • -
  • - Restoration will import on an previous date backuped data, in case when recreating a newly created same alias database. +
  • + Restoration will import on an previous date backuped data, in case when recreating a newly created same alias database.
    • For example: If the database file has been deleted or is blank on login, you than can run a restore, if you have an backup, for given server.
    • - - - + + +

  • Purpose

      @@ -531,7 +533,7 @@ print qq(

    • -
    +
    @@ -562,8 +564,8 @@ sub getHeader { -type => 'text/css', -src => 'wsrc/tip-yellowsimple/tip-yellowsimple.css' }, - { -type => 'text/css', -src => Settings::theme('css') }, { -type => 'text/css', -src => 'wsrc/effects.css' }, + { -type => 'text/css', -src => Settings::theme('css') }, ], -script => [ { -type => 'text/javascript', -src => 'wsrc/main.js' }, @@ -921,7 +923,7 @@ sub processDBFix { } if ($rs_syst) { - print "Doing resetSystemConfiguration next..." if &Settings::debug; + print "Doing resetSystemConfiguration next..." if &Settings::debug; &resetSystemConfiguration(); print "Doing resetSystemConfiguration next..." if &Settings::debug; }elsif ($wipe_ss) { @@ -1047,14 +1049,14 @@ sub renumerate { sub resetSystemConfiguration { - + my ( $id, $name, $value, $desc); my $cnf = new CNFParser( &Settings::logPath . 'main.cnf' ); my $inData = 0; my $err = ""; my %vars = {}; my @lines = split( '\n', $cnf->anon('CONFIG') ); - + try { my $insert = $db->prepare('INSERT INTO CONFIG VALUES (?,?,?,?)'); my $update = $db->prepare('UPDATE CONFIG SET VALUE=? WHERE ID=?;'); @@ -1854,7 +1856,7 @@ sub cats { sub error { my $url = $cgi->url( -path_info => 1 ); print -qq(
    +qq(
    $ERROR ); print "

    CGI Parameters

      "; diff --git a/htdocs/cgi-bin/index.cnf b/htdocs/cgi-bin/index.cnf index a181e45..5abe045 100644 --- a/htdocs/cgi-bin/index.cnf +++ b/htdocs/cgi-bin/index.cnf @@ -20,12 +20,12 @@ [@@[wsrc/jquery-ui.js]@@] ]JS] [CSS[ - [@@[wsrc/main.css]@@] [@@[wsrc/effects.css]@@] [@@[wsrc/feeds.css]@@] [@@[wsrc/jquery-ui.css]@@] [@@[wsrc/jquery-ui.theme.css]@@] [@@[wsrc/jquery-ui.theme.css]@@] + [@@[wsrc/main.css]@@] ]CSS] - -   Page   + +   Page   - +
      Index
      diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi index e8309ab..7e02acd 100755 --- a/htdocs/cgi-bin/login_ctr.cgi +++ b/htdocs/cgi-bin/login_ctr.cgi @@ -63,12 +63,13 @@ try{ {-type => 'text/javascript', -src => 'wsrc/feeds.js'}, {-type => 'text/javascript', -src => 'wsrc/jquery.js'}, {-type => 'text/javascript', -src => 'wsrc/jquery-ui.js'}], - -style => [ {-type => 'text/css', -src => $css}, + -style => [ {-type => 'text/css', -src => 'wsrc/effects.css'}, {-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 => 'wsrc/jquery-ui.theme.css'}], + {-type => 'text/css', -src => $css} + ], -onload => "onBodyLoadGeneric()" ); @@ -106,10 +107,10 @@ HTML - -   Menu   + +   Menu   - +
      diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index 8796953..254ed84 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -1074,10 +1074,12 @@ else{
    Log
    - - - +
    +   +   +   +
    Search
    Delete
    @@ -1629,8 +1631,8 @@ sub outputPage { { -type => 'text/css', -src => 'wsrc/quill/monokai-sublime.min.css' }, { -type => 'text/css', -src => 'wsrc/quill/quill.snow.css' }, { -type => 'text/css', -src => 'wsrc/jquery.sweet-dropdown.css' }, - { -type => 'text/css', -src => Settings::theme('css') }, { -type => 'text/css', -src => 'wsrc/effects.css' }, + { -type => 'text/css', -src => Settings::theme('css') }, ], -script => [ { -type => 'text/javascript', -src => 'wsrc/main.js' }, diff --git a/htdocs/cgi-bin/stats.cgi b/htdocs/cgi-bin/stats.cgi index 5769bb7..0893a2d 100755 --- a/htdocs/cgi-bin/stats.cgi +++ b/htdocs/cgi-bin/stats.cgi @@ -24,7 +24,7 @@ require Settings; my $db = Settings::fetchDBSettings(); my $cgi = Settings::cgi(); my $sss = Settings::session(); -my $sid = Settings::sid(); +my $sid = Settings::sid(); my $dbname = Settings::dbFile(); my $alias = Settings::alias(); @@ -46,8 +46,8 @@ my $CSS=<<_____CSS; } .info span { - border: 1px solid black; - margin-top: 5px; + border: 1px solid black; + margin-top: 5px; float: left; width:97% } @@ -71,22 +71,22 @@ my $CSS=<<_____CSS; display:table-row-group; } .cell1 { - display: table-cell; + display: table-cell; padding: 5px; - border-bottom: solid 1px; + border-bottom: solid 1px; border-right: solid 2px; vertical-align: top; width: 10%; } .cell2 { - display:table-cell; + display:table-cell; padding: 5px; border-bottom: solid 1px; vertical-align: top; width:25%; } .cell3 { - display:table-cell; + display:table-cell; padding: 5px; border-bottom: solid 1px; vertical-align: top; @@ -100,7 +100,6 @@ print $cgi->start_html(-title => "Log Data Stats", {-type => 'text/javascript', -src => 'wsrc/jquery.js'}, {-type => 'text/javascript', -src => 'wsrc/jquery-ui.js'}], -style => [{-type => 'text/css', -src => 'wsrc/jquery-ui.css'}, - {-type => 'text/css', -src => 'wsrc/jquery-ui.theme.css'}, {-type => 'text/css', -src => 'wsrc/jquery-ui.theme.css'}, {-type => 'text/css', -src => Settings::theme('css')}, {-script=>$CSS} @@ -147,12 +146,12 @@ my $hardware_status = "Host: $hst
    ".join("\t", map { defined ? $_ : '' $hardware_status =~ s/^(\w+:)/$1<\/b>/m; #$hardware_status =~ s/(\t\w+:)/$1<\/b>/gms; $hardware_status =~ s/\t+/
    /gm; #TODO: This temp. resolves the regex needs to be adjusted so we join with
    - $hardware_status =~ s/Memory:/
    Memory: <\/b>/g; + $hardware_status =~ s/Memory:/
    Memory: <\/b>/g; $hardware_status =~ s/up\s/Server is up: <\/b>/g; -my $log = "".$hardware_status.""."
    \n".`df -h -l -x tmpfs`."
    "; +my $log = "".$hardware_status.""."
    \n".`df -h -l -x tmpfs`."
    "; ### - Settings::toLog($db, $log); + Settings::toLog($db, $log); ### my $prc = 'ps -eo size,pid,user,command --sort -size | awk \'{ hr=$1/1024 ; printf("%13.2f Mb ",hr) } { for ( x=4 ; x<=NF ; x++ ) { printf("%s ",$x) } print "" }\''; my $processes = qx($prc | sort -u -r -); @@ -179,7 +178,7 @@ my $tbl = qq(
    Number of Records:
    $log_rc
    -
    +
    No. of Records This Year:
    $log_this_year_rc
    @@ -202,7 +201,7 @@ my $tbl = qq(
    Private IP
    $IPPrivate
    -
    +
    Server Info
    @@ -214,6 +213,7 @@ print qq( +
    ); @@ -225,7 +225,7 @@ print qq(
     
    - +
    Status & Information $tbl @@ -233,7 +233,7 @@ print qq(
     
    -
    +
    Server Side Processes 
    $processes
    diff --git a/htdocs/cgi-bin/wsrc/effects.css b/htdocs/cgi-bin/wsrc/effects.css index 2667eb7..6a6926b 100644 --- a/htdocs/cgi-bin/wsrc/effects.css +++ b/htdocs/cgi-bin/wsrc/effects.css @@ -29,13 +29,14 @@ margin: 0; margin-top:5px; border: 2px solid #94cde7; - padding: 5px; + padding: 5px; font-size:small; - background: #ccffff2e; + background: #ccffff2e; color: black; - margin-left: 90.5vw; - filter: drop-shadow( 10px 8px 5px #3e6f70); + margin-left: 90.5vw; + filter: drop-shadow( 10px 8px 5px #3e6f70); } + #menu_page a:link { color: #1c3535 } diff --git a/htdocs/cgi-bin/wsrc/main_moon.css b/htdocs/cgi-bin/wsrc/main_moon.css index dc59314..1b82d02 100644 --- a/htdocs/cgi-bin/wsrc/main_moon.css +++ b/htdocs/cgi-bin/wsrc/main_moon.css @@ -240,26 +240,52 @@ img { color: white; background-color: #363531; } +/*extends properties in effects.css*/ +#menu_page { + border: 1px solid aliceblue; + padding: 8px; + filter: drop-shadow(10px 8px 5px #577272); +} #frm_login { vertical-align: middle; margin: 0; } +.marg-top-2{ + margin-top: 2px; +} +.nav_data{ +margin-top: 5px; +border: 1px solid; +padding: 5px; +} - -.ui-button, -.ui-button-text .ui-button { +.ui-icon,.menu_title { + background-color: aliceblue; + font-weight: bolder; + color: #070707; +} +.ui-button { font-size: 12px !important; } +.ui-button:hover { + background: #a0d7dc; + background-image: none; + color: #000000 !important; +} +.ui-selectmenu-button:{ + background-image: none; +} .ui-menu { list-style: none; padding: 10px; margin: 0; display: block; - width: 227px; text-align: left; + background-image: none; + background: #e4f1fb; } .ui-menu .ui-menu { @@ -270,7 +296,11 @@ img { margin: 0; padding: 0; width: 200px; + color: #000000; } +.ui-menu .ui-menu-item-wrapper { + color: #000000; + } .ui-menu .ui-menu-item a { text-decoration: none; diff --git a/htdocs/cgi-bin/wsrc/main_sun.css b/htdocs/cgi-bin/wsrc/main_sun.css index 26ffd56..5e9e9d8 100644 --- a/htdocs/cgi-bin/wsrc/main_sun.css +++ b/htdocs/cgi-bin/wsrc/main_sun.css @@ -15,7 +15,6 @@ body{ } p { - font-family: Bookman; margin-left: 70px; font-weight: bold; } @@ -29,7 +28,6 @@ pre{ table, th, td { - font-family: Bookman; border-collapse: collapse; padding: 5px; margin: auto; @@ -144,14 +142,6 @@ th, padding: 2%; margin: 0px auto; } -.login { - - vertical-align: middle; text-align:center; width: 60% !important; - background:black url('images/Sun-Rotating.gif'); - background-repeat: no-repeat; - background-repeat: space; - background-position-x: right; -} div#rz { border: 1px solid black; text-align: left; @@ -172,7 +162,13 @@ div#rz { border-right: 1px solid black; text-align: center; } - +.login { + vertical-align: middle; text-align:center; width: 60% !important; + background:black url('images/Sun-Rotating.gif'); + background-repeat: no-repeat; + background-repeat: space; + background-position-x: right; +} .edit { margin: 2px; padding: 2px; @@ -238,29 +234,41 @@ img { margin-left: 91%; } +#menu_page { + border: 2px solid #C2B034; +} +.marg-top-2{ + margin-top: 2px; +} + #frm_login { vertical-align: middle; margin: 0; } - +.ui-icon,.menu_title { + background-color: gold; + font-weight: bolder; +} .ui-button { font-size: 12px !important; - color: #b87a1d #e4f1fb } - -.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: #ffdf00; - font-weight: bold; - color: #b87a1d #e4f1fb +.ui-button:hover { + background: #fad900; + background-image: none; + color: #000000 !important; } +.ui-selectmenu-button:{ + background-image: none; +} +.ui-selectmenu-button:hover{ + background-image: none; + background: #fad900; +} + .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; - font-weight: bold; - color: #b87a1d #e4f1fb } .dropdown-menu table td{ color:rgb(226, 34, 34); @@ -296,8 +304,6 @@ img { border: 1px solid #ead5ae; background-color: #d4af37; background: #e9ff27; - font-weight: bold; - color: #e4f1fb; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, @@ -390,19 +396,19 @@ html .ui-button.ui-state-disabled:active { color:midnightblue; } a:link { - color: #f4f80f + color: #5c00ff; +} +a:visited { +color: #d7165a; +font-style: italic; +} +a:hover { + color: #000000; + font-style:normal; +} +a:active { + color: #1eff00; } - a:visited { - color: #0c0c0c; - } - - a:hover { - color: #2d7081; - font-style:normal; - } - a:active { - color: #1eff00; - } #sss_status{ font-size: smaller; font-style: italic;