[dcm4che-commits] CVS: dcm4jboss-web/src/web/mcmc mcm_console.xsl,1.2,1.3

[Franz W. <jav...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-web/src/web/mcmc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23910/src/web/mcmc

Modified Files:
	mcm_console.xsl 
Log Message:
Take care of available MCM SCP status flag.

Index: mcm_console.xsl
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-web/src/web/mcmc/mcm_console.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mcm_console.xsl	29 Dec 2004 17:10:51 -0000	1.2
--- mcm_console.xsl	30 Dec 2004 14:07:45 -0000	1.3
***************
*** 10,14 ****
  <!-- Filter -->
  	<form action="mcm_console.m" method="get" name="myForm">
! 		<table border="0" cellspacing="0" cellpadding="0" width="100%">
  			<td valign="top">
  				<table border="0" height="30" cellspacing="0" cellpadding="0" width="100%">
--- 10,14 ----
  <!-- Filter -->
  	<form action="mcm_console.m" method="get" name="myForm">
! 		<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="eeeeee">
  			<td valign="top">
  				<table border="0" height="30" cellspacing="0" cellpadding="0" width="100%">
***************
*** 74,78 ****
  							<input size="10" name="endCreationDate" type="text" value="{filter/endCreationDate}"/>
  						</td>
! 						<td width="60%" bgcolor="eeeeee"></td>
  					</tr>
  					<tr>
--- 74,96 ----
  							<input size="10" name="endCreationDate" type="text" value="{filter/endCreationDate}"/>
  						</td>
! 			      		<xsl:choose>
! 							<xsl:when test="/model/mcmNotAvail = 'true'">
! 								<td width="60%" bgcolor="eeeeee" rowspan="2" align="center">
! 									<table border="1" cellpadding="4" cellspacing="4" bgcolor="eeeeee">
! 										<tr>										
! 											<td nowrap="" valign="middle" align="center" bgcolor="ee8888"><font color="000000">&#160;Media Creation Managment service not available!&#160;</font>
! 												<a href="mcm_console.m?action=check_mcm_avail">
! 													<img src="images/search.gif" alt="Retry" border="0" title="Retry"/>		
! 												</a>
! 											</td>
! 										</tr>
! 									</table>
! 								</td>
! 								<td width="100%" bgcolor="eeeeee" />
! 							</xsl:when>
! 							<xsl:otherwise>
! 								<td width="60%" bgcolor="eeeeee"></td>
! 							</xsl:otherwise>
! 						</xsl:choose>
  					</tr>
  					<tr>
***************
*** 126,129 ****
--- 144,148 ----
  			      		<td width="90" bgcolor="eeeeee" /> 
  						<td width="60%" bgcolor="eeeeee" />
+ 						<td width="100%" bgcolor="eeeeee" />
  			      	</tr>
  				</table>
***************
*** 169,173 ****
  					<xsl:value-of select="mediaStatusString"/>
  	        </td>
! 			<xsl:if test="mediaStatus = /model/statiForQueue">
  	        	<td title="Status info">
  					<a href="mcm_console.m?action=queue&amp;mediaPk={mediaPk}">
--- 188,192 ----
  					<xsl:value-of select="mediaStatusString"/>
  	        </td>
! 			<xsl:if test="mediaStatus = /model/statiForQueue and /model/mcmNotAvail = 'false'">
  	        	<td title="Status info">
  					<a href="mcm_console.m?action=queue&amp;mediaPk={mediaPk}">
***************
*** 176,180 ****
  	        	</td>
   			</xsl:if>
! 			<xsl:if test="mediaStatus &lt; 0"><!-- error stati are lower than 0! -->
  	        	<td title="Status info">
  					<a href="mcm_console.m?action=queue&amp;mediaPk={mediaPk}">
--- 195,199 ----
  	        	</td>
   			</xsl:if>
! 			<xsl:if test="mediaStatus &lt; 0 and /model/mcmNotAvail = 'false'"><!-- error stati are lower than 0! -->
  	        	<td title="Status info">
  					<a href="mcm_console.m?action=queue&amp;mediaPk={mediaPk}">