Get rid of fixed-position-ness of nav sidebar

refs functional-koans/clojure-koans#34

Author: trptcolin

public/stylesheets/style.css

@@ -15,7 +15,7 @@
  * =MC Main Content
  *
  *
- * Color Index 
+ * Color Index
  * #e2dcd4 - Body Background Beige - to avoid white flicker prior to paper.jpg load
  * #afb59b - 'Stripe' Navigation Banner Background Green - again to avoid flickr before image load
  * #990000 - Link hover red (non-navigation links)
@@ -49,18 +49,15 @@
 
 html, body {
   background-color: #e2dcd4;
+  background: url('../images/paper.jpg');
+  background-attachment: fixed;
   font-size: 16px;
 	color: #2a1807;
   font-family: 'Optima', Arial, sans-serif;
   margin: 0;
   padding: 0;
 }
 
-body {
-  background-image: url('../images/paper.jpg');
-  background-attachment: fixed;  
-}
-
 ul {
   list-style-type: none;
   padding: 0;
@@ -73,7 +70,7 @@ h1 {
   font-family: 'Optima', Arial, sans-serif;
   font-weight: lighter;
   margin: 0;
-  text-shadow: 0px -1px 1px #f3f3f3; 
+  text-shadow: 0px -1px 1px #f3f3f3;
 }
 
 p {
@@ -83,10 +80,10 @@ p {
   padding: 0;
 }
 
-a { 
+a {
   color: #b04d22;
-  font-weight: bold; 
-  text-decoration: none; 
+  font-weight: bold;
+  text-decoration: none;
 }
 
 a:hover {
@@ -104,8 +101,9 @@ a:hover {
 /* Main Body */
 #outer-wrapper {
   margin: 0 auto;
-  overflow: hidden; 
+  overflow: hidden;
   width: 999px; /* Main site width */
+  position: relative;
 }
 
 .rounded_top {
@@ -115,53 +113,56 @@ a:hover {
 
 /* Body Text Column - Right container - holds body text*/
 #inner-wrapper {
-  float: right; 
   margin-right: 35px;
   padding-top: 1em;
   width: 629px;
+  float: left;
 }
 
 #top { color: #595249; font-size: 60px; }
 
-
+.clearfix { clear: both; }
 
 
 
 
 /* ######### NAVIGATION ########## */
 /* =N */
 
+#stripe-wrapper {
+}
+
 #stripe {
   background-color: #afb59b;
   background-image: url('../images/bg5.jpg');
   height: 100%;
   padding-top: 26px;
-  position: fixed;
+  float: left;
   margin: 0px 35px;
   text-align: center;
   width: 265px;
-      
+
   zoom: 1;
   filter: progid:DXImageTransform.Microsoft.Shadow(color='#000000', Direction=135, Strength=1);
-  box-shadow: 0 0 7px black;    
+  box-shadow: 0 0 7px black;
 }
 
 #stripe ul {
 	padding: 26px;
 	text-align: left;
 }
 
-#stripe a { 
+#stripe a {
 	color: #2a1807;
   display: block;
-  font-weight: normal; 
+  font-weight: normal;
   font-family: Rosarivo, Arial, Sans-serif;
   padding: .42em;
   border-bottom: 1px dashed #e0d5c7;
 }
 #stripe a:hover {
   background: rgba(255,255,255, .25);
-  border-radius: 2px; 
+  border-radius: 2px;
 	color: #e95d3d;
 }
 
@@ -192,7 +193,7 @@ a:hover {
 .contributors {
   margin: 0 auto;
   padding: 2em .5em;
-  width: 350px; 
+  width: 350px;
 }
 
 .contributors li {
@@ -215,31 +216,31 @@ a:hover {
 
 #two {
   background-image: url('../images/bulls/bull2.png');
-  background-position: 100% 95%;	
+  background-position: 100% 95%;
 }
 
 #three {
   background-image: url('../images/bulls/bull3.png');
-  background-position: 90% 87%;	
+  background-position: 90% 87%;
 }
 
 #five { /* Actually number 4 on the page */
   background-image: url('../images/bulls/bull5.png');
-  background-position: 100% 90%;	
+  background-position: 100% 90%;
 }
 
 #seven {
   background-image: url('../images/bulls/bull6.png');
