Project

General

Profile

Revision 2150

Added by sgarg over 16 years ago

Made changes to fix bug# 1303 and 1367.(Both are related)
Following variables can now be specifieD from the cfg file to control behaviour of the skin: hasKeyword, hasMethod, hasSpatial, hasTaxonomic and hasTemporal. Following two also can be used: spatialRequired and temporalRequired

View differences:

lib/style/common/templates/entryForm.tmpl
336 336
  <input type="hidden" name="docid" value="[% docid %]">
337 337
  <input type="hidden" name="stage" value="insert">
338 338
  <input type="hidden" name="hasKeyword" value="[% hasKeyword %]">
339
  <input type="hidden" name="hasTemporal" value="[% hasTemporal %]">
340
  <input type="hidden" name="hasSpatial" value="[% hasSpatial %]">
341
  <input type="hidden" name="hasTaxonomic" value="[% hasTaxonomic %]">
342
  <input type="hidden" name="hasMethod" value="[% hasMethod %]">
343
  <input type="hidden" name="temporalRequired" value="[% temporalRequired %]">
344
  <input type="hidden" name="spatialRequired" value="[% spatialRequired %]>"
339 345
  <p align="left">
340 346
 	<b>BASIC INFORMATION&nbsp;</b><a href="@cgi-prefix@/cgi-bin/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#BasicInformation" target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
341 347
  </p>
......
666 672
  </table>
667 673
  [% END %]
668 674
  <br>
675

  
676
  [% IF hasTemporal == 'true' %]
677

  
669 678
  <p align="left"><b><font size="-1">
670 679
  TEMPORAL COVERAGE OF DATA&nbsp;<a href="@cgi-prefix@/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#TemporalCoverageOfData"
671 680
   target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
......
681 690
      <td width="33%" valign="TOP"> 
682 691
        <p><font size="-1"> 
683 692
          <input type="TEXT" name="beginningYear" value="[%beginningYear%]" size="8" maxlength="4">
684
          <b><font color="#b00000">Year (YYYY)</font></b></font></p>
693
          [% IF temporalRequired == 'true' %]
694
          	<b><font color="#b00000">Year (YYYY)</font></b></font></p>
695
          [% ELSE %]
696
		<b>Year (YYYY)</b></font></p>
697
	  [% END %]
685 698
      </td>
686 699
      <td width="33%" valign="TOP"> 
687 700
        <p><font size="-1"> 
......
694 707
            <option>08</option>            <option>09</option>            <option>10</option>            <option>11</option>
695 708
            <option>12</option>
696 709
          </select>
697
          <b><font color="#b00000">Month (MM)</font></b></font></p>
710
          [% IF temporalRequired == 'true' %]
711
	        <b><font color="#b00000">Month (MM)</font></b></font></p>
712
          [% ELSE %]
713
		<b>Month (MM)</b></font></p>
714
	  [% END %]
698 715
	</font></p>
699 716
      </td>
700 717
      <td width="33%" valign="TOP"> 
......
712 729
            <option>24</option>            <option>25</option>            <option>26</option>            <option>27</option>
713 730
            <option>28</option>            <option>29</option>            <option>30</option>            <option>31</option>
714 731
          </select>
715
          <b><font color="#b00000">Day (DD)</font></b></font></p>
732
          [% IF temporalRequired == 'true' %]
733
        	  <b><font color="#b00000">Day (DD)</font></b></font></p>
734
          [% ELSE %]
735
	          <b>Day (DD)</b></font></p>
736
	  [% END %]
737

  
716 738
	</font></p>
717 739
      </td>
718 740
    </tr>
......
761 783
      </td>
762 784
    </tr>
763 785
  </table>
786
  [% END %]
764 787

  
788
  [% IF hasSpatial == 'true' %]
765 789
  <p align="left">
766 790
  <b>SPATIAL COVERAGE OF DATA&nbsp;</b><a href="@cgi-prefix@/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#SpatialCoverageOfData" target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
767 791
  </p>
......
769 793
bgcolor="#c6d6e7">
770 794
    <tr>
771 795
    <td valign="top" colspan="4">
772
    <span class="required">Geographic Description</span><br>
796
          
797
    [% IF spatialRequired == 'true' %]
798
      	  <span class="required">Geographic Description</span><br>
799
    [% ELSE %]
800
          <span class="label">Geographic Description</span><br>
801
    [% END %]    
802

  
773 803
    Enter a general description of the geographic area in which the data were collected.
774 804
    This can be a simple place name (e.g., Santa Barbara) or a fuller description.<br>
775 805
    <textarea rows="3" cols="80" name="geogdesc">[% geogdesc %]</textarea>
......
802 832
    </tr>
803 833
[% END %]
804 834
    <tr> 
805
      <td width="18%" valign="TOP"> 
835
      <td width="18%" valign="TOP">
836
      [% IF spatialRequired == 'true' %]
806 837
        <span class="required">Latitude</span>
838
      [% ELSE %]
839
        <span class="label">Latitude</span>
840
      [% END %]     
807 841
      </td>
808 842
      <td width="20%" valign="TOP"> 
809 843
        &nbsp;North/South
810 844
      </td>
811 845
      <td width="20%" valign="TOP"> 
846

  
847
      [% IF spatialRequired == 'true' %]
812 848
        <span class="required">Longitude</span>
849
      [% ELSE %]
850
        <span class="label">Longitude</span>
