Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmarianski
rmarianski committed Oct 31, 2012
1 parent f336b9a commit e5b4e3f
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 56 deletions.
22 changes: 9 additions & 13 deletions project.clj
View file
@@ -1,26 +1,22 @@
(defproject foo "1.0.0-SNAPSHOT"
:description "FIXME: write description"
:dev-dependencies [[lein-ring "0.5.2"]]
:dependencies [[org.clojure/clojure "1.3.0"]
[compojure "1.0.0"]
[hiccup "0.3.7"]
[ring/ring-servlet "1.0.1"]
[ring/ring-devel "1.0.1"]
[rmarianski/ring-jetty-servlet-adapter "0.0.2"]
:dependencies [[org.clojure/clojure "1.4.0"]
[compojure "1.1.3"]
[hiccup "1.0.0"]
[ring "1.1.6"]
[rmarianski/ring-jetty-servlet-adapter "0.0.3"]
[commons-codec "1.6"]
[commons-lang "2.6"]
[com.salesforce/wsc "2.2"]
[org.soros/prod-salesforce-docphoto "0.0.1"]
;; [org.soros/dev-salesforce-docphoto "0.0.1"]
;; if metadata operations are wanted
;; [org.soros/dev-salesforce-docphoto-metadata "0.0.1"]
[clj-decline "0.0.5"]
[flutter "0.0.7"]
[flutter "0.0.8"]
[org.imgscalr/imgscalr-lib "4.1"]
[com.draines/postal "1.7.0"]
[org.clojure/core.incubator "0.1.0"]
[clj-stacktrace "0.2.4"]
[swank-clojure "1.4.2"]]
[clj-stacktrace "0.2.4"]]
:ring {:handler docphoto.core/app
:init docphoto.core/servlet-init
:destroy docphoto.core/servlet-destroy})
:destroy docphoto.core/servlet-destroy
:resource-scripts [docphoto/core.clj]})
71 changes: 38 additions & 33 deletions src/docphoto/core.clj
View file
Expand Up @@ -4,9 +4,10 @@
[compojure.response :only (render)]
[ring.middleware.multipart-params :only (wrap-multipart-params)]
[ring.middleware.file-info :only (wrap-file-info)]
[hiccup.util :only (escape-html)]
[hiccup.core :only (html)]
[hiccup.page-helpers :only (xhtml include-css
include-js javascript-tag)]
[hiccup.page :only (xhtml include-css include-js)]
[hiccup.element :only (javascript-tag)]
[ring.adapter.jetty-servlet :only (run-jetty)]
[ring.util.response :only (redirect)]
[clojure.core.incubator :only (-?> -?>> dissoc-in)]
Expand All @@ -28,7 +29,9 @@
[clojure.string :as string]
[clojure.set]
[docphoto.guidelines :as guidelines]
[hiccup.page-helpers :as ph]
[hiccup.page :as ph]
[hiccup.util :as hu]
[hiccup.element :as he]
[ring.middleware.stacktrace :as stacktrace]
[ring.util.codec :as ring-codec]
[decline.core :as decline]
Expand Down Expand Up @@ -354,7 +357,7 @@
"Generate a string link from the parts. They are joined together with str"
[fn-name args & uri-parts]
`(defn ~fn-name ~args
(ph/url "/" ~@(interpose "/" uri-parts))))
(hu/url "/" ~@(interpose "/" uri-parts))))

(defmacro deflinks [& deflink-specs]
`(do ~@(for [spec deflink-specs]
Expand Down Expand Up @@ -417,7 +420,7 @@
(when user
(list
[:div#update-profile
(ph/link-to (profile-update-link (:id user)) (i18n/translate :update-profile))]
(he/link-to (profile-update-link (:id user)) (i18n/translate :update-profile))]
(let [apps (query-applications (:id user))]
(when (not-empty apps)
[:div#applications-list
Expand All @@ -443,10 +446,10 @@
[:div#admin
[:h2 "Admin"]
[:ul
[:li (ph/link-to (admin-password-reset-link) "Reset User Password")]
[:li (ph/link-to (admin-create-vetter-link) "Create Vetter Account")]
[:li (ph/link-to (admin-download-link) "Download Images")]
[:li (ph/link-to (admin-login-as-link) "Login As Other User")]]]))))))
[:li (he/link-to (admin-password-reset-link) "Reset User Password")]
[:li (he/link-to (admin-create-vetter-link) "Create Vetter Account")]
[:li (he/link-to (admin-download-link) "Download Images")]
[:li (he/link-to (admin-login-as-link) "Login As Other User")]]]))))))

