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 58cf329bb32402d8f35f41384144a87447862d65 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 28 11:07:30 2015 +0200 Add loading indicators in the popups --- swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp | 2 +- swe-ui-web/src/main/webapp/WEB-INF/content/outConnection.jsp | 4 ++-- .../main/webapp/WEB-INF/content/popups/createBranchForm.jsp | 5 ++++- .../webapp/WEB-INF/content/popups/createDirectoryForm.jsp | 6 +++++- .../webapp/WEB-INF/content/popups/removeDirectoryForm.jsp | 11 ++++++++++- .../src/main/webapp/WEB-INF/content/popups/removeForm.jsp | 11 ++++++++++- .../src/main/webapp/WEB-INF/content/popups/uploadForm.jsp | 5 ++++- swe-ui-web/src/main/webapp/css/main.css | 2 +- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp index eb913b1..713b01b 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp @@ -30,7 +30,7 @@ <sj:head debug="true" jquerytheme="default"/> <script> - document.getElementById('browseIndicator').style.display = 'none'; + document.getElementById('loadingIndicator').style.display = 'none'; $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; 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 bca9840..8010540 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 @@ -115,11 +115,11 @@ button="true" buttonIcon="ui-icon-refresh" value="%{search}" - onclick="document.getElementById('browseIndicator').style.display = 'inline';" + onclick="document.getElementById('loadingIndicator').style.display = 'inline';" > </sj:submit> - <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="browseIndicator"/> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> </p> </center> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp index 07f3b20..0a161b0 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchForm.jsp @@ -70,8 +70,11 @@ <s:elseif test="error"> <p><font color="red"><s:text name="scm.repoError"/></font></p> </s:elseif> + <s:else> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> + </s:else> - <input type="submit"/> + <input type="submit" onclick="document.getElementById('loadingIndicator').style.display = 'block'"/> </form> </body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp index 4ae8969..52482b9 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectoryForm.jsp @@ -122,7 +122,11 @@ <s:elseif test="error"> <p><font color="red"><s:text name="scm.repoError"/></font></p> </s:elseif> - <input type="submit"/> + <s:else> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> + </s:else> + + <input type="submit" onclick="document.getElementById('loadingIndicator').style.display = 'block'"/> </form> </body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp index 1aa0a5e..1a85629 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectoryForm.jsp @@ -74,7 +74,13 @@ function confirmRemove() { var fileName = document.getElementById("directoryToRemove").value; - return confirm('<s:text name="scm.removeDirectoryConfirm"/> ' + fileName + " ?"); + var continueProcess = confirm('<s:text name="scm.removeDirectoryConfirm"/> ' + fileName + " ?"); + + if (continueProcess) { + document.getElementById('loadingIndicator').style.display = 'block' + } + + return continueProcess; } </script> @@ -123,6 +129,9 @@ <s:elseif test="error"> <p><font color="red"><s:text name="scm.repoError"/></font></p> </s:elseif> + <s:else> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> + </s:else> <input type="submit"/> </form> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp index 4316b8d..fc41c59 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeForm.jsp @@ -74,7 +74,13 @@ function confirmRemove() { var fileName = document.getElementById("scmPath").value; - return confirm('<s:text name="scm.removeFileConfirm"/> ' + fileName + " ?"); + var continueProcess = confirm('<s:text name="scm.removeFileConfirm"/> ' + fileName + " ?"); + + if (continueProcess) { + document.getElementById('loadingIndicator').style.display = 'block' + } + + return continueProcess; } </script> @@ -124,6 +130,9 @@ <s:elseif test="error"> <p><font color="red"><s:text name="scm.repoError"/></font></p> </s:elseif> + <s:else> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> + </s:else> <input type="submit"/> </form> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp index c55c686..777a881 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadForm.jsp @@ -123,7 +123,10 @@ <s:elseif test="error"> <p><font color="red"><s:text name="scm.repoError"/></font></p> </s:elseif> - <input type="submit"/> + <s:else> + <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" id="loadingIndicator"/> + </s:else> + <input type="submit" onclick="document.getElementById('loadingIndicator').style.display = 'block'"/> </form> </body> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index 16816ee..341c4c9 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -441,6 +441,6 @@ ul.flags li { text-decoration: none; } -#browseIndicator { +#loadingIndicator { display: none; } \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.