Changeset 5743


Ignore:
Timestamp:
21/09/09 09:58:20 (10 years ago)
Author:
pnorton
Message:

Made some minor changes to make the html generated more valid. Still not validating as html 4.0 strict tho.

Location:
cowsclient/trunk/cowsclient
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • cowsclient/trunk/cowsclient/public/js

    • Property svn:ignore
      •  

        old new  
        1 OpenLayers 
         1openlayers 
  • cowsclient/trunk/cowsclient/public/js/figureBuilder.js

    r5719 r5743  
    6868                        this._hiddenControlsDiv.appendChild(this._buildInputElement('HEIGHT', '900')); 
    6969                         
     70                         
     71                        // for now hiding the invalid target attribute on the form 
     72                        // could possibly replace this with some javascript 
     73                        this._form.setAttribute("target", "_blank"); 
     74 
    7075                        this._form.submit(); 
    7176                } 
  • cowsclient/trunk/cowsclient/public/js/layerList.js

    r5720 r5743  
    4545    initialize: function (dragListId) { 
    4646                this._dragList = document.getElementById(dragListId); 
     47                 
     48                // remove any initial children 
     49                while (this._dragList.childNodes[0]) { 
     50                    this._dragList.removeChild(this._dragList.childNodes[0]); 
     51                } 
     52                 
    4753            this._layers = []; 
    4854            this.events = new OpenLayers.Events(this, this._dragList, this.EVENTS_RAISED); 
  • cowsclient/trunk/cowsclient/templates/wmsviz.html

    r5724 r5743  
    44      xmlns="http://www.w3.org/1999/xhtml" 
    55      xmlns:xi="http://www.w3.org/2001/XInclude">     
    6 <xi:include href="utils.html" /> 
     6<!-- xi:include href="utils.html" / --> 
    77 
    88<?python 
     
    2323<link type="text/css" rel="stylesheet" href="$g.server/layout/open_layers_map.css"/> 
    2424 
    25 <script type='text/javascript'  
    26         src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>  
     25<!--  script type='text/javascript'  
     26        src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script -->  
    2727 
    2828 
     
    3232      
    3333<!-- Dependency source files -->   
    34 <script src = "$g.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
     34<script type="text/javascript" src ="$g.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
    3535<script type="text/javascript" src="$g.server/js/yui_2.7.0b/event/event.js"></script> 
    3636   
    3737<!-- TreeView source file -->   
    38 <script src="$g.server/js/yui_2.7.0b/dom/dom.js" ></script> 
     38<script type="text/javascript" src="$g.server/js/yui_2.7.0b/dom/dom.js" ></script> 
    3939 
    4040<!-- TreeView Menu Style --> 
     
    4949 
    5050<link type="text/css" rel="stylesheet" href="$g.server/layout/drag_drop_style.css"/> 
    51 <script src = "$g.server/js/dragAndDrop.js" ></script>  
     51<script type="text/javascript" src = "$g.server/js/dragAndDrop.js" ></script>  
    5252 
    5353 
     
    6666<!-- End of autocomplete imports --> 
    6767 
    68 <script src="$g.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
     68<script type="text/javascript" src="$g.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
    6969 
    7070<!-- END: Yahoo Interface Library --> 
     
    7474 
    7575 
    76 <script src="$g.server/js/wmsc.js"></script> 
    77 <script src="$g.server/js/prototype.js"></script> 
    78 <script src="$g.server/js/OpenLayers.js" /> 
    79 <script src="$g.server/js/LoadingPanel.js"></script> 
    80  
    81 <script src="$g.server/js/utils.js"></script> 
    82  
    83 <script src="$g.server/js/openlayers-x.js"/> 
     76<script type="text/javascript" src="$g.server/js/toggleDiv.js"></script> 
     77<script type="text/javascript" src="$g.server/js/wmsc.js"></script> 
     78<script type="text/javascript" src="$g.server/js/prototype.js"></script> 
     79<script type="text/javascript" src="$g.server/js/OpenLayers.js" /> 
     80<script type="text/javascript" src="$g.server/js/LoadingPanel.js"></script> 
     81 
     82<script type="text/javascript" src="$g.server/js/utils.js"></script> 
     83 
     84<script type="text/javascript" src="$g.server/js/openlayers-x.js"/> 
    8485<!-- script src="$g.server/js/dimensionControl.js"/ --> 
    85 <script src="$g.server/js/mapControl.js"/> 
    86 <script src="$g.server/js/layerControl.js"></script>  
    87 <script src="$g.server/js/capabilities.js"></script> 
    88 <script src="$g.server/js/wcs.js"></script> 
    89  
    90 <script src="$g.server/js/displayOptionsRetriever.js"></script> 
    91 <script src="$g.server/js/json2.js"></script> 
    92  
    93 <script src="$g.server/js/layerList.js"></script> 
     86<script type="text/javascript" src="$g.server/js/mapControl.js"/> 
     87<script type="text/javascript" src="$g.server/js/layerControl.js"></script>  
     88<script type="text/javascript" src="$g.server/js/capabilities.js"></script> 
     89<script type="text/javascript" src="$g.server/js/wcs.js"></script> 
     90 
     91<script type="text/javascript" src="$g.server/js/displayOptionsRetriever.js"></script> 
     92<script type="text/javascript" src="$g.server/js/json2.js"></script> 
     93 
     94<script type="text/javascript" src="$g.server/js/layerList.js"></script> 
    9495 
    9596<link rel="stylesheet" type="text/css" href="$g.server/layout/bottom_controls.css" /> 
     
    100101<link rel="stylesheet" type="text/css" href="$g.server/layout/yui_autocomplete.css" /> 
    101102 
    102 <script src="$g.server/js/layerInformation.js"></script> 
    103 <script src="$g.server/js/layerDisplayOptions.js"></script> 
    104 <script src="$g.server/js/layerDimensions.js"></script> 
    105 <script src="$g.server/js/layerParameters.js"></script> 
    106  
    107 <script src="$g.server/js/figureBuilder.js"></script> 
    108  
    109 <script src="$g.server/js/legendContainer.js"></script> 
    110 <script src="$g.server/js/boundsControl.js"></script> 
    111 <script src="$g.server/js/wmcRetriever.js"></script> 
    112 <script src="$g.server/js/ajaxRetriever.js"></script> 
    113  
    114 <script src="$g.server/js/layerDefaultSetter.js"></script> 
     103<script type="text/javascript" src="$g.server/js/layerInformation.js"></script> 
     104<script type="text/javascript" src="$g.server/js/layerDisplayOptions.js"></script> 
     105<script type="text/javascript" src="$g.server/js/layerDimensions.js"></script> 
     106<script type="text/javascript" src="$g.server/js/layerParameters.js"></script> 
     107 
     108<script type="text/javascript" src="$g.server/js/figureBuilder.js"></script> 
     109 
     110<script type="text/javascript" src="$g.server/js/legendContainer.js"></script> 
     111<script type="text/javascript" src="$g.server/js/boundsControl.js"></script> 
     112<script type="text/javascript" src="$g.server/js/wmcRetriever.js"></script> 
     113<script type="text/javascript" src="$g.server/js/ajaxRetriever.js"></script> 
     114 
     115<script type="text/javascript" src="$g.server/js/layerDefaultSetter.js"></script> 
    115116 
    116117<!-- END: WMSC library --> 
     
    238239 
    239240<!--<replace py:replace="pagehead()"/> --> 
     241 
     242    <title> Cows client </title> 
     243 
    240244</head> 
    241245 
     
    284288                    <div id="wcsdownloadDiv"></div> 
    285289                    <br/> 
    286                     <form id="figureForm" action="$g.server/wmsviz/get_figure" method="get" target="_blank"> 
     290                <b>Generate Figure</b>  
     291            <br /> 
     292                    <form id="figureForm" action="$g.server/wmsviz/get_figure" method="get"> 
    287293                      <!--  <b>Plot type</b><br/> 
    288294                      <input type="radio" name="figType" value="colour" checked="1"/>Colour<br/> 
    289295                      <input type="radio" name="figType" value="bw"/>B/W Contour<br/> --> 
    290                       <b>Generate Figure</b><br/> 
    291                       <select name="figFormat"> 
    292                         <option value="image/png" name="figFormat" selected="1"> PNG </option> 
    293                         <option value="image/jpeg" name="figFormat"> JPEG </option> 
    294                         <option value="image/gif" name="figFormat"> GIF </option> 
    295                         <option value="application/postscript" name="figFormat"> EPS </option> 
    296                         <option value="image/svg+xml" name="figFormat"> SVG </option> 
    297                       </select> 
    298                       <input type="button" value="Make Figure" id="make_figure_btn"/> 
     296              <div> 
     297                      <select name="figFormat"> 
     298                        <option value="image/png" selected="1"> PNG </option> 
     299                        <option value="image/jpeg"> JPEG </option> 
     300                        <option value="image/gif"> GIF </option> 
     301                        <option value="application/postscript"> EPS </option> 
     302                        <option value="image/svg+xml"> SVG </option> 
     303                      </select> 
     304                      <input type="button" value="Make Figure" id="make_figure_btn"/> 
     305              </div> 
    299306                    </form> 
    300307                     
     
    324331                                        Select a dataset to expand it and make its map layers visible; these can then be selected to add to the 'Layer' 
    325332                                        panel for visualisation.<br/>   
    326                                         Remove datasets from the display by clicking their <img src="$g.server/js/img/close.gif" /> icon. 
     333                                        Remove datasets from the display by clicking their <img src="$g.server/js/img/close.gif" alt="close" /> icon. 
    327334                                </div> 
    328335                            </div> 
     
    334341                                      to the top.<br/> 
    335342                                      NB, if the topmost layer has legend data available then this will be displayed under the completed map.<br/> 
    336                                       Remove layers from the displayed map by clicking their <img src="$g.server/js/img/close.gif" /> icon. 
     343                                      Remove layers from the displayed map by clicking their <img src="$g.server/js/img/close.gif" alt="close" /> icon. 
    337344                                </div> 
    338345                            </div> 
     
    345352                    Add new WMS:  
    346353                    <span py:replace="helpIcon('endpoint_help', 'div')"> </span>  
    347                     <!-- <input type="text" id="new_endpoint" > </input>  -->  
    348                      
    349                      
    350354                     
    351355                    <div id="endpoint_autocomplete" style="display:inline;"> 
     
    363367                </div> 
    364368                <div class="controlContent" id="layerTree"> 
    365                                  Please wait while datasets load 
     369                                 No datasets loaded. 
    366370                        </div> 
    367371                        </td> 
     
    371375                                <div class="workarea"> 
    372376                                    <ul class="draglist" id="layer_list"> 
     377                            <li>list empty</li> 
    373378                                    </ul> 
    374379                                </div> 
Note: See TracChangeset for help on using the changeset viewer.