From 9245714f0ae20c7dd3da4ea1d2776396856888be Mon Sep 17 00:00:00 2001 From: Dave Moore Date: Fri, 16 Sep 2011 08:34:16 -0500 Subject: [PATCH] Added box styling to all documentation pages and fixed a cross-browser navigation margin issue. --- public/images/.DS_Store | Bin 6148 -> 6148 bytes public/stylesheets/speclj.css | 143 ++++++++++-------- public/stylesheets/speclj_main.css | 12 +- src/speclj_www/view/community.hiccup.clj | 10 +- src/speclj_www/view/docs/after.hiccup.clj | 6 +- src/speclj_www/view/docs/after_all.hiccup.clj | 6 +- src/speclj_www/view/docs/around.hiccup.clj | 22 +-- src/speclj_www/view/docs/before.hiccup.clj | 6 +- .../view/docs/before_all.hiccup.clj | 6 +- src/speclj_www/view/docs/describe.hiccup.clj | 4 +- src/speclj_www/view/docs/index.hiccup.clj | 2 +- src/speclj_www/view/docs/it.hiccup.clj | 8 +- src/speclj_www/view/docs/should.hiccup.clj | 8 +- src/speclj_www/view/docs/should_e.hiccup.clj | 8 +- .../view/docs/should_fail.hiccup.clj | 8 +- .../view/docs/should_not.hiccup.clj | 8 +- .../view/docs/should_not_e.hiccup.clj | 8 +- .../view/docs/should_not_throw.hiccup.clj | 8 +- .../view/docs/should_throw.hiccup.clj | 19 ++- src/speclj_www/view/layouts/index.hiccup.clj | 74 +++++---- src/speclj_www/view/tutorial/step1.hiccup.clj | 10 +- 21 files changed, 197 insertions(+), 179 deletions(-) diff --git a/public/images/.DS_Store b/public/images/.DS_Store index 27417716905fad0c24f485ed1e7ebff1fd412fcd..ace9775fe796080be96b7506c947494374711f58 100644 GIT binary patch delta 146 zcmZoMXfc=|#>B)qu~2NHo+3XB0|Nsi1A_nqLlHwNgW<%uwTmAxG75u)xf#+JG8xht zN+D8{UiZIo|R7{@0D7#scQI2&pI|n}p(8kRd8NV}6 U<`=Q#09pt{3=EqCM7A&k0IwS!IsgCw delta 83 zcmZoMXfc=|#>B`mu~2NHo+3XJ0|Nsi1A_nqLlHwNgVDsewUZ4*SSANEOKpD1B*(gW k0rLUI&Fmcf96&9bCo+F$p3E;|$pO>^(#5nnKx7Lu023M#d;kCd diff --git a/public/stylesheets/speclj.css b/public/stylesheets/speclj.css index 4d16c82..b38f58a 100644 --- a/public/stylesheets/speclj.css +++ b/public/stylesheets/speclj.css @@ -9,11 +9,10 @@ white = rgb(238, 238, 238) body { - min-width:1000px; background: #EEE; - width: 100%; } + /*/// --------- T Y P O G R A P H Y --------- ///*/ @font-face { @@ -21,6 +20,10 @@ body { src: url('Dekar.otf'); } +pre { + border: 2px solid #ccc; +} + h1 { color: #333; font-family: 'Rosario', sans-serif; @@ -58,6 +61,16 @@ h4 { margin: 0 0 1em 0; } +h5 { + font-family: 'Rosario', sans-serif; + font-weight: 400; + font-style: normal; + color: #444; + font-size: .8em; + line-height: 1.2em; + margin: 0 0 1em 0; +} + p, ul { font-family: 'Rosario', sans-serif; font-weight: 400; @@ -66,6 +79,15 @@ p, ul { line-height: 1.333em; } +p { + margin-bottom: 1em; +} + +code { + display: block; + margin-bottom: 1em; +} + ul { } @@ -99,26 +121,28 @@ small { /*/// --------- T O P S E C T I O N --------- ///*/ -div#top { +div#header { background-color: #111; - height: 20em; width: 100%; } -div#top .left { - height: 20em; - width: 500px; - float: left; +div#head_body { + height: 6.8em; + width: 900px; + margin: 0px auto; + padding: 30px; } -div#top .right { - position: relative; +div#header img { float: left; - height: 20em; - width: 500px; + width: 16em; + margin-left: 87px; } -div#top .right p { +div#header p { + position: relative; + top: 23px; + right: -40px; color: rgb(238, 238, 238); letter-spacing: 2px; line-height: 1.333em; @@ -126,89 +150,74 @@ div#top .right p { font-weight: 400; font-style: italic; font-size: 1.777em; - padding: 0 0 0 1.5em; - position: absolute; - top: 4.5em; - left: 0em; - text-align: right; - width: 450px; } -div#top div.right h4 { - color: rgb(88, 129, 215);; - position: absolute; - top: 10.5em; - right: 6.8em; - letter-spacing: 2px; +div#header p abbr { + color: rgb(238, 238, 238); } -div#top div.left img.logo { - position: absolute; - top: 130px; - left: 100px; - width: 40px; +div#header h4 { + position: relative; + top: -5px; + right: -40px; + color: rgb(88, 129, 215);; + letter-spacing: 2px; } -div#top div.left img.speclj { - border-right: 2px dotted #222; - padding: 0 3em 0 0; - margin: 6em 0 0 12em; - width: 350px; -} +/*/// --------- M A I N S E C T I O N --------- ///*/ -div#top abbr { - color: rgb(238, 238, 238); - border-bottom: 2px dotted #222; - +div#main_body { + width: 900px; + margin: 50px auto 0px auto; } -/*/// --------- B O T T O M S E C T I O N --------- ///*/ - -div#bottom { - width: 1000px; +div#comp_box { + background-color: #F8F8F8; + border: 1px solid #ddd; + padding: 1.5em; + margin-bottom: 1em; } /*/// --------- N A V I G A T I O N --------- ///*/ -div#bottom nav { +div#nav { font-family: 'Rosario', sans-serif; color: #444; - margin: 3em 0 999999em 5.5em; -} - -div#bottom nav { + margin: 3.7em 1em 2em 5.5em; float: left; - width: 160px; + width: 280px; } -div#bottom ul li { +div#nav ul li { margin: .25em 0; + list-style-type: none; } +div#nav ul li ul { + margin-left: 1em; +} -/*/// --------- I N T R O --------- ///*/ +/*/// --------- C O N T E N T --------- ///*/ -section.intro { +div#content { + margin-top: 3.7em; + margin-bottom: 2em; float: left; - margin: 3.5em 0; - width: 600px; + width: 500px; } -section.intro h2 a { - color: rgb(88, 129, 215); +div#lein_install { + margin-top: 2em; } -section.intro h2 a:hover { - color: #333; +div#man_install { + margin-top: 2em; } +/*/// --------- B O T T O M S E C T I O N --------- ///*/ -div#body h3 { - margin: 1em 0 .8em 0; -} - -div#footer { - margin-top: 3em; - margin-bottom: 1em; +div#foot_body { + width: 900px; + margin: 0 auto 5em auto; text-align: center; -} +} \ No newline at end of file diff --git a/public/stylesheets/speclj_main.css b/public/stylesheets/speclj_main.css index 2e58b7e..46a98b3 100644 --- a/public/stylesheets/speclj_main.css +++ b/public/stylesheets/speclj_main.css @@ -183,7 +183,7 @@ div#comp_box { div#nav { font-family: 'Rosario', sans-serif; color: #444; - margin: 3.7em 1em 999em 5.5em; + margin: 3.7em 1em 2em 5.5em; float: left; width: 280px; } @@ -214,6 +214,16 @@ div#man_install { margin-top: 2em; } +div#float_pic1 { + margin: 0 20px 20px 40px; + float: left; +} + +div#float_pic2 { + margin: 0 40px 50px 20px; + float: left; +} + /*/// --------- B O T T O M S E C T I O N --------- ///*/ div#foot_body { diff --git a/src/speclj_www/view/community.hiccup.clj b/src/speclj_www/view/community.hiccup.clj index 43341a0..0aa91ed 100644 --- a/src/speclj_www/view/community.hiccup.clj +++ b/src/speclj_www/view/community.hiccup.clj @@ -7,12 +7,10 @@ [:h4 "Contributing"] [:p "To contribute to the Speclj project, all you have to do is clone the master branch, build, and run all the tests. If you have Leiningen and Git, you can do that by running the following commands from your terminal:"] -[:code " -
git clone https://github.com/slagyr/speclj.git
-cd speclj
-lein javac
-lein spec
-
"] +[:code "git clone https://github.com/slagyr/speclj.git
+cd speclj
+lein javac
+lein spec"] [:p "Then you can make patches and submit them via pull requests on Speclj's GitHub Repo"] diff --git a/src/speclj_www/view/docs/after.hiccup.clj b/src/speclj_www/view/docs/after.hiccup.clj index f8aef92..25565aa 100644 --- a/src/speclj_www/view/docs/after.hiccup.clj +++ b/src/speclj_www/view/docs/after.hiccup.clj @@ -1,6 +1,6 @@ [:h3 "after"] -[:p "Declares a function that is invoked after each characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] +[:div {:id "comp_box"} + [:p "Declares a function that is invoked after each characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] -[:code " -
(after (println \"A spec has just been evaluated\"))
"] \ No newline at end of file + [:code "(after (println \"A spec has just been evaluated\"))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/after_all.hiccup.clj b/src/speclj_www/view/docs/after_all.hiccup.clj index e3dcb8e..dc13008 100644 --- a/src/speclj_www/view/docs/after_all.hiccup.clj +++ b/src/speclj_www/view/docs/after_all.hiccup.clj @@ -1,6 +1,6 @@ [:h3 "after-all"] -[:p "Declares a function that is invoked once after all the characteristics in the containing describe scope have been evaluated. The body may consist of any forms, presumably ones that perform side effects."] +[:div {:id "comp_box"} + [:p "Declares a function that is invoked once after all the characteristics in the containing describe scope have been evaluated. The body may consist of any forms, presumably ones that perform side effects."] -[:code " -
(after-all (println \"That's all folks.\"))
"] \ No newline at end of file + [:code "(after-all (println \"That's all folks.\"))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/around.hiccup.clj b/src/speclj_www/view/docs/around.hiccup.clj index a3e34bc..44c287a 100644 --- a/src/speclj_www/view/docs/around.hiccup.clj +++ b/src/speclj_www/view/docs/around.hiccup.clj @@ -1,13 +1,13 @@ [:h3 "around"] -[:p "Declares a function that will be invoked around each characteristic of the containing describe scope. The characteristic will be passed in and the around function is responsible for invoking it."] - -[:code " -
(declare *the-answer*) ; outside of a describe
-
-(around [it]
-  (binding [*the-answer* 42]
-    (it)))
-
-(it \"knows the answer\"
-  (should= 42 *the-answer*))
"] \ No newline at end of file +[:div {:id "comp_box"} + [:p "Declares a function that will be invoked around each characteristic of the containing describe scope. The characteristic will be passed in and the around function is responsible for invoking it."] + + [:code "(declare *the-answer*) ; outside of a describe
+
+ (around [it]
+   (binding [*the-answer* 42]
+     (it)))
+
+ (it \"knows the answer\"
+   (should= 42 *the-answer*))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/before.hiccup.clj b/src/speclj_www/view/docs/before.hiccup.clj index f170104..4875510 100644 --- a/src/speclj_www/view/docs/before.hiccup.clj +++ b/src/speclj_www/view/docs/before.hiccup.clj @@ -1,6 +1,6 @@ [:h3 "before"] -[:p "Declares a function that is invoked before each characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] +[:div {:id "comp_box"} + [:p "Declares a function that is invoked before each characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] -[:code " -
(before (println \"A spec is about to be evaluated\"))
"] \ No newline at end of file + [:code "(before (println \"A spec is about to be evaluated\"))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/before_all.hiccup.clj b/src/speclj_www/view/docs/before_all.hiccup.clj index 6eb42c9..dfb4701 100644 --- a/src/speclj_www/view/docs/before_all.hiccup.clj +++ b/src/speclj_www/view/docs/before_all.hiccup.clj @@ -1,6 +1,6 @@ [:h3 "before-all"] -[:p "Declares a function that is invoked once before any characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] +[:div {:id "comp_box"} + [:p "Declares a function that is invoked once before any characteristic in the containing describe scope is evaluated. The body may consist of any forms, presumably ones that perform side effects."] -[:code " -
(before-all (println \"May the spec'ing begin!\"))
"] \ No newline at end of file + [:code "(before-all (println \"May the spec'ing begin!\"))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/describe.hiccup.clj b/src/speclj_www/view/docs/describe.hiccup.clj index fabbc31..d84ae60 100644 --- a/src/speclj_www/view/docs/describe.hiccup.clj +++ b/src/speclj_www/view/docs/describe.hiccup.clj @@ -5,5 +5,5 @@ [:p "Declares a new spec. The body can contain any forms that evaluate to spec compoenents (it, before, after, with ...)."] [:code "(describe \"Calculator\"
-  ... ; spec components
-)"]] \ No newline at end of file +   ... ; spec components
+ )"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/index.hiccup.clj b/src/speclj_www/view/docs/index.hiccup.clj index 5e9a3a2..83fdc11 100644 --- a/src/speclj_www/view/docs/index.hiccup.clj +++ b/src/speclj_www/view/docs/index.hiccup.clj @@ -1,3 +1,3 @@ [:h3 "Documentation"] -[:p "Here you can review all of the Speclj Components in detail. Click the sidebar to start."] \ No newline at end of file +[:p "This documentation covers each Speclj component individually. Use this section as a reference. If you are new to Speclj and want to learn how to use it, you will benefit more from the Tutorial section. Otherwise click the links in the sidebar to see the documentation of each Speclj component."] \ No newline at end of file diff --git a/src/speclj_www/view/docs/it.hiccup.clj b/src/speclj_www/view/docs/it.hiccup.clj index 60eba12..78e08fe 100644 --- a/src/speclj_www/view/docs/it.hiccup.clj +++ b/src/speclj_www/view/docs/it.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "it"] -[:p "Declares a new characteristic (example in rspec). The first parameter name should be a string the describes the characteristic. The second parameter body may be any forms but aught to have at least one should assertion."] +[:div {:id "comp_box"} + [:p "Declares a new characteristic (example in rspec). The first parameter name should be a string the describes the characteristic. The second parameter body may be any forms but aught to have at least one should assertion."] -[:code " -
(it \"adds numbers\"
-  (should= 2 (+ 1 1)))
"] \ No newline at end of file + [:code "(it \"adds numbers\"
+   (should= 2 (+ 1 1)))"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should.hiccup.clj b/src/speclj_www/view/docs/should.hiccup.clj index bbb2597..7eac377 100644 --- a/src/speclj_www/view/docs/should.hiccup.clj +++ b/src/speclj_www/view/docs/should.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "should"] -[:p "Asserts the truthy-ness of a form."] +[:div {:id "comp_box"} + [:p "Asserts the truthy-ness of a form."] -[:code " -
(should true) ; passes
-(should false) ; fails
"] \ No newline at end of file + [:code "(should true) ; passes
+ (should false) ; fails"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should_e.hiccup.clj b/src/speclj_www/view/docs/should_e.hiccup.clj index 6583750..67b6bfa 100644 --- a/src/speclj_www/view/docs/should_e.hiccup.clj +++ b/src/speclj_www/view/docs/should_e.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "should="] -[:p "Asserts that two forms evaluate to equal values, with the expexcted value as the first parameter."] +[:div {:id "comp_box"} + [:p "Asserts that two forms evaluate to equal values, with the expexcted value as the first parameter."] -[:code " -
(should= 1 1) ; passes
-(should= 1 2) ; fails
"] \ No newline at end of file + [:code "(should= 1 1) ; passes
+ (should= 1 2) ; fails"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should_fail.hiccup.clj b/src/speclj_www/view/docs/should_fail.hiccup.clj index 445b8a2..ab73936 100644 --- a/src/speclj_www/view/docs/should_fail.hiccup.clj +++ b/src/speclj_www/view/docs/should_fail.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "should-fail"] -[:p "Forces a failure. An optional message may be passed in."] +[:div {:id "comp_box"} + [:p "Forces a failure. An optional message may be passed in."] -[:code " -
(should-fail) ; fails
-(should-fail \"my message\") ; fails and \"my message\" is used as failure message
"] \ No newline at end of file + [:code "(should-fail) ; fails
+ (should-fail \"my message\") ; fails and \"my message\" is used as failure message"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should_not.hiccup.clj b/src/speclj_www/view/docs/should_not.hiccup.clj index c3ca655..696740e 100644 --- a/src/speclj_www/view/docs/should_not.hiccup.clj +++ b/src/speclj_www/view/docs/should_not.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "should-not"] -[:p "Asserts the falsy-ness of a form."] +[:div {:id "comp_box"} + [:p "Asserts the falsy-ness of a form."] -[:code " -
(should-not true) ; fails
-(should-not false) ; passes
"] \ No newline at end of file + [:code "(should-not true) ; fails
+ (should-not false) ; passes"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should_not_e.hiccup.clj b/src/speclj_www/view/docs/should_not_e.hiccup.clj index c5b5b0a..396aa94 100644 --- a/src/speclj_www/view/docs/should_not_e.hiccup.clj +++ b/src/speclj_www/view/docs/should_not_e.hiccup.clj @@ -1,7 +1,7 @@ [:h3 "should-not="] -[:p "Asserts that two forms evaluate to inequal values, with the unexpexcted value as the first parameter."] +[:div {:id "comp_box"} + [:p "Asserts that two forms evaluate to inequal values, with the unexpexcted value as the first parameter."] -[:code " -
(should-not= 1 1) ; fails
-(should-not= 1 2) ; passes
"] \ No newline at end of file + [:code "(should-not= 1 1) ; fails
+ (should-not= 1 2) ; passes"]] \ No newline at end of file diff --git a/src/speclj_www/view/docs/should_not_throw.hiccup.clj b/src/speclj_www/view/docs/should_not_throw.hiccup.clj index 7482a83..5b01f4e 100644 --- a/src/speclj_www/view/docs/should_not_throw.hiccup.clj +++ b/src/speclj_www/view/docs/should_not_throw.hiccup.clj @@ -1,10 +1,10 @@ [:h3 "should-not-throw"] -[:p "Asserts that nothing is thrown by the evaluation of a form."] +[:div {:id "comp_box"} + [:p "Asserts that nothing is thrown by the evaluation of a form."] -[:code " -
(should-not-throw (+ 1 1)) ; passes
-(should-not-throw (Exception.)) ; fails
"] + [:code "(should-not-throw (+ 1 1)) ; passes
+ (should-not-throw (Exception.)) ; fails"]] diff --git a/src/speclj_www/view/docs/should_throw.hiccup.clj b/src/speclj_www/view/docs/should_throw.hiccup.clj index 73fc049..d2d9c2c 100644 --- a/src/speclj_www/view/docs/should_throw.hiccup.clj +++ b/src/speclj_www/view/docs/should_throw.hiccup.clj @@ -1,11 +1,14 @@ [:h3 "should-throw"] -[:p "Asserts that a Throwable is throws by the evaluation of a form. When an class is passed, it assets that the thrown Exception is an instance of the class. When a string is also passed, it asserts that the message of the Exception is equal to the string."] +[:div {:id "comp_box"} + [:p "Asserts that a Throwable is throws by the evaluation of a form. When an class is passed, it assets that the thrown Exception is an instance of the class. When a string is also passed, it asserts that the message of the Exception is equal to the string."] -[:code " -
(should-throw (+ 1 1)) ; fails
-(should-throw (Exception.)) ; passes
-(should-throw NullPointerException (Exception.)) ; fails
-(should-throw Exception (NullPointerException.)) ; passes
-(should-throw Exception \"Foo\" (Exception. \"Bar\")) ; fails
-(should-throw Exception \"Foo\" (Exception. \"Foo\")) ; passes
"] \ No newline at end of file + [:code "(should-throw (+ 1 1)) ; fails
+ (should-throw (Exception.)) ; passes
+ (should-throw NullPointerException (Exception.)) ; fails
+ (should-throw
+   Exception (NullPointerException.)) ; passes
+ (should-throw
+   Exception \"Foo\" (Exception. \"Bar\")) ; fails
+ (should-throw
+   Exception \"Foo\" (Exception. \"Foo\")) ; passes"]] \ No newline at end of file diff --git a/src/speclj_www/view/layouts/index.hiccup.clj b/src/speclj_www/view/layouts/index.hiccup.clj index 3f8304f..bd0b80b 100644 --- a/src/speclj_www/view/layouts/index.hiccup.clj +++ b/src/speclj_www/view/layouts/index.hiccup.clj @@ -1,41 +1,37 @@ (doctype :html5) [:html - [:head - [:meta {:http-equiv "Content-Type" :content "text/html" :charset "utf-8"}] - [:title "Clojure Testing Framework | Speclj"] - (include-css "/stylesheets/reset.css") - (include-css "/stylesheets/speclj.css") - [:link {:rel "stylesheet" :type "text/css" :href "http://fonts.googleapis.com/css?family=Rosario:400,400italic"}] - ""] - [:body - [:div {:role "main"} - [:div {:id "top"} - [:div {:class "left"} - [:img {:class "speclj" :src "images/speclj.png"}]] - [:div {:class "right"} - [:p "a TDD/BDD framework for Clojure"] - [:h4 "pronounced \"speckle\" [spec-uhl]."]]] - [:div {:id "bottom"} - [:nav - [:ul - [:li [:a {:href "/install"} "Installation"]] - [:li [:a {:href "/tutorial"} "Tutorial"]] - [:li [:a {:href "/docs"} "Documentation"]] - [:li [:a {:href "/community"} "Community"]] - [:li [:a {:href "https://github.com/slagyr/speclj/issues" :target "_blank"} "Feature Requests"]]]] - - [:div {:id "body"} - (eval (:template-body joodo.views/*view-context*))]]] - - [:div {:id "footer"} - [:div {:id "foot-container"} - [:span {:id "foot-links"} - [:a {:href "/license"} "License Info"] - " | " - [:a {:href "https://github.com/slagyr/speclj/" :target "_blank"} "Git Repository"]] - [:br] - [:span "Copyright © 2011 Micah Martin All Rights Reserved"]]] - -]] \ No newline at end of file + [:head + [:meta {:http-equiv "Content-Type" :content "text/html" :charset "utf-8"}] + [:title "Clojure Testing Framework | Speclj"] + (include-css "/stylesheets/reset.css") + (include-css "/stylesheets/speclj.css") + (include-css "/stylesheets/clojure_code_highlight.css") + [:link {:rel "stylesheet" :type "text/css" :href "http://fonts.googleapis.com/css?family=Rosario:400,400italic"}] + ""] + [:body + [:div {:id "header"} + [:div {:id "head_body"} + [:a {:href "/"} [:img {:class "speclj" :src "/images/speclj.png"}]] + [:p "a TDD/BDD framework for Clojure"] + [:h4 "pronounced \"speckle\" [spec-uhl]"]]] + [:div {:id "main"} + [:div {:id "main_body"} + [:div {:id "nav"} + [:ul + [:li [:a {:href "/install"} "Installation"]] + [:li [:a {:href "/tutorial"} "Tutorial"]] + [:li [:a {:href "/docs"} "Documentation"]] + [:li [:a {:href "/community"} "Community"]] + [:li [:a {:href "https://github.com/slagyr/speclj/issues" :target "_blank"} "Feature Requests"]]]] + [:div {:id "content"} + (eval (:template-body joodo.views/*view-context*))]]] + [:div {:id "footer"} + [:div {:id "foot_body"} + [:span {:id "foot-links"} + [:a {:href "/license"} "License Info"] + " | " + [:a {:href "https://github.com/slagyr/speclj/" :target "_blank"} "Git Repository"]] + [:br] + [:span "Copyright © 2011 Micah Martin All Rights Reserved"]]]]] \ No newline at end of file diff --git a/src/speclj_www/view/tutorial/step1.hiccup.clj b/src/speclj_www/view/tutorial/step1.hiccup.clj index ea06b21..e6f31c3 100644 --- a/src/speclj_www/view/tutorial/step1.hiccup.clj +++ b/src/speclj_www/view/tutorial/step1.hiccup.clj @@ -10,11 +10,13 @@ [:p "What did we just do? We told Leiningen to create a new clojure project called change_counter in the directory that we are currently in. As you can see, a lot of new files and directories were just created. To use Speclj, we need to make some minor adjustments to the standard directory structure. Figure 1 shows the default directory structure that Leiningen creates, and Figure 2 shows the directory structure that Speclj requires."] -[:h5 [:a {:name "f1"} "Figure 1"]] -[:img {:src "/images/figure1.png"}] +[:div {:id "float_pic1"} + [:h5 [:a {:name "f1"} "Figure 1"]] + [:img {:src "/images/figure1.png"}]] -[:h5 [:a {:name "f2"} "Figure 2"]] -[:img {:src "/images/figure2.png"}] +[:div {:id "float_pic2"} + [:h5 [:a {:name "f2"} "Figure 2"]] + [:img {:src "/images/figure2.png"}]] [:p "Once you make the required changes to your project's directory, we are ready to install Speclj. If you have reviewed our Installation page, you would know that there are two ways we could do this. For this tutorial project, we will install using Leiningen. To do this we need to edit our project.clj file. Figure 3 shows what our project.clj file will look like after we make the changes outlined by the Installation page."]