From: Will Budic Date: Fri, 28 Feb 2020 19:59:28 +0000 (+1100) Subject: Fixed desc status position for categories. X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=82172b3dc40a55a22dfb8c31a1beb363c73b47ba;p=LifeLog.git Fixed desc status position for categories. --- diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index e8339b9..63ca1fc 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -44,7 +44,7 @@ if ( !$userid || !$dbname ) { my $database = &Settings::logPath . $dbname; my $dsn = "DBI:SQLite:dbname=$database"; my $db = DBI->connect( $dsn, $userid, $password, { PrintError => 0, RaiseError => 1 } ) - or LifeLogException->throw("Execute failed [$DBI::errstri]"); + or LifeLogException->throw("Connection failed [$DBI::errstri]"); my ( $imgw, $imgh ); #Fetch settings Settings::getConfiguration($db); diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css index 508d80f..29d675b 100644 --- a/htdocs/cgi-bin/wsrc/main.css +++ b/htdocs/cgi-bin/wsrc/main.css @@ -67,7 +67,10 @@ th, border-style: inset; padding: 2px; padding-right: 5px; - width: 180px; + width: 5cm; +} +#cat_lst { + visibility: hidden; } .r0 { @@ -171,10 +174,6 @@ img { margin-left: 90%; } -#cat_lst { - visibility: hidden; -} - #frm_login { vertical-align: middle; margin: 0; diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js index be1e19a..316afc1 100644 --- a/htdocs/cgi-bin/wsrc/main.js +++ b/htdocs/cgi-bin/wsrc/main.js @@ -181,6 +181,27 @@ function onBodyLoad(toggle, tz, today, expires, rs_cur) { return this; } + jQuery.fn.dropdownPos = function (e,desc) { + var pnl = $("#cat_desc"); + var top = e.css('top'); + var height= e.css('height'); + var width = e.css('width'); + var left = e.css('left'); + var pwidth = pnl.css('width'); + top = parseInt(top.replace(/px/, "")); + height = parseInt(height.replace(/px/, "")); + width = parseInt(width.replace(/px/, "")); + left = parseInt(left.replace(/px/, "")); + pwidth = parseInt(pwidth.replace(/px/, "")); + top += height - 5; + left -= (pwidth/2); + //pnl.html("["+left+","+top+","+height+","+width+"]"+desc); + pnl.html(desc); + pnl.css('top', top+'px'); + pnl.css('left', left+'px'); + pnl.show(); + } + $("#dropdown-standard a").click(function(e){ e.preventDefault(); @@ -195,8 +216,7 @@ function onBodyLoad(toggle, tz, today, expires, rs_cur) { if(pr){ var pnl = $("#cat_desc"); var desc = $("meta[id='cats["+pr+"]']").attr('content'); - pnl.html(desc); - pnl.show(); + $.fn.dropdownPos($("#dropdown-standard"), desc); } }).mouseleave(function(e){$("#cat_desc").hide();}); @@ -215,8 +235,7 @@ function onBodyLoad(toggle, tz, today, expires, rs_cur) { if(pr){ var pnl = $("#cat_desc"); var desc = $("meta[id='cats["+pr+"]']").attr('content'); - pnl.html(desc); - pnl.show(); + $.fn.dropdownPos($("#dropdown-standard-v"), desc); } }).mouseleave(function(e){$("#cat_desc").hide();}); @@ -236,8 +255,7 @@ function onBodyLoad(toggle, tz, today, expires, rs_cur) { if(pr){ var pnl = $("#cat_desc"); var desc = $("meta[id='cats["+pr+"]']").attr('content'); - pnl.html(desc); - pnl.show(); + $.fn.dropdownPos($("#dropdown-standard-x"), desc); } }).mouseleave(function(e){$("#cat_desc").hide();});