[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.45, 1.46
Brought to you by:
steinbeck
Menu
▾
▴
[Nmrshiftdb-devel] CVS: nmrshiftdb/src/vmtemplates/portlets/html user-order.vm, 1.45, 1.46
|
From: Stefan K. <sh...@us...> - 2006-10-26 17:18:56
|
Update of /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7406/src/vmtemplates/portlets/html Modified Files: user-order.vm Log Message: the user order of the lab system works in non-java mode as well Index: user-order.vm =================================================================== RCS file: /cvsroot/nmrshiftdb/nmrshiftdb/src/vmtemplates/portlets/html/user-order.vm,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** user-order.vm 24 Oct 2006 10:48:45 -0000 1.45 --- user-order.vm 26 Oct 2006 17:18:48 -0000 1.46 *************** *** 113,121 **** <p style="color:red">$!message</p> #if($submitorshow=="submit") ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"> Here you can submit a <b>new order</b>:<br> I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab operator <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> #elseif($submitorshow=="edit") ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration"> Here you can edit your submit:<br> I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab operator <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> --- 113,121 ---- <p style="color:red">$!message</p> #if($submitorshow=="submit") ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration" enctype="multipart/form-data"> Here you can submit a <b>new order</b>:<br> I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab operator <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> #elseif($submitorshow=="edit") ! <form name="orderform" method="post" action="portal/pane0/NMR+lab+administration" enctype="multipart/form-data"> Here you can edit your submit:<br> I want this order to be processed by <input type="radio" name="process" #if($ordertype=="worker") checked #end value="worker"> a lab operator <input type="radio" name="process" #if($ordertype=="self") checked #end value="self"> myself <input type="radio" name="process" #if($ordertype=="robot") checked #end value="robot"> myself via sample changer<br> *************** *** 142,145 **** --- 142,147 ---- #if($submitorshow=="show") #if($probablestructure) + #if($data.getSession().getAttribute("applet")=="applet") + <a href="$data.getRequest().getRequestURI();jsessionid=$data.getSession().getId()?$data.getRequest().getQueryString()&applet=noapplet" title="Switch off Java applets" style="color:white"><img src="images/nojava.png"></a><br> <script LANGUAGE="JavaScript1.1" SRC="nmrshiftdbhtml/marvin.js"></script> <script LANGUAGE="JavaScript1.1"> *************** *** 153,197 **** mview_end(); </script> #else No probable structure suggested! #end #else ! Probable Structure (click the field to open a sketcher):<br> ! <script LANGUAGE="JavaScript1.1" SRC="nmrshiftdbhtml/marvin.js"></script> ! <script LANGUAGE="JavaScript1.1"> ! <!-- ! function exportMol() ! { ! if(document.JcpEditor != null) ! { ! var s = document.JcpEditor.getMolFile();; ! s = unix2local(s); ! document.orderform.MolTxt.value=s; ! } ! else ! { ! alert("Cannot import molecule: no JavaScript to Java communication in your browser."); ! } ! } ! function openStructureHistory(){ ! mywindow=window.open("/nmrshiftdbhtml/importfromstructureshistory.jsp;jsessionid=$data.getSession().getId()","molimport","height=200,width=900"); ! mywindow.focus(); ! } ! function openImport(){ ! mywindow=window.open("/nmrshiftdbhtml/import.htm","molimport","height=500,width=900"); ! mywindow.focus(); ! } ! msketch_mayscript = true; ! msketch_name = "JcpEditor"; ! msketch_begin("/nmrshiftdbhtml", 450, 400); ! #if($import=="true") ! msketch_param("load","$molfile"); ! #end ! msketch_end(); ! --> ! </script> ! <input type="hidden" name="MolTxt"> ! <input type="button" value="Clear" onClick="document.JcpEditor.clear();"> ! <input type="button" value="Import from structures history" onClick="openStructureHistory()"> #end <br> --- 155,208 ---- mview_end(); </script> + #else + <a href="$data.getRequest().getRequestURI();jsessionid=$data.getSession().getId()?$data.getRequest().getQueryString()&applet=applet" title="Switch on Java-Applets" style="color:white"><img src="images/java.png"></a><br><br> + <img src="$imagefile"> + #end #else No probable structure suggested! #end #else ! #if($data.getSession().getAttribute("applet")=="applet") ! Probable Structure: <a href="$data.getRequest().getRequestURI();jsessionid=$data.getSession().getId()?$data.getRequest().getQueryString()&applet=noapplet" title="Switch off Java applets" style="color:white"><img src="images/nojava.png"></a><br> ! <script LANGUAGE="JavaScript1.1" SRC="nmrshiftdbhtml/marvin.js"></script> ! <script LANGUAGE="JavaScript1.1"> ! <!-- ! function exportMol() ! { ! if(document.JcpEditor != null) ! { ! var s = document.JcpEditor.getMolFile();; ! s = unix2local(s); ! document.orderform.MolTxt.value=s; ! } ! else ! { ! alert("Cannot import molecule: no JavaScript to Java communication in your browser."); ! } ! } ! function openStructureHistory(){ ! mywindow=window.open("/nmrshiftdbhtml/importfromstructureshistory.jsp;jsessionid=$data.getSession().getId()","molimport","height=200,width=900"); ! mywindow.focus(); ! } ! function openImport(){ ! mywindow=window.open("/nmrshiftdbhtml/import.htm","molimport","height=500,width=900"); ! mywindow.focus(); ! } ! msketch_mayscript = true; ! msketch_name = "JcpEditor"; ! msketch_begin("/nmrshiftdbhtml", 450, 400); ! #if($import=="true") ! msketch_param("load","$molfile"); ! #end ! msketch_end(); ! --> ! </script> ! <input type="hidden" name="MolTxt"> ! <input type="button" value="Clear" onClick="document.JcpEditor.clear();"> ! <input type="button" value="Import from structures history" onClick="openStructureHistory()"> ! #else ! <a href="$data.getRequest().getRequestURI();jsessionid=$data.getSession().getId()?$data.getRequest().getQueryString()&applet=applet" title="Switch on Java-Applets" style="color:white"><img src="images/java.png"></a><br><br> ! Choose a structure file for the probable structure: <input type="file" name="datei" size="40"> ! #end #end <br> |
