Merge branch 'release/0.2.2'

4clojure · May 6, 2011 · ad1756f · ad1756f
2 parents 465eed6 + d9370f6
commit ad1756f
Show file tree

Hide file tree

Showing 16 changed files with 492 additions and 64 deletions.
diff --git a/config.clj b/config.clj
@@ -4,4 +4,6 @@
  :db-pwd nil
  :host "smtp.googlemail.com"
  :user "team@4clojure.com"
- :pass ""}
+ :pass ""
+ :problem-submission false
+ :advanced-user-count 50}
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.2.1"
+(defproject foreclojure "0.2.2"
   :description "4clojure - a website for lisp beginners"
   :dependencies [[org.clojure/clojure "1.2.1"]
                  [org.clojure/clojure-contrib "1.2.0"]
@@ -7,11 +7,12 @@
                  [clojail "0.4.0-SNAPSHOT"]
                  [sandbar "0.4.0-SNAPSHOT"]
                  [org.clojars.christophermaier/congomongo "0.1.4-SNAPSHOT"]
-		 [org.jasypt/jasypt "1.7"]
+                 [org.jasypt/jasypt "1.7"]
                  [amalloy/utils "[0.3.7,)"]
                  [clj-github "1.0.1"]
                  [ring "0.3.7"]
                  [clj-config "0.1.0"]
+                 [incanter/incanter-charts "1.2.1"]
                  [org.apache.commons/commons-email "1.2"]]
   :dev-dependencies [[lein-ring "0.4.0"]
                      [swank-clojure "1.2.1"]]

diff --git a/resources/public/css/style.css b/resources/public/css/style.css
@@ -7,6 +7,9 @@ body {
    text-align: center;
 }
 
+img {border:none}
+
+
 #account{
    float:right;
    width: 100%;
@@ -58,6 +61,9 @@ body {
    width: 95%;
    padding: 15px 0px 15px 0px;
 }
+div#top a {
+  border: 0;
+}
 
 h3 {
    font-size: 18px;
@@ -110,6 +116,7 @@ a.novisited {color: #00e;}
 #logo {
    float:left;
    padding:15px 0px 15px 0px;
+   border: 0;
 }
 
 #welcome{
@@ -223,11 +230,26 @@ div#restrictions {
    margin-left: 1.3em;
 }
 
-textarea#code-box {
+textarea#code-box, #problem-submission textarea {
    width: 500px;
    height: 250px;
 }
 
+form#problem-submission label {
+  font-weight: bold;
+  display: block;
+  margin: 10px 0 4px;
+}
+
+form#problem-submission #problem-description {
+  height: 4em;
+}
+
+div#problems-error {
+  font-size: 1.4em;
+  margin: 2px 0 10px;
+}
+
 #code-div{
   width: 100%;
   height: 250px;
@@ -310,3 +332,13 @@ button:active {
    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C')";
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C');
 }
+
+#golfgraph{ 
+  width: 90%
+}
+
+#golfgraph img{
+  height: 300px;
+  padding-top: 25px;
+}
+
diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico
diff --git a/resources/public/images/favicon.ico b/resources/public/images/favicon.ico
diff --git a/resources/public/script/foreclojure.js b/resources/public/script/foreclojure.js
@@ -35,9 +35,8 @@ function configureCodeBox(){
     //If we have javascript on then we remove it and replace it with
     //the proper div
     var oldBox = $('#code-box');
-    oldBox.replaceWith("<div id=\"code-div\"> <pre id=\"editor\">" + oldBox.val() + "</pre></div>");
     var hiddenCodeInput = "<input type=\"hidden\" value=\"blank\" name=\"code\" id=\"code\">";
-    $(hiddenCodeInput).insertBefore('#id');
+    oldBox.replaceWith("<div id=\"code-div\"> <pre id=\"editor\">" + oldBox.val() + "</pre></div>"+hiddenCodeInput);
 
     if ($("#run-button").length){
        var editor = ace.edit("editor");

diff --git a/src/foreclojure/config.clj b/src/foreclojure/config.clj
@@ -4,4 +4,4 @@
 
 (def config-file (file (System/getProperty "user.dir") "config.clj"))
 
-(def config (safely read-config config-file))
+(def config (safely read-config config-file))
diff --git a/src/foreclojure/core.clj b/src/foreclojure/core.clj
@@ -1,11 +1,11 @@
 (ns foreclojure.core
   (:use compojure.core
-        [foreclojure static problems login register
-         users config social version db-utils utils]
+        [foreclojure static problems login register golf
+         users config social version graphs db-utils utils]
         ring.adapter.jetty
         somnium.congomongo
-        ring.middleware.stacktrace
-        [ring.middleware.reload :only [wrap-reload]])
+        (ring.middleware (reload :only [wrap-reload])
+                         (stacktrace :only [wrap-stacktrace])))
   (:require [compojure [route :as route] [handler :as handler]]
             [sandbar.stateful-session :as session]
             [ring.util.response :as response]))
@@ -34,6 +34,8 @@
   static-routes
   social-routes
   version-routes
+  graph-routes
+  golf-routes
   (route/resources "/")
   (route/not-found "Page not found"))