[jenkinscat-docs] master: Updated to call functions from proper modules. (4feca7d)

[immanetize at fedoraproject.org]

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git

On branch  : master

>---------------------------------------------------------------

commit 4feca7da1c5af7d972ee50904905511955f12053
Author: Pavel Tisnovsky <ptisnovs at redhat.com>
Date:   Fri Dec 19 16:35:44 2014 +0100

    Updated to call functions from proper modules.


>---------------------------------------------------------------

 ChangeLog                    |    6 ++++++
 src/jenkinscat/fileutils.clj |    1 +
 src/jenkinscat/server.clj    |   16 ++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ed24eb..b2ab836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-19  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/jenkinscat/fileutils.clj:
+	* src/jenkinscat/server.clj:
+	Updated to call functions from proper modules.
+
 2014-12-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* make-jar.sh:
diff --git a/src/jenkinscat/fileutils.clj b/src/jenkinscat/fileutils.clj
index cd9d4a1..f3abef7 100644
--- a/src/jenkinscat/fileutils.clj
+++ b/src/jenkinscat/fileutils.clj
@@ -25,6 +25,7 @@
 ;;; ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ;;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;
 
 
 
diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj
index f061139..10377d6 100644
--- a/src/jenkinscat/server.clj
+++ b/src/jenkinscat/server.clj
@@ -45,6 +45,18 @@
 (require '[jenkinscat.exec          :as exec])
 (require '[jenkinscat.file-handlers :as file-handlers])
 
+(require '[jenkinscat.renderers.page-header          :as page-header-renderer])
+(require '[jenkinscat.renderers.navigation-bar       :as navigation-bar-renderer])
+(require '[jenkinscat.renderers.build-page           :as build-page-renderer])
+(require '[jenkinscat.renderers.error-page           :as error-page-renderer])
+(require '[jenkinscat.renderers.configuration-page   :as configuration-page-renderer])
+(require '[jenkinscat.renderers.statistics-page      :as statistics-page-renderer])
+
+(require '[jenkinscat.renderers.add-book-step-1-page        :as add-book-step-1-renderer])
+(require '[jenkinscat.renderers.add-book-step-1-error-pages :as add-book-step-1-error-pages-renderer])
+(require '[jenkinscat.renderers.add-book-step-2-page        :as add-book-step-2-renderer])
+(require '[jenkinscat.renderers.add-book-step-2-error-pages :as add-book-step-2-error-pages-renderer])
+(require '[jenkinscat.renderers.add-book-step-3-page        :as add-book-step-3-renderer])
 
 (require '[clojure.xml          :as xml])
 
@@ -767,7 +779,7 @@
     "Handler for a user request to start a new build."
     [uri params session]
     (let [job-name (get params "job-name")
-          page-content (render-build-page job-name)]
+          page-content (build-page-renderer/render-build-page config/hostname job-name)]
         (start-build job-name)
         (generate-response-html page-content session)
     ))
@@ -866,7 +878,7 @@
     (read-books-if-not-loaded)
     (let [job-list (sort (get-job-list books/books))
           job-configurations (read-job-configurations job-list)
-          page-content (render-job-configurations-page job-list job-configurations)]
+          page-content (configuration-page-renderer/render-job-configurations-page job-list job-configurations config/jobs-href-prefix)]
          (generate-response-html page-content session)))
 
 (defn reload-books-list-handler