Fill the query input box with the current query.

Author: wiseman

src/clojars/web.clj

@@ -57,7 +57,7 @@
          (browse db account params)))
    (GET "/security" []
         (try-account
-         (html-doc account "Security"
+         (html-doc "Security" {:account account}
                    (raw (slurp (io/resource "security.html"))))))
    session/routes
    (group/routes db)
@@ -71,8 +71,7 @@
    (ANY "*" _
         (try-account
          (not-found
-          (html-doc account
-                    "Page not found"
+          (html-doc "Page not found" {:account account}
                     [:div.small-section
                      [:h1 "Page not found"]
                      [:p "Thundering typhoons!  I think we lost it.  Sorry!"]]))))))

src/clojars/web/browse.clj

@@ -11,7 +11,7 @@
   (let [project-count (count-all-projects db)
         total-pages (-> (/ project-count per-page) Math/ceil .intValue)
         projects (browse-projects db page per-page)]
-    (html-doc account "All projects"
+    (html-doc "All projects" {:account account}
      [:div.light-article.row
       [:h1 "All projects"]
       [:div.small-section

src/clojars/web/common.clj

@@ -61,7 +61,7 @@
 (defn typekit-js []
   [:script "try{Typekit.load();}catch(e){}"])
 
-(defn html-doc [account title & body]
+(defn html-doc [title ctx & body]
   (html5
    [:head
     [:link {:type "application/opensearchdescription+xml"
@@ -98,9 +98,10 @@
                  :id "search"
                  :class "search"
                  :placeholder "Search projects..."
+                 :value (:query ctx)
                  :required true}]]]
       [:nav.main-navigation.col-md-6.col-sm-6.col-xs-12.col-lg-6
-       (if account
+       (if (:account ctx)
          (unordered-list
           [(link-to "/" "dashboard")
            (link-to "/profile" "profile")
@@ -111,7 +112,7 @@
      body
      footer]]))
 
-(defn html-doc-with-large-header [account title & body]
+(defn html-doc-with-large-header [title ctx & body]
   (html5
    [:head
     [:link {:type "application/opensearchdescription+xml"
@@ -159,7 +160,7 @@
        [:h1
         (link-to "/" "Clojars")]]
       [:nav.main-navigation.col-md-6.col-sm-6.col-xs-12.col-lg-6
-       (if account
+       (if (:account ctx)
          (unordered-list
           [(link-to "/" "dashboard")
            (link-to "/profile" "profile")
@@ -181,6 +182,7 @@
                 :name "q"
                 :id "search"
                 :placeholder "Search projects..."
+                :value (:query ctx)
                 :autofocus true
                 :required true}]
        [:input {:id "search-button"

src/clojars/web/dashboard.clj

@@ -20,7 +20,7 @@
                                                                    (:jar_name jar-map))]]]))
 
 (defn index-page [db stats account]
-  (html-doc-with-large-header account nil
+  (html-doc-with-large-header nil {:account account}
     [:article.row
      [:div.push-information.col-md-6.col-lg-6.col-sm-6.col-xs-12
       [:h3.push-header "Push with Leiningen"]
@@ -41,7 +41,7 @@
     [:ul.recent-jars-list.row (map #(recent-jar stats %) (recent-jars db))]))
 
 (defn dashboard [db account]
-  (html-doc account "Dashboard"
+  (html-doc "Dashboard" {:account account}
     [:div.light-article.col-md-12.col-lg-12.col-xs-12.col-sm-12
      [:h1 (str "Dashboard (" account ")")]
      [:div.col-md-4.col-lg-4.col-sm-4.col-xs-12

src/clojars/web/error_page.clj

@@ -4,8 +4,7 @@
             [hiccup.element :refer [link-to]]))
 
 (defn error-page-response [error-id]
-  (-> (response (html-doc nil
-                 "Oops, we encountered an error"
+  (-> (response (html-doc "Oops, we encountered an error" {}
                  [:div.small-section
                   [:h1 "Oops!"]
                   [:p

src/clojars/web/group.clj

@@ -7,7 +7,7 @@
             [clojars.web.safe-hiccup :refer [form-to]]))
 
 (defn show-group [db account groupname membernames & errors]
-  (html-doc account (str groupname " group")
+  (html-doc (str groupname " group") {:account account}
     [:div.small-section.col-md-6.col-lg-6.col-sm-6.col-xs-12
      [:h1 (str groupname " group")]
      [:h2 "Projects"]

src/clojars/web/jar.clj

@@ -81,7 +81,7 @@
                        (submit-button "Promote")))))))
 
 (defn show-jar [db reporter stats account jar recent-versions count]
-  (html-doc account (str (:jar_name jar) " " (:version jar))
+  (html-doc (str (:jar_name jar) " " (:version jar)) {:account account}
             (let [pom-map (jar-to-pom-map reporter jar)]
               [:div.light-article.row
                [:div#jar-title.col-sm-9.col-lg-9.col-xs-12.col-md-9
@@ -182,7 +182,7 @@
                 ]])))
 
 (defn show-versions [account jar versions]
-  (html-doc account (str "all versions of "(jar-name jar))
+  (html-doc account (str "all versions of "(jar-name jar)) {:account account}
             [:div.light-article
              [:h1 "all versions of "(jar-link jar)]
              [:div.versions

src/clojars/web/login.clj

@@ -7,7 +7,7 @@
             [clojars.web.safe-hiccup :refer [form-to]]))
 
 (defn login-form [login_failed username]
-  (html-doc nil "Login"
+  (html-doc "Login" {}
    [:div.small-section
     [:h1 "Login"]
     [:p.hint "Don't have an account? "

src/clojars/web/search.clj

@@ -31,7 +31,7 @@
                   {:error (format "Invalid search syntax for query `%s`" query)}))))))
 
 (defn html-search [search account query page]
-  (html-doc account (str query " - search")
+  (html-doc (str query " - search") {:account account :query query}
     [:div.light-article.row
      [:h1 "Search for '" query "'"]
      (try

src/clojars/web/user.clj

@@ -18,7 +18,7 @@
             [valip.predicates :as pred]))
 
 (defn register-form [{:keys [errors email username pgp-key]}]
-  (html-doc nil "Register"
+  (html-doc "Register" {}
             [:div.small-section
              [:h1 "Register"]
              (error-list errors)
@@ -74,7 +74,7 @@
           (update-user-validations confirm)))
 
 (defn profile-form [account user flash-msg & [errors]]
-  (html-doc account "Profile"
+  (html-doc "Profile" {:account account}
             [:div.small-section
              (flash flash-msg)
              [:h1 "Profile"]
@@ -105,7 +105,7 @@
             :flash "Profile updated.")))))
 
 (defn show-user [db account user]
-  (html-doc account (user :user)
+  (html-doc (user :user) {:account account}
             [:div.light-article.row
              [:h1.col-md-12.col-sm-12.col-xs-12.col-lg-12
               (user :user)]
@@ -117,7 +117,7 @@
               (unordered-list (map group-link (find-groupnames db (user :user))))]]))
 
 (defn forgot-password-form []
-  (html-doc nil "Forgot password?"
+  (html-doc "Forgot password?" {}
     [:div.small-section
      [:h1 "Forgot password?"]
      (form-to [:post "/forgot-password"]
@@ -140,13 +140,13 @@
               reset-password-url]
              (interpose "\n\n")
              (apply str)))))
-  (html-doc nil "Forgot password?"
+  (html-doc "Forgot password?" {}
     [:h1 "Forgot password?"]
     [:p "If your account was found, you should get an email with a link to reset your password soon."]))
 
 (defn edit-password-form [db reset-code & [errors]]
   (if-let [user (db/find-user-by-password-reset-code db reset-code)]
-    (html-doc nil "Reset your password"
+    (html-doc "Reset your password" {}
       [:div.small-section
        [:h1 "Reset your password"]
        (error-list errors)
@@ -164,7 +164,7 @@
                                  :required true}
                                 :confirm)
                 (submit-button "Update my password"))])
-    (html-doc nil "Reset your password"
+    (html-doc "Reset your password" {}
       [:h1 "Reset your password"]
       [:p "The reset code was not found. Please ask for a new code in the " [:a {:href "/forgot-password"} "forgot password"] " page"])))