[cig-commits] r7868 - in
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp: . templates
wei at geodynamics.org
wei at geodynamics.org
Wed Aug 22 17:13:18 PDT 2007
Author: wei
Date: 2007-08-22 17:13:18 -0700 (Wed, 22 Aug 2007)
New Revision: 7868
Modified:
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm
cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-1.vm
Log:
Attributes name change again. Take a blank space out at the end of "cigportal" in the property file.
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties 2007-08-23 00:10:36 UTC (rev 7867)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/cigportal.properties 2007-08-23 00:13:18 UTC (rev 7868)
@@ -33,5 +33,5 @@
grid.wsgram.rm.SDSC = PBS
## Portal configuration
-portal.webappname = cigportal
+portal.webappname = cigportal
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-08-23 00:10:36 UTC (rev 7867)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-0.vm 2007-08-23 00:13:18 UTC (rev 7868)
@@ -1,33 +1,33 @@
-#if( !$cigportal_portal_error_info.equals("") )
- <pre><p><font face="Arial Narrow" color="red">$cigportal_portal_error_info</font><p></pre>
+#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>MAG: A Geodyanmo modeling and analyzing tool </u></font></b></p>
<form name="mag0001" method="POST" action="$actionURL">
- <input type="hidden" name="cigportal_mag_job_list" value="$cigportal_mag_job_list">
+ <input type="hidden" name="cig_mag_job_list" value="$cig_mag_job_list">
<table border="1" cellpadding="0" cellspacing="0" style="border-collapse: collapse; border-width: 2px" bordercolor="#FFFFF0" width="100%" height="54">
<tr>
<td width="20%" style="border-style: groove; border-width: medium" bgcolor="#000066" height="26">
<u><b><font face="Arial Narrow" color="#FFFFFF">Dataset</font></b></u></td>
<td width="8%" style="border-style: groove; border-width: medium" bgcolor="#000066" height="26">
- <u><b><font face="Arial Narrow" color="#FFFFFF">Ks</font></b></u></td>
+ <u><b><font face="Arial Narrow" color="#FFFFFF">Longitudinal Symmetry</font></b></u></td>
<td width="14%" style="border-style: groove; border-width: medium" bgcolor="#000066" height="26">
- <u><b><font face="Arial Narrow" color="#FFFFFF">Resolution</font></b></u></td>
+ <u><b><font face="Arial Narrow" color="#FFFFFF">SH Truncation Order</font></b></u></td>
<td width="20%" style="border-style: groove; border-width: medium" bgcolor="#000066" height="26">
- <u><b><font face="Arial Narrow" color="#FFFFFF">Grid site</font></b></u></td>
+ <u><b><font face="Arial Narrow" color="#FFFFFF">Grid Site</font></b></u></td>
<td width="13%" style="border-style: groove; border-width: medium" bgcolor="#000066" height="26">
- <u><b><font face="Arial Narrow" color="#FFFFFF">Status</font></b></u></td>
+ <u><b><font face="Arial Narrow" color="#FFFFFF">Job Status</font></b></u></td>
</tr>
- #if( $cigportal_mag_job_list )
- #foreach( $magitem in $cigportal_mag_job_list )
+ #if( $cig_mag_job_list )
+ #foreach( $magitem in $cig_mag_job_list )
<tr>
<td width="20%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
- #if( $cigportal_mag_cur_sid && ( $magitem.getId() == $cigportal_mag_cur_sid ) )
- <input type="radio" name="cigportal_mag_id" value="$magitem.getId()" checked>
+ #if( $cig_mag_cur_sid && ( $magitem.getId() == $cig_mag_cur_sid ) )
+ <input type="radio" name="cig_mag_id" value="$magitem.getId()" checked>
#else
- <input type="radio" name="cigportal_mag_id" value="$magitem.getId()" >
+ <input type="radio" name="cig_mag_id" value="$magitem.getId()" >
#end
#if( $magitem.getDataset() )
<font face="MS Sans Serif" color="#000080">$magitem.getDataset()</font></td>
@@ -46,11 +46,11 @@
#end
#end
</table>
- #if( $cigportal_mag_status_info )
+ #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">$!cigportal_mag_status_info</font></b></td>
+ <b><font face="Arial Narrow" color="darkgreen">$!cig_mag_status_info</font></b></td>
</tr>
</table>
#end
@@ -67,27 +67,27 @@
<tr>
<td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
<font face="MS Sans Serif" color="#000080">Dataset: </font>
- <select name="cigportal_mag_parm_dataset">
- #foreach( $dataitem in $cigportal_mag_parm_datalist )
+ <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 Dataset" name="actionMethod_doMag_view_dataset">
</td>
<td width="60%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
- <font face="MS Sans Serif" color="#000080">Resolution (NxN): </font>
+ <font face="MS Sans Serif" color="#000080">GT method selection: </font>
<input type="radio" name="cigportal_mag_parm_globus" value="GT2" checked> GT2
<input type="radio" name="cigportal_mag_parm_globus" value="GT4" > GT4
</td>
</tr>
<tr>
<td width="40%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
- <font face="MS Sans Serif" color="#000080">Resolution (NxN): </font>
- <input type="text" name="cigportal_mag_parm_r" value="32" size=4>
+ <font face="MS Sans Serif" color="#000080"> Spherical Harmonics truncation order: </font>
+ <input type="text" name="cig_mag_parm_r" value="32" size=4>
</td>
<td width="60%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
- <font face="MS Sans Serif" color="#000080">K-neighbor: </font>
- <input type="text" name="cigportal_mag_parm_k" value="4" size=2>
+ <font face="MS Sans Serif" color="#000080">longitudinal symmetry: </font>
+ <input type="text" name="cig_mag_parm_k" value="4" size=2>
</td>
</tr>
</table>
@@ -95,11 +95,11 @@
<tr>
<td width="100%" style="border-style: groove; border-width: 1px" height="24" bgcolor="#99CCFF">
<font face="MS Sans Serif" color="#000080">Grid site selection: </font>
- #foreach( $magsite in $cigportal_mag_site_list )
- #if( $magsite.equals($cigportal_mag_site_list.get(0)) )
- <input type="radio" name="cigportal_mag_parm_site" value="$magsite" checked> $!magsite
+ #foreach( $magsite in $cig_mag_site_list )
+ #if( $magsite.equals($cig_mag_site_list.get(0)) )
+ <input type="radio" name="cig_mag_parm_site" value="$magsite" checked> $!magsite
#else
- <input type="radio" name="cigportal_mag_parm_site" value="$magsite" > $!magsite
+ <input type="radio" name="cig_mag_parm_site" value="$magsite" > $!magsite
#end
#end
</td>
@@ -108,11 +108,11 @@
<input type="submit" value="Create" name="actionMethod_doMag_create">
</form>
<hr>
-#if( $cigportal_mag_viz_vieworig )
+#if( $cig_mag_viz_vieworig )
<p><b><font color="#000080" face="MS Serif" size="3">Original Dataset: </font>
-<a href="$cigportal_mag_viz_datasetlink" target="new">Download</a>
+<a href="$cig_mag_viz_datasetlink" target="new">Download</a>
</b></p>
<p><b><font color="#000080" face="MS Serif" size="3"><u>Plot: </u></font>
</b></p>
-<img src="$cigportal_mag_viz_datasetimagelink" width="800" height="512">
+<img src="$cig_mag_viz_datasetimagelink" width="800" height="512">
#end
Modified: cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-1.vm
===================================================================
--- cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-1.vm 2007-08-23 00:10:36 UTC (rev 7867)
+++ cs/cigtg/trunk/cigtg-dev/CigPortal/cigportal/webapp/templates/mag-1.vm 2007-08-23 00:13:18 UTC (rev 7868)
@@ -1,23 +1,23 @@
-#if( !$cigportal_portal_error_info.equals("") )
- <pre><p><font face="Arial Narrow" color="red">$cigportal_portal_error_info</font><p></pre>
+#if( !$cig_portal_error_info.equals("") )
+ <pre><p><font face="Arial Narrow" color="red">$cig_portal_error_info</font><p></pre>
<hr>
#end
<form name="mag0002" method="POST" action="$actionURL">
<input type="submit" value="Return" name="actionMethod_doMag_return">
</form>
<hr>
-<p><b><font color="#000080" face="MS Serif" size="3">Dataset: $cigportal_mag_viz_dataset , Jod ID: $cigportal_mag_viz_jobid </font></b></p>
+<p><b><font color="#000080" face="MS Serif" size="3">Dataset: $cig_mag_viz_dataset , Jod ID: $cig_mag_viz_jobid </font></b></p>
#set( $vizcount = 0)
-#foreach( $imagelink in $$cigportal_mag_viz_imagelink )
-#set( $datalink = $cigportal_mag_viz_resultlink.get($vizcount) )
- <p><b><font color="#000080" face="MS Serif" size="3">Result dataset (K= $cigportal_mag_viz_klist.get($vizcount) ): </font>
+#foreach( $imagelink in $$cig_mag_viz_imagelink )
+#set( $datalink = $cig_mag_viz_resultlink.get($vizcount) )
+ <p><b><font color="#000080" face="MS Serif" size="3">Result dataset (K= $cig_mag_viz_klist.get($vizcount) ): </font>
<a href="$!datalink" target="new">Download</a>
</b></p>
<table border="0">
<tr>
-<td align="right">Zmax($!cigportal_mag_viz_zmax)</td>
-<td><img src="$!cigportal_mag_viz_legendlink"</td>
-<td align="left">Zmin($!cigportal_mag_viz_zmin)</td>
+<td align="right">Zmax($!cig_mag_viz_zmax)</td>
+<td><img src="$!cig_mag_viz_legendlink"</td>
+<td align="left">Zmin($!cig_mag_viz_zmin)</td>
</tr>
</table>
<p><b><font color="#000080" face="MS Serif" size="3"><u>Visualization: </u></font>
More information about the cig-commits
mailing list