Project

General

Profile

« Previous | Next » 

Revision 4357

Added by walbridge over 15 years ago

Further improvements to the registry to properly support the new properties. Removed all variables previously passed around between forms which should always be available canonically from the skin.properties file and replaced with refences to properties value for the skin being used. Removed some cruft from both files, fixed mior issues mentioned in bug #3487.

View differences:

entryForm.tmpl
71 71 
  <input type="hidden" name="cfg" value="[% cfg %]">
72 72 
  <input type="hidden" name="docid" value="[% docid %]">
73 73 
  <input type="hidden" name="stage" value="insert">
74 
  <input type="hidden" name="showSiteList" value="[% showSiteList %]">
75 
  <input type="hidden" name="showWgList" value="[% showWgList %]">
76 
  <input type="hidden" name="showOrganization" value="[% showOrganization %]">
77 74 
  <input type="hidden" name="lsite" value="[% config.site %]">
78 
  <input type="hidden" name="hasKeyword" value="[% hasKeyword %]">
79 
  <input type="hidden" name="hasTemporal" value="[% hasTemporal %]">
80 
  <input type="hidden" name="hasSpatial" value="[% hasSpatial %]">
81 
  <input type="hidden" name="hasTaxonomic" value="[% hasTaxonomic %]">
82 
  <input type="hidden" name="hasMethod" value="[% hasMethod %]">
83 
  <input type="hidden" name="hasUpload" value="[% hasUpload %]">
84 
  <input type="hidden" name="temporalRequired" value="[% temporalRequired %]">
85 
  <input type="hidden" name="spatialRequired" value="[% spatialRequired %]">
86 
  <input type="hidden" name="contactEmailAddressRequired" value="[% contactEmailAddressRequired %]">
87 75
88 76 
        <table class="tables" cellpadding="5" cellspacing="0">
89 77 
        <tr class="sectheader"><td colspan="5" align="left"><span class="label">NAME OF SUBMITTER&nbsp;
......
113 101 
	<tr class="sectbody" id="title"><td class="rightCol"><span class="label">*Data Set Title</span></td><td colspan="5"><input type="TEXT" name="title" value="[%title%]" class="longwidth">
114 102 
        </td></tr>
115 103
116 
	[% IF showSiteList == 'true' %]
104 
	[% IF show.siteList == 'true' %]
117 105 
        <tr class="sectbody" id="sitelist"><td class="rightCol"><span class="label">*[% config.site | ucfirst %] Name</span></td>
118 106 
	  <td colspan="5"><select name="site" class="longwidth">
119 107 
	    [% IF form == 're_entry' %]
......
127 115 
          </select></td></tr>
128 116 
[% END %]
129 117
130 
	[% IF showWgList == 'true' %]
118 
	[% IF show.wgList == 'true' %]
131 119 
        <tr class="sectbody"><td class="rightCol"><span class="label">*NCEAS Project(s):</span></td>
132 120 
            <td colspan="5"><select name="wg" multiple="multiple" size="5" class="longwidth">
133 121 
            [% FOREACH project = projects %]
......
147 135 
            [% END %]
148 136 
          </select></td></tr>
149 137 
[% END %]
150 
[% IF showOrganization == 'true' %]
138 
[% IF show.organization == 'true' %]
151 139 
        <tr class="sectbody"><td class="rightCol"><span class="label">*Organization Name</span></td>
152 140 
            <td colspan="5"><input type="TEXT" name="site" class="longwidth" value="[%site%]"></td></tr>
153 141 
[% END %]
......
344 332 
    <tr class="sectbody"><td class="rightCol" valign="top"><span class="label">*Data Set Abstract</span><br><span class="regtext">(max. 350 words)</span></td>
345 333 
        <td colspan="5"><textarea rows="6" cols="60" name="abstract">[%abstract%]</textarea></td></tr>
346 334 
    </table>
347
348 
  [% IF hasKeyword == 'true' %]
335 
  [% IF modules.keyword == 'true' %]
349 336 
    <table class="tables" cellpadding="5" cellspacing="0">
350 337 
  <tr class="sectheader"><td colspan="5" align="left"><span class="label">KEYWORD INFORMATION <span class="label">&nbsp;</span><a href="[% cgiPrefix %]/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#KeywordInformation"
