Brought in from 2.2.

diff --git a/htdocs/cgi-bin/login_ctr.cgi b/htdocs/cgi-bin/login_ctr.cgi
index 4630bbdf753c422adccad0e0405e2426ea6a74ca..aea5aad5d10108f416755bb4e5dfa356be8c6a18 100755 (executable)
--- a/htdocs/cgi-bin/login_ctr.cgi
+++ b/htdocs/cgi-bin/login_ctr.cgi
@@ -588,7 +588,7 @@ sub logout {
         $passw = $session->param('passw');
         if($alias){
             my $db = Settings::connectDB($DB_NAME, $alias, $passw);
-            Settings::toLog($db, "Log has properly been loged out by $alias.");
+            Settings::toLog($db, "Log has properly been logged out by $alias.");
             $db->disconnect();
         }
     }catch{
@@ -611,7 +611,7 @@ sub logout {
                            -style =>{-type => 'text/css', -src => 'wsrc/main.css'},
             );
 
-    print qq(<font color="white"><center><h2>You have properly loged out of the Life Log Application!</h2>
+    print qq(<font color="white"><center><h2>You have properly logged out of the Life Log Application!</h2>
     <br>
     <form action="login_ctr.cgi"><input type="hidden" name="autologoff" value="1"/><input type="submit" value="No, no, NO! Log me In Again."/></form><br>
     </br>

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 9437a7f9bd3c9233a82c520b2efb4cc2c1dc452c..5b00a01402465a31bb39853243c6a4f0e3a64ef5 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -905,7 +905,10 @@ $log_output .= qq(<form id="frm_srch" action="main.cgi"><TABLE class="tbl" borde
             <button id="btnxca" onClick="return addInclude()"/>Add</button>&nbsp;&nbsp;
             <button id="btnxca" type="button" onClick="return removeInclude()">Remove</button>&nbsp;
             <button id="btnxrc" type="button" onClick="return resetInclude()">Reset</button>&nbsp;&nbsp;&nbsp;
-            <button id="btn_cat" onclick="viewByCategory(this);">View</button></td></tr><tr class="collpsd"><td align="right">
+            <button id="btn_cat" onclick="viewByCategory(this);">View</button>
+     </td></tr>
+    <tr class="collpsd">$tdivvc</tr>
+    <tr class="collpsd"><td align="right">
 
             View by Amount Type:</td><td align="left">
             <select id="amf2" name="aa" class="ui-button">
@@ -917,8 +920,7 @@ $log_output .= qq(<form id="frm_srch" action="main.cgi"><TABLE class="tbl" borde
 &nbsp;&nbsp;            
 
      </td>
-   </tr>
-   <tr class="collpsd">$tdivvc</tr>
+   </tr>   
    <tr class="collpsd">
      <td align="right">Exclude Category:</td>
      <td align="left">
@@ -1209,7 +1211,7 @@ my $dbg = qq(--DEBUG OUTPUT--\n
         }
 
         $vmode = qq(<span style="font-size:small;">[In Page Mode]</span>&nbsp;);
-        $vmode = qq(<span style="font-color:red;font-size:small">[In View Mode]</span>&nbsp;) if$isInViewMode;
+        $vmode = qq(<span style="font-color:red;font-size:x-small">[In View Mode]</span>&nbsp;) if$isInViewMode;
         if($isPUBViewMode){
            $log_output .=qq!<tr class="r$tfId" id="brw_row"><td style="text-align:left;">$vmode</td><td colspan="3"></td>!;
         }