Permalink
Browse files

Merge branch 'release/0.3.0'

  • Loading branch information...
2 parents 495fc83 + bda3e7a commit 2735985ed830ec95d2704bbb696ea20f09f50557 @amalloy amalloy committed May 16, 2011
Showing with 610 additions and 16,149 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 README.md
  3. +2 −2 config.clj
  4. +3 −2 project.clj
  5. +73 −14 resources/public/css/style.css
  6. +0 −13,357 resources/public/script/ace/src/ace-uncompressed.js
  7. +0 −2,504 resources/public/script/ace/src/cockpit-uncompressed.js
  8. +0 −1 resources/public/script/ace/src/cockpit.js
  9. +0 −1 resources/public/script/ace/src/keybinding-emacs.js
  10. +0 −1 resources/public/script/ace/src/keybinding-vim.js
  11. +0 −1 resources/public/script/ace/src/mode-c_cpp.js
  12. +0 −1 resources/public/script/ace/src/mode-coffee.js
  13. +0 −1 resources/public/script/ace/src/mode-csharp.js
  14. +0 −1 resources/public/script/ace/src/mode-css.js
  15. +0 −1 resources/public/script/ace/src/mode-html.js
  16. +0 −1 resources/public/script/ace/src/mode-java.js
  17. +0 −1 resources/public/script/ace/src/mode-javascript.js
  18. +0 −1 resources/public/script/ace/src/mode-perl.js
  19. +0 −1 resources/public/script/ace/src/mode-php.js
  20. +0 −1 resources/public/script/ace/src/mode-python.js
  21. +0 −1 resources/public/script/ace/src/mode-ruby.js
  22. +0 −1 resources/public/script/ace/src/mode-svg.js
  23. +0 −1 resources/public/script/ace/src/mode-xml.js
  24. +0 −1 resources/public/script/ace/src/theme-clouds.js
  25. +0 −1 resources/public/script/ace/src/theme-clouds_midnight.js
  26. +0 −1 resources/public/script/ace/src/theme-cobalt.js
  27. +0 −1 resources/public/script/ace/src/theme-dawn.js
  28. +0 −1 resources/public/script/ace/src/theme-eclipse.js
  29. +0 −1 resources/public/script/ace/src/theme-idle_fingers.js
  30. +0 −1 resources/public/script/ace/src/theme-kr_theme.js
  31. +0 −1 resources/public/script/ace/src/theme-merbivore.js
  32. +0 −1 resources/public/script/ace/src/theme-merbivore_soft.js
  33. +0 −1 resources/public/script/ace/src/theme-mono_industrial.js
  34. +0 −1 resources/public/script/ace/src/theme-monokai.js
  35. +0 −1 resources/public/script/ace/src/theme-pastel_on_dark.js
  36. +0 −1 resources/public/script/ace/src/theme-twilight.js
  37. +0 −1 resources/public/script/ace/src/theme-vibrant_ink.js
  38. +0 −1 resources/public/script/ace/src/worker-javascript.js
  39. +0 −56 resources/public/script/foreclojure.js
  40. 0 resources/public/{script/ace/src → vendor/script/ace}/ace.js
  41. 0 resources/public/{script/ace/src → vendor/script/ace}/mode-clojure.js
  42. +109 −0 resources/public/vendor/script/foreclojure.js
  43. 0 resources/public/{ → vendor}/script/jquery-1.5.2.min.js
  44. 0 resources/public/{ → vendor}/script/jquery.dataTables.min.js
  45. 0 resources/public/{ → vendor}/script/shAutoloader.js
  46. 0 resources/public/{ → vendor}/script/shBrushClojure.js
  47. 0 resources/public/{ → vendor}/script/shCore.js
  48. 0 resources/public/{ → vendor}/script/shLegacy.js
  49. 0 resources/public/{ → vendor}/script/xregexp.js
  50. +125 −21 src/foreclojure/data_set.clj
  51. +7 −6 src/foreclojure/graphs.clj
  52. +1 −15 src/foreclojure/login.clj
  53. +178 −77 src/foreclojure/problems.clj
  54. +27 −5 src/foreclojure/social.clj
  55. +83 −59 src/foreclojure/utils.clj
