[cig-commits] r8050 - cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates

[wei at geodynamics.org]

Author: wei
Date: 2007-09-27 18:18:22 -0700 (Thu, 27 Sep 2007)
New Revision: 8050

Added:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/file-upload.vm
Modified:
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm
   cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm
Log:
More templetes changes.

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm	2007-09-28 01:16:44 UTC (rev 8049)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/createjob.vm	2007-09-28 01:18:22 UTC (rev 8050)
@@ -10,7 +10,20 @@
   <hr>
   <p><b><font color="#000080" face="MS Serif" size="3"><u>Create a MAG job:</u></font></b></p>
   <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
-  <!-- dataset selection -->   
+  <!-- dataset selection -->
+  <!-- dataset selection --> 
+<tr>
+  	<td width="60%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
+	      <font face="MS Sans Serif" color="#000080">Select Input File: </font>
+	      <select name="cig_mag_parm_dataset">
+	      #foreach( $dataitem in $cig_mag_parm_datalist )
+		<option value="$dataitem">$!dataitem</option>
+	      #end
+	      </select>
+	      <input type="submit" value="View Input File" name="actionMethod_doMag_view_dataset">
+	      <input type="submit" value="Upload Input File" name="actionMethod_doStart_upload_datasets">      
+	</td>
+  </tr>  
   <tr>
   	<td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
 	      <font face="MS Sans Serif" color="#000080"> Spherical Harmonics Truncation Order: </font>
@@ -41,6 +54,6 @@
 <hr>
 #if( $cig_mag_viz_vieworig )
 <p><b><font color="#000080" face="MS Serif" size="3">Original Input File: </font>
-<a href="$cig_mag_viz_datasetlink" target="new">Download</a>
+<a href="$cig_mag_viz_datasetlink" target=_blank>Download</a>
 </b></p>
 #end

Added: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/file-upload.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/file-upload.vm	2007-09-28 01:16:44 UTC (rev 8049)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/file-upload.vm	2007-09-28 01:18:22 UTC (rev 8050)
@@ -0,0 +1,20 @@
+#if( !$cig_portal_error_info.equals("") )
+  <pre><p><font face="Arial Narrow" color="red">$cig_portal_error_info</font><p></pre>
+  <hr>
+#end
+
+<p><b><font color="#000080" face="MS Serif" size="4"><u>Upload a Input File</u></font></b></p>
+
+<form name="file-upload" enctype = "multipart/form-data" method="post" action="$actionURL">
+
+<hr>
+<p><font color="#000080" face="MS Serif" size="2">Dataset upload: </font></p>
+<table><tr><td>
+#foreach( $uploaditem in [1..$simplegrid_fileupload_num_datasets] )
+	<input type="file" name="simplegrid_fileupload_parm_file$uploaditem" size=20>
+#end
+</td></tr></table>
+<input type="submit" value="Upload" name="actionMethod_doFileupload_upload">
+<hr>
+<input type="submit" value="DONE" name="actionMethod_doFileupload_done">
+</form>

Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm	2007-09-28 01:16:44 UTC (rev 8049)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm	2007-09-28 01:18:22 UTC (rev 8050)
@@ -42,18 +42,20 @@
 	      <font face="MS Sans Serif" color="#000080">$magitem.getSite()</font></td>
 	      <td width="13%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
 	      <b><font face="MS Sans Serif" color="#800000">$magitem.getStatus()</font></b></td>
+	      #if( $cig_mag_status_info )
+                <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
+  	        <tr>
+  	            <td width="80%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#FFFFFF">
+  	            <b><font face="Arial Narrow" color="darkgreen">$!cig_mag_status_info</font></b></td>
+  	            <td width="20%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#FFFFFF">
+  	            <a href="$cig_mag_viz_resultlink" target=_blank>Download Result</a>
+                </tr>
+                </table>
+              #end
 	    </tr>
       #end
     #end
   </table>
-  #if( $cig_mag_status_info )
-  <table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
-  <tr>
-  	<td width="100%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#FFFFFF">
-  	<b><font face="Arial Narrow" color="darkgreen">$!cig_mag_status_info</font></b></td>
-  </tr>
-  </table>
-  #end
 	<hr>
   <table border="0"><tr>
   <td width="50%" align="left">   <input type="submit" value="Run" name="actionMethod_doMag_submit">   </td>
@@ -106,7 +108,7 @@
 <hr>
 #if( $cig_mag_viz_vieworig )
 <p><b><font color="#000080" face="MS Serif" size="3">Original Input File: </font>
-<a href="$cig_mag_viz_datasetlink" target="new">Download</a>
+<a href="$cig_mag_viz_datasetlink" target=_blank>Download</a>
 </b></p>
 <p><b><font color="#000080" face="MS Serif" size="3"><u>Plot: </u></font>
 </b></p>