From 76bc9c2936b382bcdad398b75a130982c8179c8b Mon Sep 17 00:00:00 2001
From: Caleb McDaniel <caleb.mcdaniel@rice.edu>
Date: Thu, 19 Jun 2014 21:19:58 -0500
Subject: [PATCH 1/3] adding exact phrase checkbox to search form

---
 Network/Gitit/Handlers.hs | 4 +++-
 Network/Gitit/Types.hs    | 3 +++
 data/templates/sitenav.st | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Network/Gitit/Handlers.hs b/Network/Gitit/Handlers.hs
index acebc6af9..bee7fc7fc 100644
--- a/Network/Gitit/Handlers.hs
+++ b/Network/Gitit/Handlers.hs
@@ -268,7 +268,9 @@ goToPage = withData $ \(params :: Params) -> do
 
 searchResults :: Handler
 searchResults = withData $ \(params :: Params) -> do
-  let patterns = pPatterns params `orIfNull` [pGotoPage params]
+  let patterns = if pExactPhrase params
+                    then [unwords (pPatterns params)] 
+                    else pPatterns params `orIfNull` [pGotoPage params] 
   fs <- getFileStore
   matchLines <- if null patterns
                    then return []
diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs
index b1862cf94..cd94bcdde 100644
--- a/Network/Gitit/Types.hs
+++ b/Network/Gitit/Types.hs
@@ -270,6 +270,7 @@ data Params = Params { pUsername     :: String
                      , pSince        :: Maybe UTCTime
                      , pRaw          :: String
                      , pLimit        :: Int
+                     , pExactPhrase  :: Bool
                      , pPatterns     :: [String]
                      , pGotoPage     :: String
                      , pFileToDelete :: String
@@ -318,6 +319,7 @@ instance FromData Params where
          ds <- look' "destination" `mplus` return ""
          ra <- look' "raw"            `mplus` return ""
          lt <- lookRead "limit"       `mplus` return 100
+         ph <- (look' "exactphrase" >> return True) `mplus` return False
          pa <- look' "patterns"       `mplus` return ""
          gt <- look' "gotopage"       `mplus` return ""
          ft <- look' "filetodelete"   `mplus` return ""
@@ -357,6 +359,7 @@ instance FromData Params where
                          , pDestination  = ds
                          , pRaw          = ra
                          , pLimit        = lt
+                         , pExactPhrase  = ph
                          , pPatterns     = words pa
                          , pGotoPage     = gt
                          , pFileToDelete = ft
diff --git a/data/templates/sitenav.st b/data/templates/sitenav.st
index 863be4f33..c295872d0 100644
--- a/data/templates/sitenav.st
+++ b/data/templates/sitenav.st
@@ -18,6 +18,7 @@
     <form action="$base$/_search" method="get" id="searchform">
      <input type="text" name="patterns" id="patterns"/>
      <input type="submit" name="search" id="search" value="Search"/>
+     <input type="checkbox" name="exactphrase" id="exactphrase">&nbsp;Exact Phrase
     </form>
     <form action="$base$/_go" method="post" id="goform">
       <input type="text" name="gotopage" id="gotopage"/>

From 14e2583a6b27c5878b908a849824b035c7fbce82 Mon Sep 17 00:00:00 2001
From: Caleb McDaniel <caleb.mcdaniel@rice.edu>
Date: Mon, 23 Jun 2014 15:31:24 -0500
Subject: [PATCH 2/3] adding break before checkbox

---
 data/templates/sitenav.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/sitenav.st b/data/templates/sitenav.st
index c295872d0..b52b74bc5 100644
--- a/data/templates/sitenav.st
+++ b/data/templates/sitenav.st
@@ -17,7 +17,7 @@
     </ul>
     <form action="$base$/_search" method="get" id="searchform">
      <input type="text" name="patterns" id="patterns"/>
-     <input type="submit" name="search" id="search" value="Search"/>
+     <input type="submit" name="search" id="search" value="Search"/><br\>
      <input type="checkbox" name="exactphrase" id="exactphrase">&nbsp;Exact Phrase
     </form>
     <form action="$base$/_go" method="post" id="goform">

From 8193f2552004f20487fd1385876e9171fdc5c765 Mon Sep 17 00:00:00 2001
From: "W. Caleb McDaniel" <caleb.mcdaniel@rice.edu>
Date: Thu, 26 Jun 2014 10:38:41 -0500
Subject: [PATCH 3/3] Go box before Search box, for cleaner look

---
 data/templates/sitenav.st | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/templates/sitenav.st b/data/templates/sitenav.st
index b52b74bc5..2b4a5fc75 100644
--- a/data/templates/sitenav.st
+++ b/data/templates/sitenav.st
@@ -15,14 +15,14 @@
       $endif$
       <li><a href="$base$/Help">Help</a></li>
     </ul>
+    <form action="$base$/_go" method="post" id="goform">
+      <input type="text" name="gotopage" id="gotopage"/>
+      <input type="submit" name="go" id="go" value="Go"/>
+    </form>
     <form action="$base$/_search" method="get" id="searchform">
      <input type="text" name="patterns" id="patterns"/>
      <input type="submit" name="search" id="search" value="Search"/><br\>
      <input type="checkbox" name="exactphrase" id="exactphrase">&nbsp;Exact Phrase
     </form>
-    <form action="$base$/_go" method="post" id="goform">
-      <input type="text" name="gotopage" id="gotopage"/>
-      <input type="submit" name="go" id="go" value="Go"/>
-    </form>
   </fieldset>
 </div>