851
      [% END %]
852

  
813 853
      </td>
814 854
      <td width="42%" valign="TOP"> 
815 855
        &nbsp;West/East
......
896 936
      </td>
897 937
    </tr>
898 938
  </table>
939
  [% END %]
899 940

  
941
  [% IF hasTaxonomic == 'true' %]
900 942
  <p align="left">
901 943
  <b>TAXONOMIC COVERAGE OF DATA&nbsp;</b><a href="@cgi-prefix@/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#TaxonomicCoverage" target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
902 944
   </p>
......
963 1005
     </tr>
964 1006
     </tbody>
965 1007
   </table>
1008
  [% END %]	
966 1009

  
1010
  [% IF hasMethod == 'true' %]
967 1011
  <p align="left">
968 1012
  <b>METHODS&nbsp;</b><a href="@cgi-prefix@/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#Methods" target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
969 1013
   </p>
......
1014 1058
      </td>
1015 1059
     </tbody>
1016 1060
   </table>
1017

  
1061
  [% END %]
1018 1062
  <p align="left">
1019 1063
  <b>DATA SET CONTACT&nbsp;</b><a href="@cgi-prefix@/register-dataset.cgi?cfg=[%cfg%]&amp;stage=guide#DataSetContactAddress" target="guide"><font size="2"><sup>(What's this?)</sup></font></a>
1020 1064
  </p>
lib/style/common/templates/confirmData.tmpl
285 285
  </table>
286 286
[% END %]
287 287
  
288
[% IF hasTemporal == 'true' %]
288 289
<hr>
289 290
<a name="TemporalCoverageOfData"></a>
290 291
<p><b><font size="4" color="#0000ff">TEMPORAL COVERAGE OF DATA</font></b> 
......
294 295

  
295 296
<p><b><font size="-1">Ending Date of Data Set:</font></b>    [%endingMonth%]&nbsp;[%endingDay%]&nbsp;[%endingYear%]
296 297
</p>
298
[% END %]
297 299

  
300
[% IF hasSpatial == 'true' %]
298 301
<hr>
299 302
<a name="SpatialCoverageOfData"></a>
300 303
<p><b><font size="4" color="#0000ff">SPATIAL COVERAGE OF DATA</font></b> 
......
399 402
      </td>
400 403
    </tr>
401 404
  </table>
405
[% END %]
402 406

  
407
[% IF hasTaxonomic == 'true' %]
403 408
    [% numTaxa = 0 %]
404 409
    [% IF taxaCount > 0 %]
405 410
        [% numTaxa = taxaCount %]
......
415 420
        [% cnt = cnt + 1 %]
416 421
     [% END %]
417 422
     <p><b><font size="-1">Authority:</font></b>  [% taxaAuth %]</p>
423
[% END %]
418 424

  
425
[% IF hasMethod == 'true' %]
419 426
    <hr>
420 427
    <a name="Methods"></a>
421 428
    <p><b><font size="4" color="#0000ff">METHODS</font></b></p>
......
425 432
    [% END %]
426 433
    <p><b><font size="-1">Study Extent:</font></b> [%studyExtentDescription%]</p>
427 434
    <p><b><font size="-1">Sampling Description:</font></b> [%samplingDescription%]</p>
435
[% END %]
428 436

  
429 437
<hr>
430 438
<a name="DataSetContactAddress"></a>
......
502 510
  <input type="hidden" name="docid" value="[% docid %]">
503 511
  <input type="hidden" name="stage" value="confirmed">
504 512
  <input type="hidden" name="hasKeyword" value="[% hasKeyword %]">
513
  <input type="hidden" name="hasSpatial" value="[% hasSpatial %]">
514
  <input type="hidden" name="hasTemporal" value="[% hasTemporal %]">
515
  <input type="hidden" name="hasTaxonomic" value="[% hasTaxonomic %]">
516
  <input type="hidden" name="hasMethod" value="[% hasMethod %]">
517
  <input type="hidden" name="temporalRequired" value="[% temporalRequired %]">
518
  <input type="hidden" name="spatialRequired" value="[% spatialRequired %]">
505 519
  <input type="hidden" name="providerGivenName" value="[%providerGivenName%]">
506 520
  <input type="hidden" name="providerSurName" value="[%providerSurName%]">
507 521
  <input type="hidden" name="site" value="[%site%]">
lib/style/common/templates/genericResponse.tmpl
50 50
  <input type="hidden" name="stage" value="confirmed">
51 51
  <input type="hidden" name="dataWrong" value="No, go back to editing">
52 52
  <input type="hidden" name="hasKeyword" value="[% hasKeyword %]">
53
  <input type="hidden" name="hasTemporal" value="[% hasTemporal %]">
54
  <input type="hidden" name="hasSpatial" value="[% hasSpatial %]">
55
  <input type="hidden" name="hasTaxonomic" value="[% hasTaxonomic %]">
56
  <input type="hidden" name="hasMethod" value="[% hasMethod %]">
57
  <input type="hidden" name="temporalRequired" value="[% temporarlRequired %]">
58
  <input type="hidden" name="spatialRequired" value="[% spatialRequired %]">
53 59
  <input type="hidden" name="providerGivenName" value="[%providerGivenName%]">
54 60
  <input type="hidden" name="providerSurName" value="[%providerSurName%]">
55 61
  <input type="hidden" name="site" value="[%site%]">

Also available in: Unified diff