(defmacro when-multiple-languages [& body]
(cond
Expand All @@ -473,7 +476,7 @@
[:body
[:div#wrapper
[:div#header
[:div#osf-logo (ph/image "/public/osf-logo.png"
[:div#osf-logo (he/image "/public/osf-logo.png"
"Open Society Foundations")]
(when-multiple-languages
[:div#language
Expand All @@ -484,11 +487,11 @@
[:li
(if (= (keyword lang) current-language)
text
(ph/link-to
(he/link-to
(switch-language-link lang came-from) text))]))]])
[:div#heading-section
[:div#contact (ph/link-to "mailto:docphoto@sorosny.org" "Contact Us")]
[:h1#heading (ph/link-to
;[:div#contact (he/link-to "mailto:docphoto@sorosny.org" "Contact Us")]
[:h1#heading (he/link-to
"/"
(str (heading-apply-text request) ": " (i18n/translate :apply-online)))]]]
[:div#page
Expand Down Expand Up @@ -961,7 +964,7 @@
{:title (str (:name exhibit) " Closed")}
[:div
[:p "We are no longer accepting applications for " (:name exhibit) "."]
[:p "If you attempted to submit your application before or on the May 2nd deadline and had trouble with the online application system, please contact Felix Endara at " (ph/link-to "mailto:docphoto@sorosny.org" "docphoto@sorosny.org") "."]])
[:p "If you attempted to submit your application before or on the May 2nd deadline and had trouble with the online application system, please contact Felix Endara at " (he/link-to "mailto:docphoto@sorosny.org" "docphoto@sorosny.org") "."]])

(defn exhibit-apply-view [request exhibit]
(when-logged-in
Expand Down Expand Up @@ -1097,7 +1100,7 @@
(defn render-image [request image]
(list
[:div.image-container.goog-inline-block
(ph/image (image-link (:id image) "small" (:filename__c image)))]
(he/image (image-link (:id image) "small" (:filename__c image)))]
[:input {:type :hidden :name :imageids :value (:id image)}]
[:textarea {:name "captions" :class "image-caption"}
(or (:caption__c image) "")]
Expand Down Expand Up @@ -1317,7 +1320,7 @@
(for [image (query-images app-id)]
[:li
[:div.image-container.goog-inline-block
(ph/image (image-link (:id image) "small" (:filename__c image)))]
(he/image (image-link (:id image) "small" (:filename__c image)))]
[:div.goog-inline-block.image-caption (:caption__c image)]])]
[:a {:href (application-upload-link app-id)} (i18n/translate :update)]]
(if errors
Expand Down Expand Up @@ -1557,7 +1560,7 @@
[:input {:type "submit" :name :submit :value "Save"}]
[:p.note
"Submit means your review is final. You will have to contact: "
(ph/link-to "mailto:docphoto@sorosny.org" "docphoto")
(he/link-to "mailto:docphoto@sorosny.org" "docphoto")
" if you need to update your review."]
[:input {:type "submit" :name :submit :value "Submit"}]]])])
(let [updated-params (update-in params [:rating__c] #(Double/valueOf ^String %))
Expand All @@ -1581,7 +1584,7 @@
[:p "Thank you for your review. "
(when-not final?
(list "You may "
(ph/link-to (:uri request) "update")
(he/link-to (:uri request) "update")
" it at any time."))]])))

(defn can-view-review-request [request review-request-id f]
Expand Down Expand Up @@ -1752,7 +1755,7 @@
(prepare-exhibit-routes
(ANY "/apply" [] (exhibit-apply-view request exhibit))
(GET "/" [] (exhibit-view request exhibit))))

(context "/image/:image-id" [image-id]
(prepare-image-routes
(GET "/small/*" [] (image-view request image "small"))
Expand Down Expand Up @@ -1818,7 +1821,7 @@
[:p
"We're sorry. We ran into an error. If the problem continues, "
"please contact "
(ph/link-to "mailto:docphoto@sorosny.org" "docphoto@sorosny.org")]))})))))
(he/link-to "mailto:docphoto@sorosny.org" "docphoto@sorosny.org")]))})))))

