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 7f010143f9a6b3c9f5793bb20a773eef550698c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 10:13:16 2016 +0100 Ajout de liens dans le pied de page et utilisation d'une seule jsp pour faire le rendu du pied de page (See #1696) --- .../main/webapp/WEB-INF/content/badFileRedirect.jsp | 4 +++- .../src/main/webapp/WEB-INF/content/badUseRedirect.jsp | 4 +++- swe-ui-web/src/main/webapp/WEB-INF/content/error.jsp | 4 +++- .../main/webapp/WEB-INF/content/fileNotEditable.jsp | 4 +++- swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp | 18 ++++++++++++++++++ .../src/main/webapp/WEB-INF/content/imageViewer.jsp | 5 +++-- swe-ui-web/src/main/webapp/WEB-INF/content/logout.jsp | 4 +++- .../main/webapp/WEB-INF/content/modificationViewer.jsp | 8 +++----- .../src/main/webapp/WEB-INF/content/outConnection.jsp | 4 +++- .../main/webapp/WEB-INF/content/privateScmRedirect.jsp | 4 +++- .../src/main/webapp/WEB-INF/content/redirect.jsp | 4 +++- swe-ui-web/src/main/webapp/css/main.css | 2 +- 12 files changed, 49 insertions(+), 16 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 8d5751c..8692f70 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 @@ -54,6 +54,8 @@ <% } %> <s:text name="scm.clickHere"/></a>.</p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> 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 fc71f6d..d9899f0 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 @@ -53,6 +53,8 @@ <% } %> click this link</a>.</p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> 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 0e2d3c8..54199fa 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 @@ -45,6 +45,8 @@ <p><s:text name="scm.badUsernameOrPassword"/></p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp index 7894b9f..4ae5e50 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/fileNotEditable.jsp @@ -53,6 +53,8 @@ <s:text name="scm.back"/> <a href="checkout.action"><s:text name="scm.homepage"/></a>. </p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp new file mode 100644 index 0000000..f1b5349 --- /dev/null +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/footer.jsp @@ -0,0 +1,18 @@ +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<div id="sweVersion"> + <a href="http://scmwebeditor.nuiton.org/s" target="_blank">SCMWebEditor</a> + + <a href="https://forge.nuiton.org/projects/scmwebeditor/files" target="_blank"><s:property value="sweVersion"/></a> +</div> +<div id="footerLinks"> + <a href="http://www.gnu.org/licenses/agpl.html" title="License" target="_blank">License</a> + | + <a href="https://forge.nuiton.org/projects/scmwebeditor/issues" title="Rapport de Bug" target="_blank">Rapport de + Bug</a> + | + <a href="http://list.nuiton.org/cgi-bin/mailman/listinfo/scmwebeditor-users" title="Support utilisateur" + target="_blank">Support utilisateur</a> +</div> +<div id="copyright">©2004-2016 <a href="http://www.codelutin.com" title="Code Lutin" target="_blank">Code + Lutin</a></div> 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 3468d93..7199ead 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 @@ -429,8 +429,9 @@ </div> </div> - <p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> - +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </div> <!-- popin to open another file --> 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 956d077..d59ddbc 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 @@ -47,6 +47,8 @@ href="edit.action?address=<%=request.getAttribute("address")%>&scmType=<%=request.getAttribute("scmType")%>&selectedBranch=<%=request.getParameter("selectedBranch")%>&repositoryRoot=<%=request.getAttribute("repositoryRoot")%>"> <s:text name="scm.clickHere"/> </a>.</p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> 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 9fef097..c950be4 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 @@ -709,13 +709,11 @@ </form> <div id="footer"> - <div id="sweVersion">SCMWebEditor <s:property value="sweVersion"/></div> - <div id="copyright">©2004-2015 CodeLutin</div> - + <jsp:include page="footer.jsp"/> <s:if test="autoSaveInterval > 0"> - <div id="lastAutoSave"> + <span id="lastAutoSave"> <s:text name="scm.lastAutoSave"/> <span id="lastAutoSaveTime"></span> - </div> + </span> </s:if> </div> 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 271b37e..4023ae1 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 @@ -179,7 +179,9 @@ --> </div> </div> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> 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 bd60a19..f24e64b 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 @@ -81,6 +81,8 @@ <img src="struts/js/jstree/themes/classic/throbber.gif" alt="loading" class="indicator" id="loadingIndicator"/> </form> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </body> </html> 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 c24a066..57b3d24 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 @@ -52,6 +52,8 @@ <% } %> <s:text name="scm.clickHere"/></a>.</p> -<p>SCMWebEditor <s:property value="sweVersion"/><span class="align-right">©2004-2015 CodeLutin</span></p> +<div id="footer"> + <jsp:include page="footer.jsp"/> +</div> </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 21e5bf8..50c66bc 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -612,7 +612,7 @@ ul.buttonsGroup li { } #lastAutoSave { - width: 100%; + width: 95%; } #resetIndicator { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.