branch develop updated (26b28c9 -> 62b4b1e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 26b28c9 Reduce the buttons size new 62b4b1e The home page's field is now of URL type to avoid errors The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 62b4b1e845d464cc8ac6dbd351b67e326045c750 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 12 16:17:24 2015 +0200 The home page's field is now of URL type to avoid errors Summary of changes: .../main/webapp/WEB-INF/content/outConnection.jsp | 30 ++++++++++-- swe-ui-web/src/main/webapp/css/main.css | 8 ++-- swe-ui-web/src/main/webapp/js/branches.js | 55 ++++++++++------------ 3 files changed, 55 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 62b4b1e845d464cc8ac6dbd351b67e326045c750 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 12 16:17:24 2015 +0200 The home page's field is now of URL type to avoid errors --- .../main/webapp/WEB-INF/content/outConnection.jsp | 30 ++++++++++-- swe-ui-web/src/main/webapp/css/main.css | 8 ++-- swe-ui-web/src/main/webapp/js/branches.js | 55 ++++++++++------------ 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp index dc11ab9..50227c1 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp @@ -40,6 +40,30 @@ <script type="text/javascript" src="js/branches.js"></script> <script type="text/javascript" src="js/scmDetector.js"></script> + <script type="text/javascript"> + + function browseValidation() { + var address = document.getElementById('addressInput'); + var addressValid = address.validity.valid; + + return addressValid; + } + + $.subscribe("validateBrowse", function(event, element) { + + var browseValid = browseValidation(); + + if (browseValid) { + var loadingIndicator = document.getElementById('loadingIndicator'); + loadingIndicator.style.display = 'inline'; + getBranchesList(); + } + + event.originalEvent.options.submit = browseValid; + }); + + </script> + </head> <body> <!-- <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/accueil/machine-a-ecrire.png" alt="$alt" /></a> --> @@ -96,7 +120,7 @@ <center> - <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text + <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE="url" name="address" SIZE=50 id="addressInput"></label> @@ -112,11 +136,9 @@ formIds="configForm" targets="htmlcontentSearch" href="%{ajaxSearch}" - indicator="indicator" button="true" - buttonIcon="ui-icon-refresh" value="%{search}" - onclick="document.getElementById('loadingIndicator').style.display = 'inline';" + onBeforeTopics="validateBrowse" > </sj:submit> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index acaa590..98d5b61 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -483,6 +483,10 @@ ul.buttonsGroup li { color: #888; } +#sweBrowseMenu .fa-stack .fa-folder { + font-size: 26px; +} + .save-exit i.fa-times { position: relative; font-size: 1.25em; @@ -516,10 +520,6 @@ ul.buttonsGroup li { font-size: 18px; } -#sweBrowseMenu .fa-folder { - font-size: 32px; -} - .fa-stack { display: inline-block; font-size: 0.7em; diff --git a/swe-ui-web/src/main/webapp/js/branches.js b/swe-ui-web/src/main/webapp/js/branches.js index cd2fabc..b094386 100644 --- a/swe-ui-web/src/main/webapp/js/branches.js +++ b/swe-ui-web/src/main/webapp/js/branches.js @@ -20,42 +20,37 @@ * #L% */ -$(document).ready(function() { - $("#ajaxSearchButton").on("click", function() { - - var listDiv = $("#branches"); - var listSelect = $("#branchesList"); - var address = $("#addressInput").val(); - var scmType = $("#scmType").val(); - var username = $("#username").val(); - var pw = $("#pw").val(); - - var branchesSupported = false; - var branches; - - $.getJSON("getBranches.action?address=" + address + "&scmType=" + scmType + - "&username=" + username + "&pw=" + pw, function(result) { - - branchesSupported = result.scmSupportsBranches; - branches = result.branches; +function getBranchesList() { - if (branchesSupported) { + var listDiv = $("#branches"); + var listSelect = $("#branchesList"); + var address = $("#addressInput").val(); + var scmType = $("#scmType").val(); + var username = $("#username").val(); + var pw = $("#pw").val(); + var branchesSupported = false; + var branches; - listSelect.find("option:gt(0)").remove(); + $.getJSON("getBranches.action?address=" + address + "&scmType=" + scmType + + "&username=" + username + "&pw=" + pw, function(result) { - $.each(branches, function(i, field) { - listSelect.append("<option>" + field + "</option>"); - }); - - listDiv.show(); - } else { - listDiv.hide(); - } - }); + branchesSupported = result.scmSupportsBranches; + branches = result.branches; + if (branchesSupported) { + listSelect.find("option:gt(0)").remove(); + $.each(branches, function(i, field) { + listSelect.append("<option>" + field + "</option>"); + }); + listDiv.show(); + } else { + listDiv.hide(); + } + }); +} - }); +$(document).ready(function() { $("#branchesList").on("change", function() { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm