Skip to content
Browse files

Apply changes discussed in pull request

  • Loading branch information...
1 parent 0c623f3 commit cbec197636536d8260a66aa6dcaa171102d48057 @amalloy amalloy committed Oct 8, 2011
Showing with 14 additions and 17 deletions.
  1. +1 −8 resources/public/css/style.css
  2. +3 −1 src/foreclojure/datatable.clj
  3. +10 −8 src/foreclojure/users.clj
View
9 resources/public/css/style.css
@@ -232,19 +232,12 @@ img.gravatar{
padding-bottom: 5px;;
}
-#user-table{
+#user-table, #server-user-table{
float: left;
width: 100%;
padding: 15px;
}
-#server-user-table{
- float: left;
- width: 100%;
- padding: 15px;
-}
-
-
/*
* By default only show the text label for the "Following" column on
* the users page. If they have javascript turned on (detected
View
4 src/foreclojure/datatable.clj
@@ -6,5 +6,7 @@
(def datatable-routes
(-> (routes
- (GET "/datatable/users" [& more] {:body (user-datatable-query more)}))
+ (GET "/datatable/users" [& more]
+ {:body (user-datatable-query more)
+ :status 200}))
(wrap-json)))
View
18 src/foreclojure/users.clj
@@ -138,14 +138,16 @@
(when (session/session-get :user)
(with-user [{:keys [_id following]}]
[_id (set following)]))]
- (into [] (map-indexed (fn [rownum {:keys [_id email position rank user contributor solved]}]
- [rank
- (str
- (html (gravatar-img {:email email :class "gravatar"}))
- (html [:a.user-profile-link {:href (str "/user/" user)} user (when contributor [:span.contributor " *"])]))
- (count solved)
- (html (following-checkbox user-id following _id user))])
- user-set))))
+ (into [] (map-indexed
+ (fn [rownum {:keys [_id email position rank user contributor solved]}]
+ [rank
+ (html (list
+ (gravatar-img {:email email :class "gravatar"})
+ [:a.user-profile-link {:href (str "/user/" user)}
+ user (when contributor [:span.contributor " *"])]))
+ (count solved)
+ (html (following-checkbox user-id following _id user))])
+ user-set))))
(def-page all-users-page []
{:title "All 4Clojure Users"

0 comments on commit cbec197

Please sign in to comment.
Something went wrong with that request. Please try again.