Failed branch merge fix.

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 32fdd23769669547fa9a84e42fd6920d6b637873..67ff5ba1b499e127f7b626639fdf45ca7e19f965 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -978,7 +978,7 @@ $log_output .= qq(<form id="frm_srch" action="main.cgi"><TABLE class="tbl" borde
 
 my $sideMenu;
 my $tail = q(<div><a class="a_" href="stats.cgi">View Statistics</a>&nbsp;&nbsp;<a class="a_" href="config.cgi">Configure Log</a></div><hr>
-<div><a class="a_" href="login_ctr.cgi?logout=bye">LOGOUT</a><hr><a name="bottom"></a></div>);
+             <div><a class="a_" href="login_ctr.cgi?logout=bye">LOGOUT</a><hr><a name="bottom"></a></div>);
 if($isPUBViewMode){$sideMenu=$frm=$srh=$tail=""}else{
     $sideMenu = qq(
         <div id="menu" title="To close this menu click on its heart, and wait.">
@@ -1308,7 +1308,6 @@ sub authenticate {
         exit;
     }
 }
-
 sub fetchAutocomplete {
     my $st = traceDBExe('SELECT LOG from LOG' . $stmE);
     while ( my @row = $st->fetchrow_array() ) {

diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 532b5ccd9705e0c2bcb6ed7d5ad11bc1dd014a6c..8ca89fce448c3fb786042c6313893e776d2bb537 100644 (file)
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -43,13 +43,6 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) {
         _show_all = false;//toggle type switch
         showAll();
     }
-
-    $(function() {        
-        $( "#rs_keys, #rs_keys2" ).autocomplete({
-            source: AUTOWORDS
-            });
-    });
-
     $('#ed').datetimepicker({
         dateFormat: 'yy-mm-dd',
         timeFormat: 'HH:mm:ss',
@@ -269,7 +262,7 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) {
         lbl = lbl + " ".repeat(16-lbl.length);
         $("#lcat_x").html(lbl);
         $("#xc").val(ci);
-        $("#cat_desc").show();        
+        $("#cat_desc").show();
     }).mouseenter(function(e){
         var pr = $(event.target).parent(); pr = pr.attr('id');
         if(pr){
@@ -289,7 +282,7 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) {
             }
           }
         ]
-    });
+      });
     //Following is needed as the dropdown registers somewhere in lib. to show on when enter key is hit.
     $.fn.enterKey = function (fnc) {
         return this.each(function () {
@@ -311,10 +304,15 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) {
         }
       });
 
-    
+
     setPageSessionTimer(expires);
 
 
+    $(function() {        
+        $( "#rs_keys, #rs_keys2" ).autocomplete({
+            source: AUTOWORDS
+            });
+    });
     var CHK_PREV;
     
     $("#frm_log td").mouseover(function(e){
@@ -343,6 +341,12 @@ function onBodyLoad(toggle, locale, tz, today, expires, rs_cur, log_limit) {
         this.toggle('#div_log', true);
     }
 
+    $(function() {        
+        $( "#rs_keys, #rs_keys2" ).autocomplete({
+            source: AUTOWORDS
+            });
+    });
+
     display("Log page is ready!");    
 }