Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git
On branch : master
commit b9b4b4aeba6c80278484fe55408bfaf0b71c7995 Author: Pavel Tisnovsky ptisnovs@redhat.com Date: Fri Dec 12 13:11:18 2014 +0100
Added renderer for the error pages.
ChangeLog | 5 ++ .../{config.clj => renderers/error_page.clj} | 50 ++++++++----------- 2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/ChangeLog b/ChangeLog index fc65b7c..21170fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-12 Pavel Tisnovsky ptisnovs@redhat.com
+ * src/jenkinscat/renderers/error_page.clj: + Added renderer for the error pages. + +2014-12-12 Pavel Tisnovsky ptisnovs@redhat.com + * src/jenkinscat/renderers/configuration_page.clj: Added renderer for the configuration page.
diff --git a/src/jenkinscat/config.clj b/src/jenkinscat/renderers/error_page.clj similarity index 68% copy from src/jenkinscat/config.clj copy to src/jenkinscat/renderers/error_page.clj index eced421..d0821b9 100644 --- a/src/jenkinscat/config.clj +++ b/src/jenkinscat/renderers/error_page.clj @@ -29,33 +29,25 @@
-(ns jenkinscat.config) - -(def hostname - "Hostname of this computer" - (.getHostName (java.net.InetAddress/getLocalHost))) - -(def jobs-dir-prefix - "Path to the directory where are stored all Jenkins jobs." - "/var/lib/jenkins/jobs/") - -(def jobs-href-prefix - "URL prefix for all Jenkins jobs." - (str "http://" hostname ":8080/job/")) - -(def json-url - "URL prefix for all requests based on JSON." - (str "http://" hostname ":8080/")) - -(def test-results-url-prefix - "URL prefix for all tests (ie.test jobs)." - (str "http://" hostname "/tests/")) - -(def test-results-prefix - "Path where test results will be stored." - "/var/www/html/tests/") - -(def devel-version - "Whether devel mode should be on." - true) +(ns jenkinscat.renderers.error-page) + +(require '[hiccup.core :as hiccup]) +(require '[hiccup.page :as page]) +(require '[hiccup.form :as form]) + +(require '[jenkinscat.renderers.page-header :as page-header-renderer]) +(require '[jenkinscat.renderers.navigation-bar :as navigation-bar-renderer]) + +(defn render-error-page + "Render error page with a 'back' button." + [page-title header-title message] + (page/xhtml + (page-header-renderer/page-header page-title) + [:body + (navigation-bar-renderer/navigation-bar "") + [:div {:class "col-md-10"} + [:h2 header-title] + [:p message] + [:button {:class "btn btn-primary" :onclick "window.history.back()" :type "button"} "Back"] + ]]))
docs-commits@lists.fedoraproject.org