branch develop updated (f54b36c -> 2752239)
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 f54b36c Change the branch to the given one when accessing to a file by an URL new 2752239 Change the favicon 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 275223979a21a7fb2b6fedeee8ade67ceb4fe12a Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 22 15:19:08 2015 +0200 Change the favicon Summary of changes: .../webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- .../webapp/WEB-INF/content/createBranchForm.jsp | 1 + .../webapp/WEB-INF/content/createBranchSuccess.jsp | 1 + .../src/main/webapp/WEB-INF/content/error.jsp | 2 +- .../src/main/webapp/WEB-INF/content/fileModify.jsp | 1 + .../src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 2 +- .../main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/removeForm.jsp | 1 + .../main/webapp/WEB-INF/content/removeSuccess.jsp | 1 + .../src/main/webapp/WEB-INF/content/upload.jsp | 34 --------------------- .../src/main/webapp/WEB-INF/content/uploadForm.jsp | 1 + .../main/webapp/WEB-INF/content/uploadSuccess.jsp | 1 + .../main/webapp/img/machine-a-ecrire_little.png | Bin 0 -> 17539 bytes 18 files changed, 16 insertions(+), 43 deletions(-) delete mode 100644 swe-ui-web/src/main/webapp/WEB-INF/content/upload.jsp create mode 100644 swe-ui-web/src/main/webapp/img/machine-a-ecrire_little.png -- 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 275223979a21a7fb2b6fedeee8ade67ceb4fe12a Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 22 15:19:08 2015 +0200 Change the favicon --- .../webapp/WEB-INF/content/badFileRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/badRstFile.jsp | 2 +- .../main/webapp/WEB-INF/content/badUseRedirect.jsp | 2 +- .../webapp/WEB-INF/content/createBranchForm.jsp | 1 + .../webapp/WEB-INF/content/createBranchSuccess.jsp | 1 + .../src/main/webapp/WEB-INF/content/error.jsp | 2 +- .../src/main/webapp/WEB-INF/content/fileModify.jsp | 1 + .../src/main/webapp/WEB-INF/content/logout.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 2 +- .../main/webapp/WEB-INF/content/outConnection.jsp | 2 +- .../webapp/WEB-INF/content/privateScmRedirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/redirect.jsp | 2 +- .../src/main/webapp/WEB-INF/content/removeForm.jsp | 1 + .../main/webapp/WEB-INF/content/removeSuccess.jsp | 1 + .../src/main/webapp/WEB-INF/content/upload.jsp | 34 --------------------- .../src/main/webapp/WEB-INF/content/uploadForm.jsp | 1 + .../main/webapp/WEB-INF/content/uploadSuccess.jsp | 1 + .../main/webapp/img/machine-a-ecrire_little.png | Bin 0 -> 17539 bytes 18 files changed, 16 insertions(+), 43 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp index fb30518..a396ee4 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badFileRedirect.jsp @@ -30,7 +30,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.titles.error"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> <meta http-equiv="Refresh" diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp index 415ddc8..b648991 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badRstFile.jsp @@ -28,7 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.titles.badRstFile"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp index 1d161f9..311ac1e 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/badUseRedirect.jsp @@ -29,7 +29,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.title.error"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> <meta http-equiv="Refresh" diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchForm.jsp index 2faf3ee..c5cc7d8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchForm.jsp @@ -32,6 +32,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.createBranch"/></title> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchSuccess.jsp index 0ee4d22..91b0bdf 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/createBranchSuccess.jsp @@ -28,6 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="stylesheet" type="text/css" href="css/main.css"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <script type="text/javascript" src="js/popup.js"></script> <title><s:text name="scm.titles.success"/></title> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp index c956f8b..3832440 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp @@ -29,7 +29,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.titles.error"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> <meta http-equiv="Refresh" diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp index 9fee2c6..0030a8b 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/fileModify.jsp @@ -28,6 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.fileModify"/></title> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp index 51957f3..cb8e4b9 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp @@ -29,7 +29,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.titles.logout"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> 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 878b750..b353946 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 @@ -56,7 +56,7 @@ <script src="js/cancelRedirect.js" type="text/javascript"></script> <script src="js/popup.js" type="text/javascript"></script> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <script type="text/javascript"> 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 b5dd78a..793794e 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 @@ -32,7 +32,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <title><s:text name="scm.titles.swe"/></title> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp index fdc0672..d8554de 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/privateScmRedirect.jsp @@ -30,7 +30,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.titles.privateScm"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp index f95e61b..ae607e4 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/redirect.jsp @@ -29,7 +29,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.redirection"/></title> - <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <% if (request.getAttribute("projectUrl") != null) { %> <meta http-equiv="Refresh" diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/removeForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/removeForm.jsp index 4887412..3c8a0a4 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/removeForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/removeForm.jsp @@ -32,6 +32,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="scm.removeFile"/></title> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <script type="text/javascript" src="js/branches.js"></script> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/removeSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/removeSuccess.jsp index 6eb3aae..b920c05 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/removeSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/removeSuccess.jsp @@ -27,6 +27,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <script type="text/javascript" src="js/popup.js"></script> <title><s:text name="scm.titles.success"/></title> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/upload.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/upload.jsp deleted file mode 100644 index 8686307..0000000 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/upload.jsp +++ /dev/null @@ -1,34 +0,0 @@ -<%-- - #%L - ScmWebEditor - %% - Copyright (C) 2009 - 2015 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --%> - -<%@ taglib prefix="s" uri="/struts-tags" %> - - -<s:if test="badLogin"> - <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> -</s:if> -<s:elseif test="error"> - <p><font color="red"><s:text name="scm.repoError"/></font></p> -</s:elseif> -<s:else> - <p><s:text name="scm.uploadSuccess"/></p> -</s:else> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp index e37fbe3..f383145 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadForm.jsp @@ -34,6 +34,7 @@ <title><s:text name="scm.titles.upload"/></title> <link rel="stylesheet" type="text/css" href="css/main.css"> <link rel="stylesheet" type="text/css" href="css/uploadForm.css"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <script type="text/javascript" src="js/branches.js"></script> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp index f3b3843..6c91195 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/uploadSuccess.jsp @@ -28,6 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="stylesheet" type="text/css" href="css/main.css"> + <link rel="icon" href="img/machine-a-ecrire_little.png" type="image/png"> <script type="text/javascript" src="js/popup.js"></script> <title><s:text name="scm.titles.success"/></title> diff --git a/swe-ui-web/src/main/webapp/img/machine-a-ecrire_little.png b/swe-ui-web/src/main/webapp/img/machine-a-ecrire_little.png new file mode 100644 index 0000000..2390538 Binary files /dev/null and b/swe-ui-web/src/main/webapp/img/machine-a-ecrire_little.png differ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm