Changeset 1746

Show
Ignore:
Timestamp:
02/17/09 16:01:19 (4 years ago)
Author:
elemoine
Message:

(1) add compressed js files of Open Layers?, Geo Ext? and Ext, (2) add resources (images, css) for these libraries, (3) make the "Map Viewer" panel an actual Geo Ext? map panel

Location:
sandbox/camptocamp/Studio
Files:
538 added
5 modified

Legend:

Unmodified
Added
Removed

  • sandbox/camptocamp/Studio/studio/public/js

    • Property svn:ignore

      •  

        old new  
        1 all.js 
         1 

  • sandbox/camptocamp/Studio/studio/public/js/Studio

    • Property svn:ignore set to
      Studio.js

  • sandbox/camptocamp/Studio/studio/public/js/Studio/Panel.js

    r1724 r1746  
    3838 
    3939    getMapViewerPanel:function() { 
     40        var map = new OpenLayers.Map(); 
     41        var layer = new OpenLayers.Layer.WMS( 
     42            "vmap0", 
     43            "http://labs.metacarta.com/wms/vmap0", 
     44            {layers: 'basic'} 
     45        ); 
     46        map.addLayer(layer); 
     47             
    4048        return { 
     49            xtype: "gx_mappanel", 
    4150            id: this.id + 'map_viewer_panel', 
    4251            title: 'Map Viewer', 
    … …  
    4453            collapsible: true, 
    4554            height: 200, 
    46             html: "<img src='images/ol_screenshot.png' />" 
     55            map: map//, 
     56            //extent: new OpenLayers.Bounds(-165, 45, -90, 45) 
    4757        }; 
    4858    }, 

  • sandbox/camptocamp/Studio/studio/templates/index.html

    r1740 r1746  
    22 
    33<%def name="css()"> 
    4     <link rel="stylesheet" type="text/css" href="http://extjs.com/deploy/dev/resources/css/ext-all.css" /> 
     4    <link rel="stylesheet" type="text/css" href=${h.url_for("/js/Ext/resources/css/ext-all.css")}></link> 
    55    <link rel="stylesheet" type="text/css" href=${h.url_for("/js/ux/colorpicker/color-picker.ux.css")}></link> 
    66</%def> 
    … …  
    99    <script type="text/javascript" src="http://extjs.com/deploy/dev/adapter/ext/ext-base.js"></script> 
    1010    <script type="text/javascript" src="http://extjs.com/deploy/dev/ext-all-debug.js"></script> 
     11 
     12    <script type="text/javascript" src="${h.url_for("/js/OpenLayers/OpenLayers.js")}"></script> 
     13    <script type="text/javascript" src="${h.url_for("/js/Ext/ext.js")}"></script> 
     14    <script type="text/javascript" src="${h.url_for("/js/GeoExt/GeoExt.js")}"></script> 
    1115 
    1216    % if config["debug"]: 
    … …  
    5155    <!-- END_MERGE --> 
    5256    % else: 
    53     <script type="text/javascript" src=${h.url_for("/js/all.js")}></script> 
     57    <script type="text/javascript" src=${h.url_for("/js/Studio/Studio.js")}></script> 
    5458    % endif 
    5559 
    5660    <script type="text/javascript" src=${h.url_for(controller="main", action="layout")}></script> 
    57  
    58     <script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script> 
    5961</%def> 

  • sandbox/camptocamp/Studio/studio/websetup.py

    r1724 r1746  
    1919    input_file = config['js_tmpl'] 
    2020    public_dir = config['pylons.paths']['static_files'] 
    21     output_file = os.path.join(public_dir, 'js', 'all.js') 
     21    output_file = os.path.join(public_dir, 'js', 'Studio', 'Studio.js') 
    2222    _merge_js(input_file, public_dir, output_file) 
    2323    log.info('JavaScript successfully merged and minified in ' + output_file)