Skip to content

Commit

Permalink
Merge pull request #40 from bcambel/anonymize
Browse files Browse the repository at this point in the history
Anonymize
  • Loading branch information
bcambel committed Mar 17, 2015
2 parents 754d065 + 7657c15 commit 4e10703
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
44 changes: 25 additions & 19 deletions src/clj/hsm/controllers/user.clj
Expand Up @@ -34,16 +34,18 @@

(defhtml user-part
[id user admin? c-star c-follow c-followers]
(panel [:a {:href (str "/user2/" id)} (:login user)]
[:img.img-responsive.img-rounded {:src (:image user)}]
[:h3 [:span (:login user)]
[:a.pad10 {:href (str "https://github.com/" (:login user))} [:i.fa.fa-github]]]
[:h5 [:span (:name user)]]
[:p [:a {:href (:blog user)}(:blog user)]]
[:p (:company user)]
[:p (:location user)]
[:p (:type user)]
[:a {:href (str "mailto://" (:email user))} (:email user)]
(panel "A User" ;[:a {:href (str "/user2/" id)} (:login user)]
; [:img.img-responsive.img-rounded {:src (:image user)}]
[:h3 ;[:span (:login user)]
"A User"
; [:a.pad10 {:href (str "https://github.com/" (:login user))} [:i.fa.fa-github]]
]
[:h5 "A User"] ;[:span (:name user)]]
; [:p [:a {:href (:blog user)}(:blog user)]]
; [:p (:company user)]
; [:p (:location user)]
; [:p (:type user)]
; [:a {:href (str "mailto://" (:email user))} (:email user)]
[:hr]

[:h3 [:a {:href (str "/user2/" id "/starred")} c-star ]" starred "]
Expand Down Expand Up @@ -114,7 +116,8 @@
; (log/warn user-repos)
(if is-json
(json-resp user)
(layout {:website host :title (format "%s - %s " (:login user) (:name user))}
(layout {:website host :title "A User" ;(format "%s - %s " (:login user) (:name user))
}
[:div.row
[:div.col-lg-3
(left-menu host platform (str "/user2/" id))]
Expand Down Expand Up @@ -207,9 +210,10 @@
(if is-json
(json-resp (:followers user-extras))
(layout {:website host
:title (format "%s - %s " (:login user) (:name user))
:desription (format "%s (%s) followed by these users " (:login user) (:name user))
:keywords (str/join "," [(:login user) (:name user) (format "%s followers" (:name user))])}
:title "A User" ;(format "%s - %s " (:login user) (:name user))
; :desription (format "%s (%s) followed by these users " (:login user) (:name user))
; :keywords (str/join "," [(:login user) (:name user) (format "%s followers" (:name user))])
}
[:div.row
[:div.col-lg-3
(user-part id user admin? c-star c-follow c-followers)]
Expand Down Expand Up @@ -239,9 +243,9 @@
(if is-json
(json-resp (:following user-extras))
(layout {:website host
:title (format "%s (%s) following these users " (:login user) (:name user))
:description (format "%s (%s) following these users " (:login user) (:name user))
:keywords (str/join "," [(:login user) (:name user) (format "%s following" (:name user))])
:title "A User" ;(format "%s (%s) following these users " (:login user) (:name user))
; :description (format "%s (%s) following these users " (:login user) (:name user))
; :keywords (str/join "," [(:login user) (:name user) (format "%s following" (:name user))])
}
[:div.col-lg-3
(user-part id user admin? c-star c-follow c-followers)]
Expand Down Expand Up @@ -271,7 +275,9 @@
(layout {:website host :title "User does not exist"} "User opted-out.")
(if is-json
(json-resp (:starred user-extras))
(layout {:website host :title (format "%s - %s " (:login user) (:name user))}
(layout {:website host :title "A User"
; (format "%s - %s " (:login user) (:name user))
}
[:div.col-lg-3
(user-part id user admin? c-star c-follow c-followers)]
[:div.col-lg-9
Expand Down Expand Up @@ -310,7 +316,7 @@
[:tr
[:td [:h4 (:followers x)]]
[:td
[:img.img-rounded.img-responsive.pull-left {:src (:image x) :style "width:64px;margin-right:10px;"}]
; [:img.img-rounded.img-responsive.pull-left {:src (:image x) :style "width:64px;margin-right:10px;"}]
[:a {:href (str "/user2/" (:login x))} (:login x)]
[:br]
(:name x)
Expand Down
2 changes: 1 addition & 1 deletion src/clj/hsm/views.clj
Expand Up @@ -99,7 +99,7 @@
[x & {:keys [show-followers] :or {show-followers false}}]
[:div.user-card
[:a {:href (format "/user2/%s" (:login x)) :title (:name x)}
[:img.img-rounded {:src (:image x) :style "width:36px;height:36px;"}]
; [:img.img-rounded {:src (:image x) :style "width:36px;height:36px;"}]
[:span.name (:login x)]]
(when show-followers
[:span.followers.pull-right (:followers x)])
Expand Down

0 comments on commit 4e10703

Please sign in to comment.