(defn wrap-stacktrace
"wrap the appropriate stack trace handler based on if debugging"
Expand Down Expand Up @@ -1888,28 +1891,30 @@
(connect-to-prod)
(def server (run-server)))

(defn start-swank-server
"start a swank server"
[& server-options]
(apply swank.swank/start-server server-options))
;; (defn start-swank-server
;; "start a swank server"
;; [& server-options]
;; (apply swank.swank/start-server server-options))

(defn stop-swank-server [] (swank.swank/stop-server))
;; (defn stop-swank-server [] (swank.swank/stop-server))

;; used for war file init/destroy
(defn servlet-init []
(println "connecting to salesforce ...")
(connect-to-prod)
(println "connected")
(when cfg/swank-server?
(println "starting swank server ...")
(start-swank-server :host "localhost" :port 4005 :dont-close true)
(println "swank server ready")))
;; (when cfg/swank-server?
;; (println "starting swank server ...")
;; (start-swank-server :host "localhost" :port 4005 :dont-close true)
;; (println "swank server ready"))
)

(defn servlet-destroy []
(println "disconnecting from sf")
(sf/disconnect conn)
(println "disconnected!")
(when cfg/swank-server?
(println "stopping swank server")
(stop-swank-server)
(println "swank server stopped")))
;; (when cfg/swank-server?
;; (println "stopping swank server")
;; (stop-swank-server)
;; (println "swank server stopped"))
)
2 changes: 1 addition & 1 deletion src/docphoto/guidelines.clj
View file
@@ -1,5 +1,5 @@
(ns docphoto.guidelines
(:use [hiccup.page-helpers :only (link-to)]))
(:use [hiccup.element :only (link-to)]))

(defn link
"gudielines have many cases where the text of the link is the link itself"
Expand Down
18 changes: 9 additions & 9 deletions src/docphoto/i18n.clj
View file
@@ -1,5 +1,5 @@
(ns docphoto.i18n
(:require [hiccup.page-helpers :as ph]
(:require [hiccup.element :as he]
[docphoto.guidelines :as guidelines]))

(def ^:dynamic *language* :en)
Expand Down Expand Up @@ -35,24 +35,24 @@
:new-password "New Password" "Новый пароль"
:update-password "Update Password" "Обновление пароля"
:reset-password-text
(fn [reset-link] (list (ph/link-to reset-link "Reset") " your password instead."))
(fn [reset-link] (list (ph/link-to reset-link "Сбросить ") " пароль вместо."))
(fn [reset-link] (list (he/link-to reset-link "Reset") " your password instead."))
(fn [reset-link] (list (he/link-to reset-link "Сбросить ") " пароль вместо."))

:already-logged-in (fn [username] (str "Already logged in as: " username))
(fn [username] (str "Уже вошли как: " username))
:invalid-credentials "Invalid Credentials" "Неверное Полномочия"
:forgot-your-password-reset (fn [forgot-link]
(list "Forgot your password? "
(ph/link-to forgot-link "Reset it") "."))
(he/link-to forgot-link "Reset it") "."))
(fn [forgot-link]
(list "Забыли пароль? "
(ph/link-to forgot-link "Сброс этого") "."))
(he/link-to forgot-link "Сброс этого") "."))

:no-account-register
(fn [register-link]
(list "Don't have an account? " (ph/link-to register-link "Register") "."))
(list "Don't have an account? " (he/link-to register-link "Register") "."))
(fn [register-link]
(list "Вы не имеете учетной записи? " (ph/link-to register-link "регистрировать") "."))
(list "Вы не имеете учетной записи? " (he/link-to register-link "регистрировать") "."))

:first-name "First Name" "имя"
:last-name "Last Name" "Фамилия"
Expand Down Expand Up @@ -88,11 +88,11 @@
:token-expired
(fn [link]
[:span "Token expired. Are you using the same browser session as when you requested a password reset? If so, you can "
(ph/link-to link "resend")
(he/link-to link "resend")
" a password reset email."])
(fn [link]
[:span "Маркер истек. Используете ли вы той же сессии браузера, когда вы просили сброса пароля? Если "
(ph/link-to link "это") " так, вы можете повторно электронной почты для сброса пароля."])
(he/link-to link "это") " так, вы можете повторно электронной почты для сброса пароля."])

:reset-password-for
(fn [username] (str "Reset password for: " username))
Expand Down

0 comments on commit e5b4e3f

Please sign in to comment.