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 d7fc6704e22c38a73dad9e8e2d0146fb9b4c333c Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Wed May 27 10:43:58 2015 +0200 Fix the "save and exit" button to make it use the popin --- .../i18n/scmwebeditor-ui-web_fr_FR.properties | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 21 +++++++++++++++------ swe-ui-web/src/main/webapp/css/main.css | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties index b81b4a8..81b972f 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties @@ -62,7 +62,7 @@ scm.reset=Réinitialiser scm.resetTitle=Retour à la dernière révision du fichier scm.rstNotValidMessage=Le RST n'est pas valide, voulez-vous continuer ? scm.saveAndContinue=Sauvegarder et continuer -scm.saveAndContinueTitle=Enregister les modifications sur le dépôt et continuer d'éditer le fichier +scm.saveAndContinueTitle=Enregistrer les modifications sur le dépôt et continuer d'éditer le fichier scm.saveAndQuit=Sauvegarder et quitter scm.saveAndQuitTitle=Sauvegarder le fichier sur le dépôt et retourner à la page précédente. scm.showDiff=Voir les differences diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index d881764..2e03c04 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -60,6 +60,9 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> <script type="text/javascript"> + + var exitAfterCommit = false; + function loadChange() { document.getElementById('newTextId').value = editor.getValue(); } @@ -90,6 +93,12 @@ document.getElementById("popinBackground").style.display = "none"; } + function checkExit() { + if (exitAfterCommit) { + document.location.href = "checkout.action"; + } + } + window.onbeforeunload = confirmExitOnUnload; </script> @@ -212,7 +221,7 @@ </s:set> <s:a - href="javascript:document.getElementById('editForm').submit();" + href="javascript:exitAfterCommit = true; loadChange(); openCommitPopin();" title="%{scm.saveAndQuitTitle}" name="Save" > @@ -421,7 +430,7 @@ </s:set> <sj:a - onclick="loadChange()" + onclick="loadChange(); checkExit();" id="ajaxSaveButton" formIds="editForm,commitForm" targets="htmlcontentCommit" @@ -444,10 +453,10 @@ <div id="popinBackground"></div> - <script type="text/javascript"> - document.getElementById("commitPopin").style.display = "none"; - document.getElementById("popinBackground").style.display = "none"; - </script> +<script type="text/javascript"> + document.getElementById("commitPopin").style.display = "none"; + document.getElementById("popinBackground").style.display = "none"; +</script> </body> </html> diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index f370bb0..50beb1e 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -117,6 +117,7 @@ ul.flags li { #wwctrl_Save { margin-top: 15px; + display: inline; } #wwctrl_exitLogin { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.