Skip to content

Commit

Permalink
Merge pull request #96 from gigasquid/develop
Browse files Browse the repository at this point in the history
Turned Getting Started page to Help page and included Google Group on it
  • Loading branch information
amalloy committed Sep 2, 2011
2 parents 8a8c6a1 + d022fa5 commit cb4ae94
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
4 changes: 4 additions & 0 deletions resources/public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -398,5 +398,9 @@ button:active {

a.graph-class :hover {color: #445599;}

#help-content{
width: 90%;
}



21 changes: 14 additions & 7 deletions src/foreclojure/static.clj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
(.format df (deref total-solved)) " problems solved and counting!"]
[:div
[:h3 "What is 4Clojure?"]
[:p "4Clojure is a resource to help fledgling clojurians learn the language through interactive problems. The first few problems are easy enough that even someone with no prior experience should find the learning curve forgiving. See 'Getting Started' for more information."]]
[:p "4Clojure is a resource to help fledgling clojurians learn the language through interactive problems. The first few problems are easy enough that even someone with no prior experience should find the learning curve forgiving. See 'Help' for more information."]]

[:div
[:h3 "Is this site written in Clojure?"]
Expand All @@ -27,8 +27,11 @@
[:p "At this time, 4clojure.com does not provide information regarding the sale of foreclosed homes, and has no plans of doing so in the future."]]
[:img {:src "/images/PoweredMongoDBbeige50.png"}]])

(def-page getting-started-page []
[:div
(def-page help-page []
[:div#help-content
[:div#getting-started
[:h2 "Getting Started"]
[:div
"4Clojure challenges users to solve "
[:a {:href "http://en.wikipedia.org/wiki/K%C5%8Dan"} "koan-style"]
" problems. This is a fancy way of saying you'll be asked to fill in the blanks. The \"blanks\" that you will be filling in are indicated by a double underscore: '__'. This is "
Expand Down Expand Up @@ -63,10 +66,14 @@
[:li "4Clojure won't save any of your code for later use"]
[:br]
"Check out the official Clojure "
[:a {:href "http://clojure.org/getting_started"} "getting started"]
" page for help with installation."
[:a {:href "http://clojure.org/help"} "help"]
" page for instructions on installation and getting started."
[:br][:br]
"You should now be ready to start solving problems. Happy coding!"])
"You should now be ready to start solving problems. Happy coding!"]]
[:h2 "Need help with a problem?"]
[:p "Do you need some hints or help in solving a problem? Visit the "
[:a {:href "http://groups.google.com/group/4clojure"} "4Clojure Google Group"]
"."]])

(defroutes static-routes
(GET "/directions" [] (getting-started-page)))
(GET "/directions" [] (help-page)))
6 changes: 2 additions & 4 deletions src/foreclojure/utils.clj
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
[["/" "Main Page"]
["/problems" "Problem List"]
["/users" "Top Users"]
["/directions" "Getting Started"]
["/directions" "Help"]
["http://try-clojure.org" "REPL" true]
["http://clojuredocs.org" "Docs" true]]]
[:a.menu (assoc (when tabbed {:target "_blank"})
Expand All @@ -173,9 +173,7 @@
[:span
(link-to "/problems/unapproved" "View Unapproved Problems")])
(when (can-submit? user)
[:span (link-to "/problems/submit" "Submit a Problem")])
[:span (link-to "http://groups.google.com/group/4clojure"
"Google Group")]])
[:span (link-to "/problems/submit" "Submit a Problem")])])
[:div#content_body body]
[:div#footer
"The content on 4clojure.com is available under the EPL v 1.0 license."
Expand Down

0 comments on commit cb4ae94

Please sign in to comment.