Skip to content

Commit

Permalink
Merge branch 'hotfix/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
amalloy committed May 23, 2011
2 parents 33e8030 + 845e4a7 commit a805226
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion project.clj
@@ -1,4 +1,4 @@
(defproject foreclojure "1.0.1"
(defproject foreclojure "1.0.2"
:description "4clojure - a website for lisp beginners"
:dependencies [[clojure "1.2.1"]
[clojure-contrib "1.2.0"]
Expand Down
19 changes: 11 additions & 8 deletions src/foreclojure/utils.clj
Expand Up @@ -138,13 +138,16 @@
[:div#content
[:br]
[:div#menu
(for [[link text] [["/" "Main Page"]
["/problems" "Problem List"]
["/users" "Top Users"]
["/directions" "Getting Started"]
["http://try-clojure.org" "REPL"]
["http://clojuredocs.org" "Docs"]]]
[:a.menu {:href link} text])
(for [[link text & [tabbed]]
[["/" "Main Page"]
["/problems" "Problem List"]
["/users" "Top Users"]
["/directions" "Getting Started"]
["http://try-clojure.org" "REPL" true]
["http://clojuredocs.org" "Docs" true]]]
[:a.menu (assoc (when tabbed {:target "_blank"})
:href link)
text])
[:span#user-info
(if user
[:div
Expand All @@ -162,7 +165,7 @@
(link-to "/login/update" "Leagues")])
(when (approver? user)
[:span
(link-to "/problems/unapproved" "View Unapproved Problems")])
(link-to "/problems/unapproved" "View Unapproved Problems")])
(when (can-submit? user)
[:span (link-to "/problems/submit" "Submit a Problem")])])
[:div#content_body body]
Expand Down

0 comments on commit a805226

Please sign in to comment.