View
@@ -8,3 +8,4 @@ pom.xml
*#
.cake
.DS_Store
+.#*
View
@@ -52,6 +52,7 @@ Problem sources:
* Aaron Bedra's [Clojure Koans](https://github.com/functional-koans/clojure-koans)
* [Ninety-Nine Lisp Problems](http://www.ic.unicamp.br/~meidanis/courses/mc336/2006s2/funcional/L-99_Ninety-Nine_Lisp_Problems.html)
+ * [Project Euler](http://www.projecteuler.net)
## License
View
@@ -4,6 +4,6 @@
:db-pwd nil
:host "smtp.googlemail.com"
:user "team@4clojure.com"
- :pass ""
:problem-submission false
- :advanced-user-count 50}
+ :advanced-user-count 50
+ :pass ""}
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.2.2.1"
+(defproject foreclojure "0.3.0"
:description "4clojure - a website for lisp beginners"
:dependencies [[org.clojure/clojure "1.2.1"]
[org.clojure/clojure-contrib "1.2.0"]
@@ -12,7 +12,8 @@
[clj-github "1.0.1"]
[ring "0.3.7"]
[clj-config "0.1.0"]
- [incanter/incanter-charts "1.2.1"]
+ [incanter/incanter-core "1.2.3"]
+ [incanter/incanter-charts "1.2.3"]
[org.apache.commons/commons-email "1.2"]]
:dev-dependencies [[lein-ring "0.4.0"]
[swank-clojure "1.2.1"]]
@@ -3,14 +3,14 @@ body {
font-size: 12px;
font-family: Verdana, Arial, Helvetica, SunSans-Regular, Sans-Serif;
color:#564b47;
- margin: 20px 140px 20px 140px;
+ margin: 20px 0;
text-align: center;
}
img {border:none}
-#account{
+#account.header-option {
float:right;
width: 100%;
text-align: right;
@@ -19,11 +19,16 @@ img {border:none}
font-weight: bold;
}
-#account a:link {color: #445599;}
-#account a:visited {color: #445599;}
-#account a:active {color: #445599;}
-#account a:hover {color: #7CFC00;}
-#account a {text-decoration: none; font-size: 12px; font-weight:bold;}
+#manage-unapproved {
+ position: absolute;
+ right: 150px;
+}
+
+.header-option a:link {color: #445599;}
+.header-option a:visited {color: #445599;}
+.header-option a:active {color: #445599;}
+.header-option a:hover {color: #7CFC00;}
+.header-option a {text-decoration: none; font-size: 12px; font-weight:bold;}
#wrapper {
width: 100%;
@@ -37,14 +42,15 @@ img {border:none}
}
#content {
- width: 95%;
- margin: 15px;
+ width: 85%;
+ margin: 15px auto;
padding: 15px 0px 15px 0px;
text-align: left;
background-color: #fff;
overflow: auto;
-moz-border-radius: 15px;
border-radius: 15px;
+ position: relative;
}
#content_body {
@@ -58,8 +64,9 @@ img {border:none}
}
#top {
- width: 95%;
+ width: 85%;
padding: 15px 0px 15px 0px;
+ margin: 0 auto;
}
div#top a {
border: 0;
@@ -76,6 +83,17 @@ h3 {
color: #fff;
}
+#lower-menu {
+ background-color: darkblue;
+ padding: 10px 5px 10px;
+ color: #7CFC00;
+}
+#lower-menu a:link {color: #fff;}
+#lower-menu a:visited {color: #fff;}
+#lower-menu a:active {color: #445599;}
+#lower-menu a:hover {color: #7CFC00;}
+#lower-menu a {text-decoration: none; font-size: 1.1em; font-weight:bold; padding: 0 20px;}
+
a.novisited {color: #00e;}
#menu a:link {color: #fff;}
@@ -142,7 +160,7 @@ a.novisited {color: #00e;}
float: left;
}
-#problem-table{
+#problem-table, table#unapproved-problems {
float: left;
width: 100%;
}
@@ -169,8 +187,10 @@ span.error, div.error {
div.message {
color: red;
- margin-bottom: 8px;
font-size: 16px;
+ width: 75%;
+ float: left;
+ position: absolute;
}
span#prob-title {
@@ -334,11 +354,50 @@ button:active {
}
#golfgraph{
- width: 90%
+ width: 90%;
}
#golfgraph img{
- height: 300px;
padding-top: 25px;
}
+#golf-scores{
+ color: black;
+ font-size: 16px;
+ width: 25%;
+ float: right;
+ background-color:#bbddee;
+ overflow: auto;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
+ text-align: center;
+}
+
+#instruct{
+ font-weight: bold;
+ width: 100%;
+ padding-top: 25px;
+}
+
+#golfheader{
+ font-weight: bold;
+ background-color:#445599;
+ color: #fff;
+ text-align: center;
+ width: 100%;
+}
+
+#graph-link{
+ width: 100%;
+ text-align: center;
+ float: right;
+ font-weight: bold;
+ font-size: 12px;
+ padding-bottom: 5px;
+ display: none;
+}
+
+a.graph-class :hover {color: #445599;}
+
+
+
Oops, something went wrong.

0 comments on commit 2735985

Please sign in to comment.