Ignore:
Timestamp:
08/12/08 16:20:26 (12 years ago)
Author:
cbyrom
Message:

Simplify upload of CSML/CDML/granulite data by using the newly extended
granulite class for all these ops - remove unecessary code in editatom.
Add new template function to combine the upload of CSML/CDML files into
a single field - with additional inputs for time axis and dataset ID data.
Fix editor to display deployments data for DEs once again.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • MILK/trunk/milk_server/milk_server/templates/atom_editor/atom_editor.html

    r4557 r4563  
    77        <head> 
    88        <title py:content="c.title">title</title> 
    9         <span py:if="c.atom.isDeployable()"  py:strip=""> 
     9        <span py:if="c.atom.isDeployable() or c.atom.isDE()"  py:strip=""> 
    1010                <script type="text/javascript"> 
    1111                                var placeholderNames = ['deploymentsPlaceholder']; 
    … …  
    2929                                        var urls = ['$c.dataEntitiesURL']; 
    3030                        </script> 
     31                </span> 
     32        <span py:if="not c.atom.isDeployment()"  py:strip=""> 
    3133                        <script type="text/javascript" src="$g.server/js/queueDeployments.js"/> 
    3234                </span> 
    … …  
    5153 
    5254                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="GeneralInfo(c.saveLink)"/> 
    53                 <div py:if="c.atom.isGranule() and not c.atom.contentFile" py:replace="UploadFile('Ingest data from CSML file', 'CSML', c.saveLink)"/> 
     55                <div py:if="c.atom.isGranule() and not c.atom.contentFile" py:replace="UploadCSMLOrCDMLFileForm(c.saveLink)"/> 
    5456                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="TextArea('Summary', c.atom.Summary, c.saveLink)"/> 
    5557                <div py:if="not c.atom.isDeployment() and not c.atom.isGranule()" py:replace="TextArea('Content', c.atom.Content, c.saveLink)"/> 
    … …  
    6466                                <div id="dataEntitiesPlaceholder" /> 
    6567                            </div> 
    66                         <div class="metadataSection" py:if="c.atom.isDeployable()"> 
     68                        <div class="metadataSection" py:if="c.atom.isDeployable() or c.atom.isDE()"> 
    6769                                <div id="deploymentsPlaceholder" /> 
    6870                            </div> 
Note: See TracChangeset for help on using the changeset viewer.