[Castore-commits] ajoutDocCollPrivees.jsp 1.3 1.4 ajoutDocCollNatives.jsp 1.3 1.4 annulerSoumission.jsp 1.2 1.3 soumissionMD.jsp 1.8 1.9 ajoutDocGroupes.jsp 1.3 1.4

[mathieu grimault]

Update of /cvsroot/castore/castore-struts-webapp/src/webapp/soumission
In directory adullact1:/tmp/cvs-serv22963/src/webapp/soumission

Modified Files:
	ajoutDocCollPrivees.jsp ajoutDocCollNatives.jsp 
	soumissionMD.jsp ajoutDocGroupes.jsp 
Added Files:
	annulerSoumission.jsp 
Log Message:
Annulation dans castore.
Le thread de retro est mise en attente jusqu'a la fin de soumission.

Index: soumissionMD.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/soumission/soumissionMD.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** soumissionMD.jsp	5 Dec 2006 11:42:37 -0000	1.8
--- soumissionMD.jsp	14 Dec 2006 10:32:42 -0000	1.9
***************
*** 572,575 ****
--- 572,577 ----
  </html:form>
  
+ <jsp:include page="/soumission/annulerSoumission.jsp"/>
+ 
  <div id="errorMsg"
  	style="display:none;border:1px solid #e00;background-color:#fee;padding:2px;margin-top:8px;width:300px;font:normal 12px Arial;color:#900"></div>
\ No newline at end of file

Index: ajoutDocGroupes.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/soumission/ajoutDocGroupes.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ajoutDocGroupes.jsp	5 Dec 2006 11:42:37 -0000	1.3
--- ajoutDocGroupes.jsp	14 Dec 2006 10:32:42 -0000	1.4
***************
*** 120,122 ****
  		</TR>
  	</TABLE>
! </nested:form>
\ No newline at end of file
--- 120,124 ----
  		</TR>
  	</TABLE>
! </nested:form>
! 
! <jsp:include page="/soumission/annulerSoumission.jsp"/>
\ No newline at end of file

--- NEW FILE: annulerSoumission.jsp ---
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>

<script language="JavaScript" type="text/javascript">
	function goto_confirm(url)
	{
		if(confirm("Etes-vous certain d'annuler la soumission ?" )) {
			document.location.href = url;
		}
		return false;
	}
</script>

<hr />
<button onclick="return goto_confirm('annulerSoumission.do');">
	<bean:message key="document.soumission.annulerSoumission" />
</button>
Index: ajoutDocCollNatives.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/soumission/ajoutDocCollNatives.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ajoutDocCollNatives.jsp	5 Dec 2006 11:42:37 -0000	1.3
--- ajoutDocCollNatives.jsp	14 Dec 2006 10:32:42 -0000	1.4
***************
*** 45,47 ****
  		</TR>
  	</TABLE>
! </nested:form>
\ No newline at end of file
--- 45,49 ----
  		</TR>
  	</TABLE>
! </nested:form>
! 
! <jsp:include page="/soumission/annulerSoumission.jsp"/>
\ No newline at end of file

Index: ajoutDocCollPrivees.jsp
===================================================================
RCS file: /cvsroot/castore/castore-struts-webapp/src/webapp/soumission/ajoutDocCollPrivees.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ajoutDocCollPrivees.jsp	5 Dec 2006 11:42:37 -0000	1.3
--- ajoutDocCollPrivees.jsp	14 Dec 2006 10:32:42 -0000	1.4
***************
*** 47,49 ****
  		</TR>
  	</TABLE>
! </nested:form>
\ No newline at end of file
--- 47,51 ----
  		</TR>
  	</TABLE>
! </nested:form>
! 
! <jsp:include page="/soumission/annulerSoumission.jsp"/>
\ No newline at end of file