-  background-position: 100% 60%;	
+  background-position: 100% 60%;
 }
 
 #eight {
   background-image: url('../images/bulls/bull7.png');
-  background-position: 100% 38%;	
+  background-position: 100% 38%;
 }
 
 
 #nine {
   background-image: url('../images/bulls/bull8.png');
-  background-position: 100% 68%;	
-}
+  background-position: 100% 68%;
+}

src/clojurekoans/view/index.hiccup.clj

@@ -1,5 +1,24 @@
-[:div {:id "outer-wrapper"}
- [:div#cover]
+[:div#outer-wrapper
+ [:div#stripe
+  [:img {:src "images/logo.png"}]
+  [:ul
+   [:li
+    [:a {:href "#"} "Introduction"]]
+   [:li
+    [:a {:href "#"} "1. Install Java"]]
+   [:li
+    [:a {:href "#"} "2. Install the Koans"]]
+   [:li
+    [:a {:href "#"} "3. Run the First Koan"]]
+   [:li
+    [:a {:href "#"} "4. Repeat"]]
+   [:li
+    [:a {:href "#"} "A Word on Testing"]]
+   [:li
+    [:a {:href "#"} "Contributors"]]
+   [:li
+    [:a {:href "#"} "Thanks"]]]]
+
  [:div#inner-wrapper
   [:div#one.section
 
@@ -96,12 +115,7 @@
   [:div#eight.section
    [:h1 "Contributors"]
 
-   (if-let [contributors (seq (get-contributors))]
-    [:ul.contributors
-      (doall (for [{name :name login :login} contributors]
-               [:li
-                [:a {:href (str "https://github.com/" login)} name]]))]
-   [:p [:a {:href "https://github.com/functional-koans/clojure-koans/graphs/contributors"} "Our Contributors"]])
+   [:p [:a {:href "https://github.com/functional-koans/clojure-koans/graphs/contributors"} "Our Contributors"]]
 
    [:p "If you have any questions or suggestions about the koans, feel free to "
     [:a {:href "https://github.com/functional-koans/clojure-koans/"} "open an issue or pull request"]
@@ -121,23 +135,4 @@
     " and powered by "
     [:a {:href "http://www.joodoweb.com"} "Joodo"]
     "."]]]
-
-[:div#stripe
- [:img {:src "images/logo.png"}]
- [:ul
-  [:li
-   [:a {:href "#"} "Introduction"]]
-  [:li
-   [:a {:href "#"} "1. Install Java"]]
-  [:li
-   [:a {:href "#"} "2. Install the Koans"]]
-  [:li
-   [:a {:href "#"} "3. Run the First Koan"]]
-  [:li
-   [:a {:href "#"} "4. Repeat"]]
-  [:li
-   [:a {:href "#"} "A Word on Testing"]]
-  [:li
-   [:a {:href "#"} "Contributors"]]
-  [:li
-   [:a {:href "#"} "Thanks"]]]]]
+[:div.clearfix]]

src/clojurekoans/view/view_helpers.clj

@@ -3,35 +3,5 @@
   (:use
     [joodo.views :only (render-partial *view-context*)]
     [hiccup.page-helpers]
-    [hiccup.form-helpers]
-    [clojure.java.io :only [reader]]
-    [clojure.data.json :only [read-json]])
-  (:import java.net.URL))
+    [hiccup.form-helpers]))
 
-(def cached-contributors (atom []))
-
-(defn get-contributor-json
-  ([]
-    (try
-     (let [conn (-> (URL. "http://github.com/api/v2/json/repos/show/functional-koans/clojure-koans/contributors")
-                    .openConnection)]
-       (.setConnectTimeout conn 1000)
-       (.setReadTimeout conn 1000)
-       (get-contributor-json (.getInputStream conn)))
-     (catch Exception e
-       nil)))
-  ([stream]
-     (try
-       (slurp (reader stream))
-       (catch Exception e
-         nil))))
-
-(defn get-contributors
-  ([]
-     (get-contributors (get-contributor-json)))
-  ([json]
-     (let [parsed (if json
-                    (read-json json)
-                    @cached-contributors)]
-       (when json (reset! cached-contributors parsed))
-       (:contributors parsed))))