zo/pronoun.fyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some formatting cleanup

Browse Source
This commit is contained in:
Morgan 2015-03-14 03:53:33 +00:00
parent 2c68debc8e
commit 3dc6c69536
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pronouns/pages.clj
View File

@ -3,15 +3,13 @@
[pronouns.util :as u] [pronouns.util :as u]
[hiccup.core :refer :all])) [hiccup.core :refer :all]))
(defn wrap-pronoun (defn wrap-pronoun
[pronoun] [pronoun]
[:b pronoun]) [:b pronoun])
(defn wrap-para (defn wrap-para
[whatever] [whatever]
[:p whatever] [:p whatever])
)
(defn subject-example (defn subject-example
[subject] [subject]
@ -21,37 +19,31 @@
(defn object-example (defn object-example
[object] [object]
(wrap-para (wrap-para
[:span#sentence "I went with " (wrap-pronoun object) "."] [:span#sentence "I went with " (wrap-pronoun object) "."]))
))
(defn posessive-determiner-example (defn posessive-determiner-example
[subject possessive-determiner] [subject possessive-determiner]
(wrap-para (wrap-para
[:span#sentence (wrap-pronoun subject) " brought " (wrap-pronoun possessive-determiner) " frisbee."] [:span#sentence (wrap-pronoun subject) " brought " (wrap-pronoun possessive-determiner) " frisbee."]))
))
(defn possessive-pronoun-example (defn possessive-pronoun-example
[possessive-pronoun] [possessive-pronoun]
(wrap-para (wrap-para
[:span#sentence "At least I think it was " (wrap-pronoun possessive-pronoun) "."] [:span#sentence "At least I think it was " (wrap-pronoun possessive-pronoun) "."]))
))
(defn reflexive-example (defn reflexive-example
[subject reflexive] [subject reflexive]
(wrap-para (wrap-para
[:span#sentence (wrap-pronoun subject) " threw it to " (wrap-pronoun reflexive)] [:span#sentence (wrap-pronoun subject) " threw it to " (wrap-pronoun reflexive)]))
))
(defn twitter-name [name] (defn twitter-name [name]
[:a {:href (str "https://www.twitter.com/" name)} (str "@" name)] [:a {:href (str "https://www.twitter.com/" name)} (str "@" name)])
)
(defn contact-block [] (defn contact-block []
[:div {:class "contact"} [:div {:class "contact"}
[:p "Written by " (twitter-name "morganastra") " and " (twitter-name "thelseraphim") "."] [:p "Written by " (twitter-name "morganastra") " and " (twitter-name "thelseraphim") "."]
[:p "visit the project on " [:a {:href "https://github.com/witch-house/pronoun.is"} "github."]]] [:p "visit the project on " [:a {:href "https://github.com/witch-house/pronoun.is"} "github."]]])
)
(defn about-block [] (defn about-block []
@ -61,10 +53,8 @@
[:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"] [:tt "http://pronoun.is/subject-pronoun/object-pronoun/possessive-determiner/possessive-pronoun/reflexive"]
" displays examples of your pronouns. If we have a good guess we'll let you use just the first one or two."] " displays examples of your pronouns. If we have a good guess we'll let you use just the first one or two."]
[:p "Quick examples:"] [:p "Quick examples:"]
[:p "My name is Thel Seraphim, my " [:a {:href "http://pronoun.is/she"} "http://pronoun.is/she"] "."] [:p "My name is Thel Seraphim, my " [:a {:href "http://pronoun.is/she"} "pronoun.is/she"] "."]
[:p "My name is Morgan Astra, my " [:a {:href "http://pronoun.is/ze/zir"} "http://pronoun.is/ze/zir"] "."] [:p "My name is Morgan, my " [:a {:href "http://pronoun.is/ze/zir"} "pronoun.is/ze/zir"] "."]])
]
)
@ -78,8 +68,6 @@
(possessive-pronoun-example possessive-pronoun) (possessive-pronoun-example possessive-pronoun)
(reflexive-example subject reflexive)]) (reflexive-example subject reflexive)])
(defn format-pronoun-examples (defn format-pronoun-examples
[subject object possessive-determiner possessive-pronoun reflexive] [subject object possessive-determiner possessive-pronoun reflexive]
(html (html
@ -88,10 +76,7 @@
[:body [:body
(examples-block subject object possessive-determiner possessive-pronoun reflexive) (examples-block subject object possessive-determiner possessive-pronoun reflexive)
(about-block) (about-block)
(contact-block)] (contact-block)]]))
]
)
)
(defn parse-pronouns-with-lookup [pronouns-string pronouns-table] (defn parse-pronouns-with-lookup [pronouns-string pronouns-table]