From 956b63f27dad044b051d28fb7d09840543d0152e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20S=C3=BC=C3=9F?= <dominik.suess@outlook.at>
Date: Fri, 21 Oct 2016 19:19:04 +0200
Subject: [PATCH] Re-Added searchbar clearing and journal highlighting

---
 hledger-web/Handler/Common.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs
index 12fd2d8e5..cfdcade38 100644
--- a/hledger-web/Handler/Common.hs
+++ b/hledger-web/Handler/Common.hs
@@ -62,13 +62,11 @@ sidebar vd@VD{..} =
  <div #sidebar-menu .col-md-4 .col-sm-4 .sidebar-offcanvas>
   <ul .main-menu .nav .nav-stacked .affix-top>
    <li .top>
-    <a href=@{JournalR} title="Show general journal entries, most recent first">Journal
+    <a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first">Journal
    ^{accounts}
 |]
---   <a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first" style="white-space:nowrap;">Journal
---  <p style="margin-top:1em;">
  where
-  journalcurrent = if here == JournalR then "current" else "" :: String
+  journalcurrent = if here == JournalR then "inacct" else "" :: String
   accounts = balanceReportAsHtml opts vd $ balanceReport (reportopts_ $ cliopts_ opts){empty_=True} am j
 
 -- -- | Navigation link, preserving parameters and possibly highlighted.
@@ -98,6 +96,9 @@ searchform VD{..} = [hamlet|
     <div #searchbar .input-group>
      <input .form-control name=q value=#{q} title="Enter hledger search patterns to filter the data below" placeholder="Search">
      <div .input-group-btn>
+      $if filtering
+       <a href=@{here} .btn .btn-default title="Clear search terms">
+        <span .glyphicon .glyphicon-remove-circle>
       <button .btn .btn-default type=submit title="Apply search terms">
        <span .glyphicon .glyphicon-search>
       <button .btn .btn-default type=button data-toggle="modal" data-target="#helpmodal" title="Show search and general help">?