close min buttons.

diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi
index 7ff575888d20a94d8aab98867e4455698a77c295..b3b259922b0caced15d774232c9d78cfc745986e 100755 (executable)
--- a/htdocs/cgi-bin/login_ctr.cgi
+++ b/htdocs/cgi-bin/login_ctr.cgi
@@ -418,6 +418,7 @@ sub insertDefCats {
          $st = $_[0]->prepare('INSERT INTO CAT VALUES (?,?,?)'); 
                        $_[0]->begin_work();
                $st->execute(1, "Unspecified", "For quick uncategorised entries.");
+               $st->execute(2, "Document", "Large Protected RichText document log entry type.");
                $st->execute(3, "File", "Operating file system short log.");
                $st->execute(6, "System Log", "Operating system important log.");
                $st->execute(9, "Event", "Event that occured, meeting, historically important.");

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 3c04c1f9c08a83f9ae226bc0587800e43642b713..01c8992dc8f85d46421054c73be14a0052096c8c 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -362,10 +362,10 @@ while ( my @row = $st->fetchrow_array() ) {
               my $ext = substr( $lnk, index( $lnk, '.' ) );
               $lnk =~ s/_frm.png/$ext/;
               if ( not -e "./images/$lnk" ) {
-                  $lnk =~ s/$ext/.jpg/;
-                  if ( not -e "./images/$lnk" ) {
-                      $lnk =~ s/.jpg/.gif/;
-                }
+                   $lnk =~ s/$ext/.jpg/;
+                   if ( not -e "./images/$lnk" ) {
+                        $lnk =~ s/.jpg/.gif/;
+                   }
               }
               $lnk =
                 qq(\n<a href="./images/$lnk" style="border=0;" target="_IMG">
@@ -380,6 +380,23 @@ while ( my @row = $st->fetchrow_array() ) {
           }
           $log =~ s/<<FRM<(.*?)>/$lnk/o;
       }
+      elsif ( $log =~ /<<LIST</ ) {
+          my $idx = $-[0];
+          my $len = index( $log, '>', $idx ) - 7;
+          my $lst = substr( $log, $idx + 7, $len - $idx );
+          my $sub = "";        
+          my @arr = split(/\n/, $lst);
+          foreach my $ln (@arr) {
+              $ln =~ s/^\s*//g;
+              $sub .= "<li>$ln</li>" if length($ln)>0;
+          }
+          
+          $log = "<ul>$sub</ul>";
+          #$log =~ s/<<LIST<(.*?)>/$lst/o;
+         # print $lst;
+          
+      }
+
 
       #Replace with a full link an HTTP URI
       my @chnks = split( /($re_a_tag)/si, $log );
@@ -409,7 +426,7 @@ while ( my @row = $st->fetchrow_array() ) {
           my $sub = "<h3>" . substr( $log, $idx + 8, $len - $idx ) . "</h3>";
           $log =~ s/<<TITLE<(.*?)>/$sub/o;
       }
-
+      
       #Decode escaped \\n
       $log =~ s/\r\n/<br>/gs;
       $log =~ s/\n/<br>/gs;
@@ -507,13 +524,20 @@ $tbl .=
 <input id="rs_keys2" name="keywords" type="text" size="60"/></td>
 <td><input type="submit" value="Search"/></form></td></tr>
 </table>';
+my $COLLAPSED_LOG = 's';
+my ($sp1,$sp2);
+$sp1 =   '<span  class="ui-icon ui-icon-heart" style="float:right;"></span>';
+$sp2 = qq(<span  class="ui-icon ui-icon-circle-triangle-$COLLAPSED_LOG" style="float:right;"></span>);
+
 
 my $frm = qq(<a name="top"></a>
 <form id="frm_entry" action="main.cgi" onSubmit="return formValidation();">
        <table class="tbl" border="0" width="$PRC_WIDTH%">
        <tr class="r0"><td colspan="3"><b>* LOG ENTRY FORM *</b>
-    <a id="log_close" href="#" onclick="return hideLog();"><span  class="ui-icon ui-icon-heart" style="float:right;"></span></td></tr> 
-       <tr>
+    <a id="log_close" href="#" onclick="return hideLog();">$sp1</a>
+    <a id="log_close" href="#" onclick="return toggleLog();">$sp2</a>    
+    </td></tr> 
+       <tr class="collpsd">
        <td style="text-align:right; vertical-align:top; width:10%;">Date:</td>
        <td id="al" colspan="1" style="text-align:top; vertical-align:top"><input id="ed" type="text" name="date" size="18" value=")
   . $today->ymd . " "
@@ -526,12 +550,12 @@ $cats
                                <br><br><div id="cat_desc" name="cat_desc"></div>
                        </td>
        </tr>
-       <tr><td style="text-align:right; vertical-align:top">Log:</td>
+       <tr class="collpsd"><td style="text-align:right; vertical-align:top">Log:</td>
                <td id="al" colspan="2" style="text-align:top;">
                        <textarea id="el" name="log" rows="3" style="float:left; width:99%;" onChange="toggleVisibility('cat_desc',true)"></textarea>
                </td>   
        </tr>
-               <tr><td style="text-align:right"><a id="to_bottom" href="#bottom" title="Go to bottom of page.">&#x21A1;</a>&nbsp;Ammount:</td>
+       <tr class="collpsd"><td style="text-align:right"><a id="to_bottom" href="#bottom" title="Go to bottom of page.">&#x21A1;</a>&nbsp;Ammount:</td>
                <td id="al">
                        <input id="am" name="am" type="number" step="any">                      
                </td>
@@ -540,7 +564,7 @@ $cats
                                <input id="log_submit" type="submit" value="Submit"/></div>
                </td>           
        </tr>
-       <tr><td colspan="3"></td></tr>
+       <tr class="collpsd"><td colspan="3"></td></tr>
        </table>
        <input type="hidden" name="submit_is_edit" id="submit_is_edit" value="0"/>
        <input type="hidden" name="submit_is_view" id="submit_is_view" value="0"/>
@@ -555,28 +579,32 @@ $cats
 my $srh = qq(
        <form id="frm_srch" action="main.cgi">
        <table class="tbl" border="0" width="$PRC_WIDTH%">
-                                       <tr class="r0"><td colspan="4"><b>Search/View By</b></td></tr>
+                                       <tr class="r0"><td colspan="4"><b>Search/View By</b>
+      <a id="srch_close" href="#" onclick="return hideSrch();">$sp1</a>
+      <a id="srch_close" href="#" onclick="return toggleSrch();">$sp2</a>    
+                    
+                    </td></tr>
                );
 
 $srh .=
-qq(<tr><td align="right"><b>View by Category:</b></td><td>$cats_v</td><td></td>
-       <td colspan="1" align="left">
-       <button id="btn_cat" onclick="viewByCategory(this);" style="float:left">View</button>
-       <input id="idx_cat" name="category" type="hidden" value="0"></td></tr>
-       <tr><td align="right"><b>View by Date:</b></td>
+qq(<tr class="collpsd"><td align="right"><b>View by Category:</b></td>
+    <td align="left" colspan="2">$cats_v</td><td><button id="btn_cat" onclick="viewByCategory(this);" style="float:left">View</button>
+       <input id="idx_cat" name="category" type="hidden" value="0"></td>
+   </tr>
+   <tr class="collpsd"><td align="right"><b>View by Date:</b></td>
        <td align="left">
        From:&nbsp;<input name="v_from" type="text" size="16"/></td><td align="left">
        To:&nbsp;<input name="v_to" type="text" size="16"/>
        <td align="left"><button id="btn_dat" onclick="viewByDate(this);">View</button></td>
        </tr>
-       <tr><td align="right"><b>Keywords:</b></td>
+   <tr class="collpsd"><td align="right"><b>Keywords:</b></td>
                                <td colspan="2" align="left">
                                        <input id="rs_keys" name="keywords" type="text" size="60" value="$rs_keys"/></td>
                                <td align="left"><input type="submit" value="Search" align="left"></td></tr>);
 
 if ( $rs_keys || $rs_cat_idx || $stmD ) {
-      $srh .= '<tr><td align="left" colspan="3">
-       <button onClick="resetView()">Reset Whole View</button></td></tr>';
+      $srh .= '<tr class="collpsd"><td align="left" colspan="3"></td>
+       <td><button onClick="resetView()" stule="align:left">Reset Whole View</button></td></tr>';
 }
 
 $srh .= '</table></form><br>';

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index df2d9a9ee7a6afbc47133645630ad72f9063332d..055d922e809b5920f72d112c9227923f0ba5d21b 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -116,6 +116,11 @@ function hideLog() {
     return false;
 }
 
+function hideSrch() {
+    $("#div_srh").hide();
+    return false;
+}
+
 function encodeText(el) {
     var el = $("#frm_entry");
     var txt = el.log.value;
@@ -229,7 +234,7 @@ function edit(row) {
     }
     document.getElementById("ed").value = ed_v.value + " " + et_v.innerText;
     document.getElementById("am").value = ea_v.innerText;
-    //Change selected catergory
+    //Change selected category
     for (var i = 0, j = ec.options.length; i < j; ++i) {
         if (ec.options[i].innerHTML === ec_v) {
             ec.selectedIndex = i;
@@ -312,9 +317,10 @@ function toggleSearch() {
 }
 
 function resetView() {
-
-    var f = document.getElementById("frm_srch");
+    var f = $("#frm_srch");
     f.keywords.value = "";
+    $("#idx_cat").value(0);
+    $('#vc>option[value="0"]').prop('selected', true);
 }
 
 function updateSelCategory(sel) {
@@ -331,6 +337,28 @@ function toggleVisibility(target, ensureOff) {
         $(target).hide();
     }
 }
+var _collpsd_toggle = false;
+var _collpsd_toggle2 = false;
+
+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();