351 338 
        target="guide"><span class="smalltext">(What's this?)</span></a></td>
......
384 371 
             <option>GCMD</option>
385 372 
            </select>
386 373
387 
	  <!--  <input type="radio"  name="kwTh[%cnt%]" value="none"><span class="regtext">None&nbsp;&nbsp;</span>
388 
	  <input type="radio"  name="kwTh[%cnt%]" value="GCMD"><span class="regtext">GCMD&nbsp;&nbsp;</span> -->
389
390
391 374 
	    </td></tr>
392 375
393 376 
	  <tr id="addKeyword" class="sectbody">
......
446 429 
       </table>
447 430 
  [% END %]
448 431
449 
  [% IF hasTemporal == 'true' %]
432 
  [% IF modules.temporal == 'true' %]
450 433
451 434 
  <table class="tables" cellpadding="5" cellspacing="0">
452 435 
  <tr class="sectheader"><td colspan="5" align="left"><span class="label">
......
467 450
468 451 
      <tr class="sectbody">
469 452 
        <td class="rightCol">
470 
          [% IF temporalRequired == 'true' %]
453 
          [% IF required.temporal == 'true' %]
471 454 
          	<span class="label">*Year (yyyy)</span>
472 455 
          [% ELSE %]
473 456 
		<span class="label">Year (yyyy)</span>
......
481 464
482 465 
	<tr class="sectbody">
483 466 
	  <td class="rightCol">
484 
          <!-- from eml-2.0.1, it is not required to make month and day required -->
485 
	  <!-- [% IF temporalRequired == 'true' %]
486 
	        <span class="label">*Month</span>
487 
          [% ELSE %]
488 
		<span class="label">Month</span>
489 
	  [% END %]-->
490 467 
	  <span class="label">Month</span>
491 468 
          </td>
492 469 
	  <td align="left"><select name="beginningMonth">
......
512 489
513 490 
   <tr class="sectbody">
514 491 
	  <td class="rightCol">
515 
          <!--[% IF temporalRequired == 'true' %]
516 
        	  <span class="label">*Day</span>
517 
          [% ELSE %]
518 492 
	          <span class="label">Day</span>
519 
	  [% END %]-->
520 
	          <span class="label">Day</span>
521 493 
	  </td>
522 494
523 495 
	  <td align="left"><select name="beginningDay">
......
556 528 
     </table>
557 529 
  [% END %]
558 530
559 
[% IF hasSpatial == 'true' %]
531 
[% IF modules.spatial == 'true' %]
560 532 

  		




  561
  533
  
    
  <table class="tables" cellpadding="5" cellspacing="0">  


  		




  562
  534
  
    

  		




  ......




  570
  542
  
    
   <table class="tables" cellpadding="5" cellspacing="0" id="spatialTable">  


  		




  571
  543
  
    
   


  		




  572
  544
  
    
    <tr class="sectbody">


  		




  573
  
  
    
       [% IF spatialRequired == 'true' %]


  		




  
  545
  
    
       [% IF required.spatial == 'true' %]


  		




  574
  546
  
    
      	  <td align="right" valign="top"><span class="label">*Geographic Description</span></td>


  		




  575
  547
  
    
    [% ELSE %]


  		




  576
  548
  
    
          <td align="right" valign="top"><span class="label">Geographic Description</span></td>


  		




  ......




  582
  554
  
    
    <tr class="sectbody"><td class="topbottom" align="center" colspan="6"><span class="label">COORDINATES</span></td></tr>


  		




  583
  555
  
    
        


  		




  584
  556
  
    
     


  		




  585
  
  
    
  [% IF showSiteList == 'true' %]


  		




  
  557
  
    
  [% IF show.siteList == 'true' %]


  		




  586
  558
  
    
    <tr class="sectbody"><td align="left" valign="top" colspan="6">


  		




  587
  559
  
    
        <input class="label" type="CHECKBOX" name="useSiteCoord" [%useSiteCoord%]>


  		




  588
  560
  
    
        <span class="regtext">Use [% config.site %] coordinates. (This indicates that the data were


  		




  ......




  601
  573
  
    
      


  		




  602
  574
  
    
   <tr class="sectbody">


  		




  603
  575
  
    
     <td class="rightCol">


  		




  604
  
  
    
      [% IF spatialRequired == 'true' %]


  		




  
  576
  
    
      [% IF required.spatial == 'true' %]


  		




  605
  577
  
    
        <span class="label">*Latitude</span>


  		




  606
  578
  
    
      [% ELSE %]


  		




  607
  579
  
    
        <span class="label">Latitude</span>


  		




  ......




  627
  599
  
    

  		




  628
  600
  
    
    <tr class="sectbody">


  		




  629
  601
  
    
      <td class="rightCol"> 


  		




  630
  
  
    
      [% IF spatialRequired == 'true' %]


  		




  
  602
  
    
      [% IF required.spatial == 'true' %]


  		




  631
  603
  
    
        <span class="label">*Longitude</span>


  		




  632
  604
  
    
      [% ELSE %]


  		




  633
  605
  
    
        <span class="label">Longitude</span>


  		




  ......




  702
  674
  
    
  </table>    


  		




  703
  675
  
    
   [% END %]


  		




  704
  676
  
    

  		




  705
  
  
    
   [% IF hasTaxonomic == 'true' %]


  		




  
  677
  
    
   [% IF modules.taxonomic == 'true' %]


  		




  706
  678
  
    
   


  		




  707
  679
  
    
   <table class="tables" cellpadding="5" cellspacing="0">  


  		




  708
  680
  
    

  		




  ......




  793
  765
  
    
   </table>


  		




  794
  766
  
    
    [% END %]	


  		




  795
  767
  
    

  		




  796
  
  
    
  [% IF hasMethod == 'true' %]


  		




  
  768
  
    
  [% IF modules.method == 'true' %]


  		




  797
  769
  
    
   <table class="tables" cellpadding="5" cellspacing="0">  


  		




  798
  770
  
    
  <tr class="sectheader"><td colspan="5" align="left">


  		




  799
  771
  
    
  <span class="label">DATA COLLECTION METHODS&nbsp;</span>


  		




  ......




  875
  847
  
    
      <td class="rightCol"><span class="label">Organization Name</span>


  		




  876
  848
  
    
      <td colspan="5"><input type="TEXT" name="origNameOrgContact" id="contactNameOrg" value="[%origNameOrgContact%]" class="longwidth"></td></tr>


  		




  877
  849
  
    
    <tr class="sectbody">      


  		




  878
  
  
    
      [% IF contactEmailAddressRequired == 'true' %]


  		




  
  850
  
    
      [% IF required.contactEmailAddress == 'true' %]


  		




  879
  851
  
    
      	<td class="rightCol"><span class="label">*E-Mail</span>


  		




  880
  852
  
    
      [% ELSE %]


  		




  881
  853
  
    
      	<td class="rightCol"><span class="label">E-Mail</span>


  		




  ......




  991
  963
  
    
  


  		




  992
  964
  
    
        <td colspan="5" align="left">


  		




  993
  965
  
    
        [% IF form == 're_entry' && (dataMedium == "digital " || dataMedium == "digital")  %]	


  		




  994
  
  
    
            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital" CHECKED><span class="regtext">Digital&nbsp;&nbsp;</span></input>


  		




  
  966
  
    
            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital" CHECKED>


  		




  
  967
  
    
						<span class="regtext">Digital&nbsp;&nbsp;</span></input>


  		




  995
  968
  
    
        [%ELSE%]


  		




  996
  
  
    
            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital"><span class="regtext">Digital&nbsp;&nbsp;</span></input>


  		




  
  969
  
    
            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital">


  		




  
  970
  
    
						<span class="regtext">Digital&nbsp;&nbsp;</span></input>


  		




  997
  971
  
    
        [% END %]


  		




  998
  972
  
    
        [% IF form == 're_entry' && (dataMedium == "hardcopy " || dataMedium == "hardcopy") %]	


  		




  999
  
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy" CHECKED><span class="regtext">Hardcopy&nbsp;&nbsp;</span></input>


  		




  
  973
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy" CHECKED>


  		




  
  974
  
    
					 <span class="regtext">Hardcopy&nbsp;&nbsp;</span></input>


  		




  1000
  975
  
    
        [%ELSE%]


  		




  1001
  
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy"><span class="regtext">Hardcopy&nbsp;&nbsp;</span></input>


  		




  
  976
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy">


  		




  
  977
  
    
					 <span class="regtext">Hardcopy&nbsp;&nbsp;</span></input>


  		




  1002
  978
  
    
        [% END %]


  		




  1003
  979
  
    
        [% IF form == 're_entry' && dataMedium == "other" %]


  		




  1004
  
  
    
           <input type="radio" name="dataMedium" value="other" onClick="handleOther(1, 'otherDM')" CHECKED><span class="regtext">Other&nbsp;</span></input>


  		




  
  980
  
    
           <input type="radio" name="dataMedium" value="other" onClick="handleOther(1, 'otherDM')" CHECKED>


  		




  
  981
  
    
					 <span class="regtext">Other&nbsp;</span></input>


  		




  1005
  982
  
    
        [%ELSE%]


  		




  1006
  
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(1, 'otherDM')" value="other"><span class="regtext">Other&nbsp;</span></input>


  		




  
  983
  
    
           <input type="radio"  name="dataMedium" onClick="handleOther(1, 'otherDM')" value="other">


  		




  
  984
  
    
					 <span class="regtext">Other&nbsp;</span></input>


  		




  1007
  985
  
    
        [% END %]


  		




  1008
  986
  
    

  		




  1009
  987
  
    
	<input type="TEXT" name="dataMediumOther" value="[%dataMediumOther%]" id="otherDM" class="shortwidth"></input>


  		




  ......




  1014
  992
  
    
      <td colspan="5" align="left">


  		




  1015
  993
  
    
      


  		




  1016
  994
  
    
          [% IF form == 're_entry' && useConstraints == "no restrictions" %]		  


  		




  1017
  
  
    
	    <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions" CHECKED><span class="regtext">No restrictions&nbsp;&nbsp;</span>


  		




  
  995
  
    
	    <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions" CHECKED>


  		




  
  996
  
    
			<span class="regtext">No restrictions&nbsp;&nbsp;</span>


  		




  1018
  997
  
    
          [%ELSE%]


  		




  1019
  
  
    
            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions"><span class="regtext">No restrictions&nbsp;&nbsp;</span>


  		




  
  998
  
    
            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions">


  		




  
  999
  
    
						<span class="regtext">No restrictions&nbsp;&nbsp;</span>


  		




  1020
  1000
  
    
          [%END%]


  		




  1021
  1001
  
    
          [% IF form == 're_entry' && useConstraints == "Obtain permission from data set owner(s)" %]		  


  		




  1022
  
  
    
  	    <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)" CHECKED><span class="regtext">Obtain permission from data set owner(s)&nbsp;&nbsp;</span>


  		




  
  1002
  
    
  	    <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)" CHECKED>


  		




  
  1003
  
    
				<span class="regtext">Obtain permission from data set owner(s)&nbsp;&nbsp;</span>


  		




  1023
  1004
  
    
          [%ELSE%]


  		




  1024
  
  
    
            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)"><span class="regtext">Obtain permission from data set owner(s)&nbsp;&nbsp;</span>


  		




  
  1005
  
    
            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)">


  		




  
  1006
  
    
						<span class="regtext">Obtain permission from data set owner(s)&nbsp;&nbsp;</span>


  		




  1025
  1007
  
    
          [%END%]


  		




  1026
  1008
  
    
          </td></tr>


  		




  1027
  1009
  
    
	  


  		




  ......




  1030
  1012
  
    
   <tr class="sectbody"><td></td><td colspan="5" align="left">


  		




  1031
  1013
  
    
 


  		




  1032
  1014
  
    
    [% IF form == 're_entry' && useConstraints == "other" %]		  


  		




  1033
  
  
    
      <input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other" CHECKED><span class="regtext">Other&nbsp;</span>


  		




  
  1015
  
    
      <input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other" CHECKED>


  		




  
  1016
  
    
			<span class="regtext">Other&nbsp;</span>


  		




  1034
  1017
  
    
    [%ELSE%]


  		




  1035
  
  
    
      <input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other"><span class="regtext">Other&nbsp;</span>


  		




  
  1018
  
    
      <input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other">


  		




  
  1019
  
    
			<span class="regtext">Other&nbsp;</span>


  		




  1036
  1020
  
    
    [%END%]


  		




  1037
  1021
  
    
   <input type="TEXT" name="useConstraintsOther" id="otherUC" value="[%useConstraintsOther%]" size="49"></td</tr>


  		




  1038
  1022
  
    
   


  		




  ......




  1045
  1029
  
    
   


  		




  1046
  1030
  
    
   </table>


  		




  1047
  1031
  
    
   


  		




  1048
  
  
    
  [% IF hasUpload == 'true' %]


  		




  
  1032
  
    
  [% IF modules.upload == 'true' %]


  		




  1049
  1033
  
    

  		




  1050
  1034
  
    
  <!-- Associated Data -->


  		




  1051
  1035
  
    
  <table class="tables" cellpadding="5" cellspacing="0">


  		




  ......




  1123
  1107
  
    
   <tr class="sectheader"><td colspan="6" align="left"></td></tr>


  		




  1124
  1108
  
    
   <tr class="sectheader"><td colspan="6" align="center" class="borderbottom"><input type="SUBMIT" onClick="sortInputTags()" value="Submit Data Set Description" name="SUBMIT">


  		




  1125
  1109
  
    
              


  		




  1126
  
  
    
   


  		




  1127
  
  
    
   <!-- <span>&nbsp;&nbsp;</span><input type="RESET" value="Reset Form" name="RESET"></td></tr>-->


  		




  1128
  1110
  
    
    </table>


  		




  1129
  1111
  
    
    <p></p>


  		




  1130
  1112
  
    
   


  		












Also available in:  Unified diff