[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.50, 1.51

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

Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21747/src/vmtemplates/portlets/html

Modified Files:
	user-order.vm 
Log Message:
added the link for lab journal


Index: user-order.vm
===================================================================
RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** user-order.vm	18 Nov 2006 18:38:15 -0000	1.50
--- user-order.vm	19 Nov 2006 16:29:33 -0000	1.51
***************
*** 127,131 ****
          #end
          Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br>
!         Institure/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br>
          Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br>
          Date: $date<br>
--- 127,131 ----
          #end
          Name: $data.getUser().getFirstName() $data.getUser().getLastName()<br>
!         Institute/Workgroup: $data.getUser().getAffiliation1()/$data.getUser().getAffiliation2()<br>
          Sample I. D.: #if($submitorshow=="submit")<input name="sampleid" type="text" size="30" value="$!usersid"> (keyword for personal use: <input name="sampleidcomment" type="text" size="30" value="$!usersidcomment">)#else $sample.getUsersId() (personal keyword: $sample.getUsersIdComment()) #end <br>
          Date: $date<br>
***************
*** 206,212 ****
  	              <input type="button" style="font-size:smaller" value="Import from structures history" onClick="openStructureHistory()">
  	        #else
! 	        	<input type="hidden" id="applet" name="applet" value=""/>
! 	        	<input #if($submitorshow=="edit") name="eventSubmit_doEditsubmitorder" #else name="eventSubmit_doSubmitorder" #end type="image" src="images/java.png" style="color:white" alt="Switch to Java-mode" onClick="document.getElementById('applet').value='applet';exportMol();"><br><br>
! 	        	Choose a structure file for the probable structure: <input type="file" name="datei" size="40">
  	        #end   
          #end
--- 206,217 ----
  	              <input type="button" style="font-size:smaller" value="Import from structures history" onClick="openStructureHistory()">
  	        #else
! 	        	#if($imagefile=="none")
! 		        	<input type="hidden" id="applet" name="applet" value=""/>
! 		        	<input #if($submitorshow=="edit") name="eventSubmit_doEditsubmitorder" #else name="eventSubmit_doSubmitorder" #end type="image" src="images/java.png" style="color:white" alt="Switch to Java-mode" onClick="document.getElementById('applet').value='applet';exportMol();"><br><br>
! 	    	    	Choose a structure file for the probable structure: <input type="file" name="datei" size="40">
! 	    	    #else
! 	    	    	<img src="$imagefile" alt="the structure you entered should be here">
! 	    	    	<input type="hidden" name="urlmol" value="$urlmol">
! 	    	    #end
  	        #end   
          #end
***************
*** 216,220 ****
            : $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz)
          #else
!           : <select name="fstrengths" size="1" onChange="document.restform.elements['fstrength'].value=''">
            #foreach($existingcondition in $fstrengths)
              <option value="$existingcondition.getMachineId()" #if($strength==$existingcondition.getMachineId()) selected #end>$existingcondition.getName() ($existingcondition.getDBCondition().getValue() Mhz)</option>
--- 221,225 ----
            : $sample.getDBMachine().getName() ($sample.getDBMachine().getDBCondition().getValue() Mhz)
          #else
!           : <select name="fstrengths" size="1">
            #foreach($existingcondition in $fstrengths)
              <option value="$existingcondition.getMachineId()" #if($strength==$existingcondition.getMachineId()) selected #end>$existingcondition.getName() ($existingcondition.getDBCondition().getValue() Mhz)</option>