branch develop updated (4ac3bfe -> 636ced4)
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 4ac3bfe Fixes #3877 Merge branch 'feature/3877' into develop new 8ae9f9a Nettoyage code html (See #3878) new 636ced4 Fixes #3878 Merge branch 'feature/3878' into develop The 2 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 636ced44ce3bad15467e78d96e3625f082fe7e2d Merge: 4ac3bfe 8ae9f9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 09:23:07 2016 +0100 Fixes #3878 Merge branch 'feature/3878' into develop commit 8ae9f9aad694af3d73cce74e1e95ee51eae1432a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 09:23:05 2016 +0100 Nettoyage code html (See #3878) Summary of changes: .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 31 +++++++++++----------- .../WEB-INF/content/popups/createDirectoryForm.jsp | 4 +-- .../webapp/WEB-INF/content/popups/moveFileForm.jsp | 4 +-- .../WEB-INF/content/popups/removeDirectoryForm.jsp | 4 +-- .../WEB-INF/content/popups/removeFileForm.jsp | 4 +-- .../WEB-INF/content/popups/uploadFileForm.jsp | 4 +-- 7 files changed, 26 insertions(+), 27 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 8ae9f9aad694af3d73cce74e1e95ee51eae1432a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 09:23:05 2016 +0100 Nettoyage code html (See #3878) --- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 31 +++++++++++----------- .../WEB-INF/content/popups/createDirectoryForm.jsp | 4 +-- .../webapp/WEB-INF/content/popups/moveFileForm.jsp | 4 +-- .../WEB-INF/content/popups/removeDirectoryForm.jsp | 4 +-- .../WEB-INF/content/popups/removeFileForm.jsp | 4 +-- .../WEB-INF/content/popups/uploadFileForm.jsp | 4 +-- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp index b8ff9fa..3468d93 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp @@ -167,7 +167,7 @@ <s:if test="scmSupportsBranches"> <p id="workingBranch"> - <s:text name="scm.modificationViewer.branch"/> <s:property value="selectedBranch"></s:property> + <s:text name="scm.modificationViewer.branch"/> <s:property value="selectedBranch"/> </p> </s:if> 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 ff3b085..9fef097 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 @@ -59,7 +59,7 @@ <script type="text/javascript" src="js/popin.js"></script> <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css"> - <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script> + <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> <!-- Code mirror --> <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/lib/codemirror.js" type="text/javascript"></script> @@ -67,17 +67,16 @@ <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/addon/mode/overlay.js" type="text/javascript"></script> <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/addon/search/searchcursor.js" type="text/javascript"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/rst/rst.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/markdown/markdown.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/clike/clike.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/htmlmixed/htmlmixed.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/javascript/javascript.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/css/css.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/xml/xml.js"></script> - <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/stex/stex.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/rst/rst.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/markdown/markdown.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/clike/clike.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/htmlmixed/htmlmixed.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/javascript/javascript.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/css/css.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/xml/xml.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/stex/stex.js" type="text/javascript"></script> - - <script src="codemirror-ui/js/codemirror-ui.js"></script> + <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> <link rel="stylesheet" href="codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen"/> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> @@ -169,7 +168,7 @@ <li> <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> - <img src="img/flag-i18n-uk.png"/> + <img src="img/flag-i18n-uk.png" alt="EN"/> </s:if> <s:else> <s:a action="edit.action" namespace="/"> @@ -178,14 +177,14 @@ <s:param name="selectedBranch"><s:property value="selectedBranch"/></s:param> <s:param name="repositoryRoot"><s:property value="repositoryRoot"/></s:param> <s:param name="request_locale">en_GB</s:param> - <img src="img/flag-i18n-uk.png"/> + <img src="img/flag-i18n-uk.png" alt="English"/> </s:a> </s:else> </li> <li> <s:if test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> - <img src="img/flag-i18n-fr.png"/> + <img src="img/flag-i18n-fr.png" alt="FR"/> </s:if> <s:else> <s:a action="edit.action" namespace="/"> @@ -194,7 +193,7 @@ <s:param name="selectedBranch"><s:property value="selectedBranch"/></s:param> <s:param name="repositoryRoot"><s:property value="repositoryRoot"/></s:param> <s:param name="request_locale">fr_FR</s:param> - <img src="img/flag-i18n-fr.png"/> + <img src="img/flag-i18n-fr.png" alt="Français"/> </s:a> </s:else> </li> @@ -217,7 +216,7 @@ <s:if test="scmSupportsBranches"> <p id="workingBranch"> - <s:text name="scm.modificationViewer.branch"/> <s:property value="selectedBranch"></s:property> + <s:text name="scm.modificationViewer.branch"/> <s:property value="selectedBranch"/> </p> </s:if> 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 c66a850..2cbb273 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 @@ -42,7 +42,7 @@ <sj:head debug="true" jquerytheme="default"/> -<script> +<script type="text/javascript"> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; @@ -80,7 +80,7 @@ <s:hidden name="scmType" value="%{scmType}"/> - <center><h1><s:text name="scm.createDirectory"></s:text></h1></center> + <center><h1><s:text name="scm.createDirectory"/></h1></center> <label><s:text name="scm.newDirectoryName"/> <input type="text" name="directoryName" id="directoryName"/> </label><br/> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileForm.jsp index 330b169..a3e4d9d 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileForm.jsp @@ -41,7 +41,7 @@ <sj:head debug="true" jquerytheme="default"/> -<script> +<script type="text/javascript"> $.subscribe('treeClickedFileToMove', function(event, data) { var item = event.originalEvent.data.rslt.obj; @@ -91,7 +91,7 @@ <s:hidden name="scmType" value="%{scmType}"/> - <center><h1><s:text name="scm.moveFile"></s:text></h1></center> + <center><h1><s:text name="scm.moveFile"/></h1></center> <label><s:text name="scm.fileToMove"/> <s:textfield size="50px" type="text" name="fileToMove" id="fileToMove" value="%{fileRoot}"/> 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 466323a..b05ca47 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 @@ -41,7 +41,7 @@ <sj:head debug="true" jquerytheme="default"/> -<script> +<script type="text/javascript"> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; @@ -90,7 +90,7 @@ <s:hidden name="scmType" value="%{scmType}"/> - <center><h1><s:text name="scm.removeDirectory"></s:text></h1></center> + <center><h1><s:text name="scm.removeDirectory"/></h1></center> <label><s:text name="scm.directoryToRemove"/> <s:textfield size="50px" type="text" name="directoryToRemove" id="directoryToRemove" value="%{fileRoot}"/> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileForm.jsp index 0478919..f2780a1 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileForm.jsp @@ -40,7 +40,7 @@ <sj:head debug="true" jquerytheme="default"/> -<script> +<script type="text/javascript"> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; @@ -90,7 +90,7 @@ <s:hidden name="scmType" value="%{scmType}"/> - <center><h1><s:text name="scm.removeFile"></s:text></h1></center> + <center><h1><s:text name="scm.removeFile"/></h1></center> <label><s:text name="scm.remove.file"/> <s:textfield size="50px" type="text" name="scmPath" diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileForm.jsp index 3b18a88..2d8708a 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileForm.jsp @@ -42,7 +42,7 @@ <sj:head debug="true" jquerytheme="default"/> -<script> +<script type="text/javascript"> $.subscribe('treeClicked', function(event, data) { var item = event.originalEvent.data.rslt.obj; @@ -80,7 +80,7 @@ <s:hidden name="scmType" value="%{scmType}"/> - <center><h1><s:text name="scm.upload"></s:text></h1></center> + <center><h1><s:text name="scm.upload"/></h1></center> <label><s:text name="scm.uploadFile"/> : <input type="file" name="upload"/></label><br/> -- 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 636ced44ce3bad15467e78d96e3625f082fe7e2d Merge: 4ac3bfe 8ae9f9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 09:23:07 2016 +0100 Fixes #3878 Merge branch 'feature/3878' into develop .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 31 +++++++++++----------- .../WEB-INF/content/popups/createDirectoryForm.jsp | 4 +-- .../webapp/WEB-INF/content/popups/moveFileForm.jsp | 4 +-- .../WEB-INF/content/popups/removeDirectoryForm.jsp | 4 +-- .../WEB-INF/content/popups/removeFileForm.jsp | 4 +-- .../WEB-INF/content/popups/uploadFileForm.jsp | 4 +-- 7 files changed, 26 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm