Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git
On branch : master
commit 6079b2b0fdd04547d4ac83de2ec4e59360bff953 Author: Pavel Tisnovsky ptisnovs@redhat.com Date: Mon Dec 15 10:42:51 2014 +0100
Updated.
ChangeLog | 5 ++ src/jenkinscat/renderers/add_book_step_1_page.clj | 75 ++++++++++++++++++--- 2 files changed, 71 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog index b7a6a28..f946d61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-12-15 Pavel Tisnovsky ptisnovs@redhat.com
+ * src/jenkinscat/renderers/add_book_step_1_page.clj: + Updated. + +2014-12-15 Pavel Tisnovsky ptisnovs@redhat.com + * src/jenkinscat/renderers/navigation_bar.clj: Added common renderer for the navigation bar.
diff --git a/src/jenkinscat/renderers/add_book_step_1_page.clj b/src/jenkinscat/renderers/add_book_step_1_page.clj index 10f2a3a..084036a 100644 --- a/src/jenkinscat/renderers/add_book_step_1_page.clj +++ b/src/jenkinscat/renderers/add_book_step_1_page.clj @@ -45,20 +45,77 @@ (page-header-renderer/page-header "add book") [:body [:script " + function changeSubmitButtonState() + { + var submitButton = document.getElementById('submit'); + var repoUrlValue = document.getElementById('repository-url').value; + var repoPrefixValue = document.getElementById('repo-prefix').innerText; + + if (repoUrlValue == '' || repoPrefixValue == '') + { + submitButton.disabled = 'disabled'; + } + else + { + submitButton.disabled = ''; + } + } function updateRepositoryPrefix() { var repoPrefixElement = document.getElementById('repo-prefix'); var repoType = document.getElementById('repository-type').value; var repoPrefix = '' - if (repoType == 'GitHub') + var submitButton = document.getElementById('submit'); + + var repositoryTdElement = document.getElementById('repository-type-td'); + var repositoryTd2Element = document.getElementById('repository-type-2-td'); + + if (repoType == 'GitHub') { repoPrefix = 'https://github.com/'; - if (repoType == 'SVN (internal)') + repositoryTdElement.className = ''; + repositoryTd2Element.className = ''; + } + else if (repoType == 'SVN (internal)') { repoPrefix = 'https://svn.devel.redhat.com/repos/' - if (repoType == 'Gerrit (internal GIT)') + repositoryTdElement.className = ''; + repositoryTd2Element.className = ''; + } + else if (repoType == 'Gerrit (internal GIT)') { repoPrefix = 'git://git.app.eng.bos.redhat.com/'; - if (repoType == 'Fedora GIT') + repositoryTdElement.className = ''; + repositoryTd2Element.className = ''; + } + else if (repoType == 'Fedora GIT') { repoPrefix = 'git://git.fedorahosted.org/git/docs/'; + repositoryTdElement.className = ''; + repositoryTd2Element.className = ''; + } + else { + repoPrefix = ''; + repositoryTdElement.className = 'danger'; + repositoryTd2Element.className = 'danger'; + } repoPrefixElement.innerText = repoPrefix; + changeSubmitButtonState(); + } + function updateRepositoryUrl() + { + var repoUrlTd1Element = document.getElementById('repository-url-td'); + var repoUrlTd2Element = document.getElementById('repository-prefix-td'); + var submitButton = document.getElementById('submit'); + + var repoUrlValue = document.getElementById('repository-url').value; + if (repoUrlValue == '') + { + repoUrlTd1Element.className = 'danger'; + repoUrlTd2Element.className = 'danger'; + } + else + { + repoUrlTd1Element.className = ''; + repoUrlTd2Element.className = ''; + } + changeSubmitButtonState(); } "] (navigation-bar-renderer/navigation-bar "Add book") @@ -68,13 +125,13 @@ [:table {:class "table table-condensed table-hover table-borderer"} [:tr [:td {:style "width:20%"} "Repository type:"] - [:td {:style "width:20%"} (form/drop-down {:onChange "updateRepositoryPrefix()"} "repository-type" ["Please select repository type" "Gerrit (internal GIT)" "GitHub" "Fedora GIT" "SVN (internal)",])] - [:td " "] + [:td {:style "width:20%" :id "repository-type-td" :class "danger"} (form/drop-down {:onChange "updateRepositoryPrefix()"} "repository-type" ["Please select repository type" "Gerrit (internal GIT)" "GitHub" "Fedora GIT" "SVN (internal)",])] + [:td {:id "repository-type-2-td" :class "danger"} " "] ] [:tr [:td "Repository name"] - [:td [:div {:id "repo-prefix"} " "]] - [:td (form/text-field {:size "60" :class "-form-control"} "repository-url")] + [:td {:id "repository-prefix-td" :class "danger"} [:div {:id "repo-prefix"} " "]] + [:td {:id "repository-url-td" :class "danger"} (form/text-field {:size "60" :class "-form-control" :onKeyup "updateRepositoryUrl()"} "repository-url")] ] ; [:tr ; [:td "Book type/build configuration:"] @@ -89,7 +146,7 @@ ; [:tr [:td " "] [:td " "] [:td " "]] [:tr [:td " "] - [:td (form/submit-button {:class "btn btn-primary"} "Continue")] + [:td (form/submit-button {:class "btn btn-primary" :id "submit" :disabled "disabled"} "Continue")] [:td " "] ] ]]
docs-commits@lists.fedoraproject.org