[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates details.vm,1.13,1.14 submit.vm,1.21,1.22

[Stefan K. <sh...@us...>]

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates
In directory usw-pr-cvs1:/tmp/cvs-serv666/src/vmtemplates

Modified Files:
	details.vm submit.vm 
Log Message:
Added the links to submit and results


Index: details.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/details.vm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** details.vm	30 May 2002 09:48:55 -0000	1.13
--- details.vm	31 May 2002 14:02:21 -0000	1.14
***************
*** 5,8 ****
--- 5,13 ----
  #end
  </strong><br>
+ Additional information available here: 
+ #foreach($link in $mol.getLinks())
+ 	<a href="$link.getHyperlink()">$link.getDescription()</a>; 
+ #end
+ <br>
  CAS-Number: $mol.getCasNumber(), Chemical formula: $mol.getFormattedChemicalFormula() <br><br>
  <script LANGUAGE="JavaScript1.1">
***************
*** 62,66 ****
  		- $cond.getConditionName(): $cond.getValue() 
  	#end
! 	<br><br>Literature: $spectrum.getLiterature()<br><br><br>
  #end
  <br><br>
--- 67,76 ----
  		- $cond.getConditionName(): $cond.getValue() 
  	#end
! 	<br><br>Literature: $spectrum.getLiterature()<br>
! 	Additional information: 
! 	#foreach($link in $spectrum.getLinks())
! 		<a href="$link.getHyperlink()">$link.getDescription()</a>; 
! 	#end
! 	<br><br>
  #end
  <br><br>

Index: submit.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/submit.vm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** submit.vm	15 May 2002 13:35:35 -0000	1.21
--- submit.vm	31 May 2002 14:02:21 -0000	1.22
***************
*** 112,116 ****
  					</select><br><br><br>
  					<input type="hidden" name="nmrshiftdbaction" value="submitSpectrumForAssignment">
! 					<textarea name="spectrum" cols="10" rows="10">$!assignments</textarea><br>
  					<input type="submit" value="Submit signals">
  				</form>
--- 112,116 ----
  					</select><br><br><br>
  					<input type="hidden" name="nmrshiftdbaction" value="submitSpectrumForAssignment">
! 					<textarea wrap="off" name="spectrum" cols="10" rows="10">$!assignments</textarea><br>
  					<input type="submit" value="Submit signals">
  				</form>
***************
*** 177,184 ****
  		<input type="hidden" name="nmrshiftdbaction" value="submitForConfirm"><center>
  		#if($existingmolecule == "false")
! 			Chemical name(s):<textarea name="chemName" cols="10" rows="5">$subdata.getChemName()</textarea>
! 			CAS Number:<input type="text" name="casnumber" value="$subdata.getCasNumber()">
  		#end
! 		Literature:<textarea name="literature"  cols="10" rows="5">$subdata.getLiterature()</textarea>
  		</center><br><br><br><center>
  		<table rules="none" border="0" bgcolor="#FFFFFF">
--- 177,201 ----
  		<input type="hidden" name="nmrshiftdbaction" value="submitForConfirm"><center>
  		#if($existingmolecule == "false")
! 			<table>
! 				<tr>
! 					<td>Chemical name(s):<br>One per line</td>
! 					<td><textarea wrap="off" name="chemName"rows="5">$subdata.getChemName()</textarea></td>
! 					<td width="20"></td>
! 					<td>Websources for the molcule:<br>Enter one link per line and a comment, seperated by ;<br>Example: <br>www.sample.org/sample;Mr. X's paper about this molecule<br>www.test.com;Also about this molecule</td>
! 					<td><textarea wrap="off" name="moleculelinks" rows="5">$subdata.getMoleculeLinks()</textarea></td>
! 					<td width="20"></td>
! 					<td>CAS Number:<input type="text" name="casnumber" value="$subdata.getCasNumber()"></td>
! 				</tr>
! 			</table>
  		#end
! 		<table>
! 			<tr>
! 				<td>Literature:</td>
! 				<td><textarea wrap="off" name="literature" rows="5">$subdata.getLiterature()</textarea></td>
! 				<td width="20"></td>
! 				<td>Websources for the spectrum:<br>Format as for the molecule links</td>
! 				<td><textarea wrap="off" name="spectrumlinks" rows="5">$subdata.getSpectrumLinks()</textarea></td>
! 			</tr>
! 		</table>
  		</center><br><br><br><center>
  		<table rules="none" border="0" bgcolor="#FFFFFF">