From: Metabox Date: Tue, 6 Aug 2019 21:25:20 +0000 (+1000) Subject: Fixed pnl toggling and new help panel. X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=f2302b4c16461839053eb987861177af8c1da7d3;p=LifeLog.git Fixed pnl toggling and new help panel. --- diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index 5e7705d..7e56b53 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -181,7 +181,7 @@ $st = $db->prepare($stmtCat); $rv = $st->execute() or die or die "

Error->" & $DBI::errstri & "

"; my $cats = qq(  RTF Document - -
  +
@@ -680,8 +679,8 @@ _TXT ); @@ -711,6 +710,7 @@ _TXT $srh .= '
Search/View By - $sp1 - $sp2 + $sp1 + $sp2
'; my $quill = &quill( $cgi->param('submit_is_edit') ); + my $help = &help; # #Page printout from here! @@ -725,19 +725,21 @@ qq(
+Log
Stats
Config
-Delete
-Search
-Show All
+Delete
+Search
+Help
+Show All
$sm_reset_all
LOGOUT - -
\n$frm\n
\n +
$frm
\n
$srh
$quill +
$help
\n$tbl\n

View Statistics

Configure Log
@@ -1088,9 +1090,7 @@ sub authenticate { case "FRAME_SIZE" { $FRAME_SIZE = $r[2] } case "RTF_SIZE" { $RTF_SIZE = $r[2] } else { - print "Unknow variable setting: " - . $r[1] . " == " - . $r[2]; + print "Unknow variable setting: " . $r[1] . " == " . $r[2]; } } @@ -1124,8 +1124,8 @@ sub quill{ return <<___STR; @@ -1184,3 +1184,65 @@ return <<___STR; ___STR } + +sub help{ +return <<___STR; + + + +___STR +} \ No newline at end of file diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js index da47fd6..cc9db52 100644 --- a/htdocs/cgi-bin/wsrc/main.js +++ b/htdocs/cgi-bin/wsrc/main.js @@ -5,15 +5,13 @@ var _MAP = new Map(); var MNU_SCROLLING = false; -var SRCH_TOGGLE = true; var QUILL, QUILL_PNL; var Delta; var RTF_SET = false; var CHANGE; -var _collpsd_toggle = false; -var _collpsd_toggle2 = false; +var _show_all = true; var DEF_BACKGROUND = 'white'; @@ -142,21 +140,6 @@ function loadedBody(toggle) { } -function hideLog() { - $("#div_log").hide(); - return false; -} - -function hideSrch() { - $("#div_srh").hide(); - return false; -} - -function hideDoc() { - $("#tbl_doc").hide(); - return false; -} - function encodeText(el) { var el = $("#frm_entry [name=log]"); var txt = el.val(); @@ -325,6 +308,7 @@ function selectAllLogs() { function deleteSelected() { $("#del_sel").click(); + return false; } @@ -367,6 +351,59 @@ function viewAll() { } + +var RTF_DOC_RESIZED = false; +var RTF_DOC_ORIG; +function resizeDoc() { + var css = $("#editor-container").prop('style'); + if(RTF_DOC_RESIZED){ + RTF_DOC_RESIZED = false; + css.height = RTF_DOC_ORIG; + } + else{ + RTF_DOC_RESIZED = true; + RTF_DOC_ORIG = css.height; + css.height = '480px'; + } + +} +function resetDoc(){ + if (RTF_SET) { + QUILL.setText(""); + } + $("#submit_is_edit").val("0"); + toggleDoc(true); +} + + + +function resetView() { + $("#frm_srch input").val(""); + $("#idx_cat").val(0); + $('#vc>option[value="0"]').prop('selected', true); + + $("#frm_srch").submit(); +} + +function updateSelCategory(sel) { + if (sel.id == "ec") { + var cat = $("#idx_cat"); + cat.value = sel.options[sel.selectedIndex].value; + } +} + +function toggleVisibility(target, ensureOff) { + if (!ensureOff) { + $(target).toggle(); + } else { + $(target).hide(); + } +} + + + + + function toggleDoc(whole) { @@ -416,102 +453,64 @@ function toggleDoc(whole) { } -var RTF_DOC_RESIZED = false; -var RTF_DOC_ORIG; -function resizeDoc() { - var css = $("#editor-container").prop('style'); - if(RTF_DOC_RESIZED){ - RTF_DOC_RESIZED = false; - css.height = RTF_DOC_ORIG; - } - else{ - RTF_DOC_RESIZED = true; - RTF_DOC_ORIG = css.height; - css.height = '480px'; - } - -} -function resetDoc(){ - if (RTF_SET) { - QUILL.setText(""); - } - $("#submit_is_edit").val("0"); - toggleDoc(true); -} - -function toggleSearch() { - $("html, body").animate({ scrollTop: 0 }, "slow"); - if (SRCH_TOGGLE) { - $("#div_srh").show(); - $("#btn_srch").text("Hide Search"); - SRCH_TOGGLE = false; - } else { - $("#div_srh").hide(); - $("#btn_srch").text("Show Search"); - SRCH_TOGGLE = true; - } +function hide(id) { + $(id).hide(); + return false; } -function resetView() { - $("#frm_srch input").val(""); - $("#idx_cat").val(0); - $('#vc>option[value="0"]').prop('selected', true); - - $("#frm_srch").submit(); +function show(id) { + $(id).show(); + return false; } -function updateSelCategory(sel) { - if (sel.id == "ec") { - var cat = $("#idx_cat"); - cat.value = sel.options[sel.selectedIndex].value; +function toggle(id, mtoggle) { + //Menu button untoggle it up first. Complex interaction situation. + if(mtoggle){ + if(!$(id+" .collpsd").is(":visible")){ + $(id+" .collpsd").show(); + $(id).show(); + } + else{ + $(id).toggle(); + } + } -} - -function toggleVisibility(target, ensureOff) { - if (!ensureOff) { - $(target).toggle(); - } else { - $(target).hide(); + else{ + $(id).toggle(); } + + $("html, body").animate({ scrollTop: 0 }, "fast"); + return false; } +function showAll() { -function toggleLog() { - if (!_collpsd_toggle) { - $("#div_log .collpsd").hide(); - _collpsd_toggle = true; - } else { - $("#div_log .collpsd").show(); - _collpsd_toggle = false; - } -} - -function toggleSrch() { - if (!_collpsd_toggle2) { - $("#div_srh .collpsd").hide(); - _collpsd_toggle2 = true; - } else { - $("#div_srh .collpsd").show(); - _collpsd_toggle2 = false; - } -} - -function showCat() { - $('#cat_desc').show(); -} + show("#menu"); + + if(_show_all){ + $("#lnk_show_all").text("Hide All"); + show('#cat_desc'); + show("#div_log"); + show("#div_srh"); + show("#tbl_hlp"); + show("#tbl_doc"); + _show_all = false; + } + else{ + $("#lnk_show_all").text("Show All"); + hide('#cat_desc'); + hide("#div_log"); + hide("#div_srh"); + hide("#tbl_hlp"); + hide("#tbl_doc"); + _show_all = true; + } + + + $("html, body").animate({ scrollTop: 0 }, "fast"); -function showAll() { - $("#menu").show(); - $('#cat_desc').show(); - $("#div_log").show(); - $("#div_srh").show(); - $("#tbl_doc").show(); - _collpsd_toggle = false; - _collpsd_toggle2 = false; - $("#btn_srch").text("Hide Search"); - SRCH_TOGGLE = false; return false; } @@ -608,7 +607,7 @@ function saveRTFResult(result) { console.log("Result->" + result); var obj = JSON.parse(result); //alert(obj.response); - $("html, body").animate({ scrollTop: 0 }, "fast"); + $("html, body").animate({ scrollTop: 0 }, "fast"); display(obj.response); if(obj.log_id>0){ //update under log display