Apply changes discussed in pull request

4clojure · Oct 8, 2011 · cbec197 · cbec197
1 parent 0c623f3
commit cbec197
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/resources/public/css/style.css b/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

diff --git a/src/foreclojure/datatable.clj b/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)))
diff --git a/src/foreclojure/users.clj b/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]}]
+    (into [] (map-indexed
-                    [rank
+              (fn [rownum {:keys [_id email position rank user contributor solved]}]
-                     (str
+                [rank
-                      (html (gravatar-img {:email email :class "gravatar"}))
+                 (html (list
-                      (html [:a.user-profile-link {:href (str "/user/" user)} user (when contributor [:span.contributor " *"])]))
+                        (gravatar-img {:email email :class "gravatar"})
-                     (count solved)
+                        [:a.user-profile-link {:href (str "/user/" user)}
-                     (html (following-checkbox user-id following _id user))])
+                         user (when contributor [:span.contributor " *"])]))
-                          user-set))))
+                 (count solved)
+                 (html (following-checkbox user-id following _id user))])
+              user-set))))
 
 (def-page all-users-page []
   {:title "All 4Clojure Users"