This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 561ff06f125767649acb79691b041a5e8531d14c Author: jcouteau <couteau@codelutin.com> Date: Wed Sep 12 16:53:39 2018 +0200 Fixes #10086 - Index - Supprimer le chapitre "Membres du groupe..." Fixes #10087 - Index - Supprimer lien vers documents et page associée --- .../ifremer/coser/web/actions/DocumentsAction.java | 35 ---------- .../src/main/webapp/WEB-INF/content/documents.jsp | 77 ---------------------- .../main/webapp/WEB-INF/content/index-success.jsp | 8 +-- 3 files changed, 4 insertions(+), 116 deletions(-) diff --git a/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java b/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java deleted file mode 100644 index 9d86d44..0000000 --- a/coser-web/src/main/java/fr/ifremer/coser/web/actions/DocumentsAction.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * #%L - * Coser :: Web - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero 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 Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -package fr.ifremer.coser.web.actions; - -import fr.ifremer.coser.web.actions.common.AbstractCoserJspAction; - -/** - * Documents action. - * - * @author chatellier - */ -public class DocumentsAction extends AbstractCoserJspAction { - - private static final long serialVersionUID = 1663244944108703571L; - -} diff --git a/coser-web/src/main/webapp/WEB-INF/content/documents.jsp b/coser-web/src/main/webapp/WEB-INF/content/documents.jsp deleted file mode 100644 index ec535b0..0000000 --- a/coser-web/src/main/webapp/WEB-INF/content/documents.jsp +++ /dev/null @@ -1,77 +0,0 @@ -<!-- - #%L - Coser :: Web - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<%@taglib uri="/struts-tags" prefix="s" %> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title><s:text name="message.documents.title" /></title> - </head> - <body> - - <h2><s:text name="message.documents.title" /></h2> - - <h3><s:text name="message.documents.gentitle1" /></h3> - - <p> - <s:text name="message.documents.genparagraph1"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6976/">http://archimer.ifremer.fr/doc/00000/6976/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph2"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/6160/">http://archimer.ifremer.fr/doc/00000/6160/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph3"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/7293/">http://archimer.ifremer.fr/doc/00000/7293/</a></s:param> - </s:text> - </p> - - <p> - <s:text name="message.documents.genparagraph4"> - <s:param><a href="http://archimer.ifremer.fr/doc/00000/2327/">http://archimer.ifremer.fr/doc/00000/2327/</a></s:param> - </s:text> - </p> - - <h3><s:text name="message.documents.activitytitle2" /></h3> - <p><s:text name="message.documents.activityparagraph1" /></p> - <p><s:text name="message.documents.activityparagraph2" /></p> - <p><s:text name="message.documents.activityparagraph3" /></p> - <p><s:text name="message.documents.activityparagraph4" /></p> - <p><s:text name="message.documents.activityparagraph5" /></p> - <p><s:text name="message.documents.activityparagraph6" /></p> - <p> - <s:text name="message.documents.activityparagraph7"> - <s:param><a href="http://dx.doi.org/10.1111/j.1365-2664.2010.01841.x">http://dx.doi.org/10.1111/j.1365-2664.2010.01841.x</a></s:param> - <s:param><a href="http://archimer.ifremer.fr/doc/00008/11925/">http://archimer.ifremer.fr/doc/00008/11925/</a></s:param> - </s:text> - </p> - <p><s:text name="message.documents.activityparagraph8" /></p> - - <h3><s:text name="message.documents.indicatortitle3" /></h3> - <p><s:text name="message.documents.indicatorparagraph1" /></p> - - </body> -</html> diff --git a/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp b/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp index f67203e..bfd3d53 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp @@ -64,20 +64,20 @@ <s:text name="message.index.thanksparagraph1" /> </p> - <p> + <!--p> <h2><s:text name="message.index.partnertitle" /></h2> <s:text name="message.index.partnerparagraph1" /> - </p> + </p--> <p> <span style="font-weight:bold"><s:text name="message.index.qualitytitle"/> :</span> <s:a action="quality"><s:text name="message.index.qualitymessage" /></s:a> </p> - <p> + <!--p> <span style="font-weight:bold"><s:text name="message.index.documentstitle"/> :</span> <s:a action="documents"><s:text name="message.index.documentsmessage" /></s:a> - </p> + </p--> <p class="annotations"> <span style="font-weight:bold"><s:text name="message.index.quotetitle"/> :</span> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.