Changeset 7348


Ignore:
Timestamp:
20/08/10 10:09:23 (9 years ago)
Author:
spascoe
Message:

Various controller and template upgrades for Pylons-1.0

Location:
cowsclient/branches/migrate-py26-pylons10
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/config/environment.py

    r5265 r7348  
    22import os 
    33 
    4 from pylons import config 
     4from pylons.configuration import PylonsConfig 
     5from genshi.template import TemplateLoader 
    56 
    67import cowsclient.lib.app_globals as app_globals 
     
    1213    object 
    1314    """ 
     15    config = PylonsConfig() 
     16 
    1417    # Pylons paths 
    1518    root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) 
     
    2023 
    2124    # Initialize config with the basic options 
    22     config.init_app(global_conf, app_conf, package='cowsclient', 
    23                     template_engine='genshi', paths=paths) 
     25    config.init_app(global_conf, app_conf, package='cowsclient', paths=paths) 
    2426 
    25     config['routes.map'] = make_map() 
    26     config['pylons.g'] = app_globals.Globals() 
     27    config['routes.map'] = make_map(config) 
     28    config['pylons.app_globals'] = app_globals.Globals(config) 
    2729    config['pylons.h'] = cowsclient.lib.helpers 
    2830 
    29     # Customize templating options via this variable 
    30     tmpl_options = config['buffet.template_options'] 
     31    config['pylons.app_globals'].genshi_loader = TemplateLoader( 
     32        paths['templates'], auto_reload=True) 
    3133 
    3234    # CONFIGURATION OPTIONS HERE (note: all config options will override 
    3335    # any Pylons config options) 
     36 
     37    return config 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/config/middleware.py

    r5265 r7348  
    55from paste.deploy.converters import asbool 
    66 
    7 from pylons import config 
    8 from pylons.error import error_template 
    9 from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler, \ 
    10     StaticJavascripts 
     7from beaker.middleware import SessionMiddleware 
     8from routes.middleware import RoutesMiddleware 
     9 
     10from pylons.middleware import ErrorHandler 
     11 
    1112from pylons.wsgiapp import PylonsApp 
    1213 
     
    3233    """ 
    3334    # Configure the Pylons environment 
    34     load_environment(global_conf, app_conf) 
     35    config = load_environment(global_conf, app_conf) 
    3536 
    3637    # The Pylons WSGI app 
    37     app = PylonsApp() 
     38    app = PylonsApp(config=config) 
     39 
     40    app = RoutesMiddleware(app, config['routes.map']) 
     41    app = SessionMiddleware(app, config) 
    3842 
    3943    # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares) 
     
    4145    if asbool(full_stack): 
    4246        # Handle Python exceptions 
    43         app = ErrorHandler(app, global_conf, error_template=error_template, 
    44                            **config['pylons.errorware']) 
    45  
    46         # Display error documents for 401, 403, 404 status codes (and 
    47         # 500 when debug is disabled) 
    48         app = ErrorDocuments(app, global_conf, mapper=error_mapper, **app_conf) 
     47        app = ErrorHandler(app, global_conf, **config['pylons.errorware']) 
    4948 
    5049    # Establish the Registry for this application 
     
    5251 
    5352    # Static files 
    54     javascripts_app = StaticJavascripts() 
    5553    static_app = StaticURLParser(config['pylons.paths']['static_files']) 
    56     app = Cascade([static_app, javascripts_app, app]) 
     54    app = Cascade([static_app, app]) 
     55    app.config = config 
     56 
    5757    return app 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/config/routing.py

    r6191 r7348  
    88from routes import Mapper 
    99 
    10 def make_map(): 
     10def make_map(config): 
    1111    """Create, configure and return the routes Mapper""" 
    1212    map = Mapper(directory=config['pylons.paths']['controllers'], 
     
    1515    # The ErrorController route (handles 404/500 error pages); it should 
    1616    # likely stay at the top, ensuring it can always be resolved 
    17     map.connect('error/:action/:id', controller='error') 
     17    map.connect('error/{action}/{id}', controller='error') 
    1818 
    1919    # CUSTOM ROUTES HERE 
    20      
    21     map.connect(':controller/:action/:id') 
     20 
     21    map.connect('/{controller}/{action}/{id}') 
     22    map.connect('/{controller}/{action}') 
     23    map.connect('/{controller}', action='index') 
    2224    map.connect('*url', controller='template', action='view') 
    2325 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/layertest.py

    r5626 r7348  
    1515from cowsclient.lib.wmc_util import * 
    1616from cowsclient.model import selectedItem 
    17 from pylons import config, g 
     17from pylons import config 
    1818import copy, logging 
    1919log = logging.getLogger(__name__) 
     
    3030        g.server=config['app_conf']['serverurl'] 
    3131         
    32         return render('layertest') 
     32        return render('layertest.html') 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/oldwmsviz.py

    r5626 r7348  
    1111 
    1212from cowsclient.lib.base import * 
     13from cowsclient.lib.base import app_globals as g 
    1314from paste.request import parse_querystring 
    1415#from ows_server.models import Utilities 
    1516from cowsclient.lib.wmc_util import * 
    1617from cowsclient.model import selectedItem 
    17 from pylons import config, g 
     18from pylons import config 
    1819import copy, logging 
    1920log = logging.getLogger(__name__) 
     
    8788        # avoid page crashing if we come here without view items defined 
    8889#        if 'viewItems' not in session: 
    89 #            h.redirect_to(h.url_for(controller='discovery')) 
     90#            h.redirect(h.url(controller='discovery')) 
    9091#                                         
    9192        session.save()   
     
    9495        # check if page has been visited before; if not display tab 
    9596#        if (Utilities.isTabRequired(c.pageTabs, 'View')): 
    96 #            c.pageTabs.append(('View', h.url_for(controller='viewItems',action='index'))) 
     97#            c.pageTabs.append(('View', h.url(controller='viewItems',action='index'))) 
    9798 
    98         return render('old_wmsviz') 
     99        return render('old_wmsviz.html') 
    99100 
    100101 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/securitylogin.py

    r6191 r7348  
    2424                    c.redirecturl = '%s=%s'%(e.url.split('=')[0],loggedinurl) 
    2525                    #i.e. c.redirecturl="https://ndg3beta.badc.rl.ac.uk/verify?ndg.security.r=http%253A%252F%252Flocalhost:5005%252Floggedin" 
    26                     return render('redirecting') 
     26                    return render('redirecting.html') 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/wcsdown.py

    r6508 r7348  
    1414from owslib.wcs import WebCoverageService 
    1515 
    16 from cowsclient.lib.base import BaseController, g, response, config, request, c, render 
     16from cowsclient.lib.base import BaseController, response, config, request, c, render 
     17from cowsclient.lib.base import app_globals as g 
    1718from cowsclient.lib.wmc_util import proxyFix, resetProxy, parseEndpointString 
    1819from cowsclient.model.date_time_options import DateTimeOptionsBuilder 
     
    122123         
    123124        log.debug("rendering template after %ss" % (time.time() - st,)) 
    124         return render('wcsdown') 
     125        return render('wcsdown.html') 
    125126     
    126127     
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/wmsviz.py

    r6517 r7348  
    2121# cowsclient imports 
    2222from cowsclient.model import selectedItem 
    23 from cowsclient.lib.base import BaseController, g, response, config, request, c, session, render, abort 
     23from cowsclient.lib.base import BaseController, response, config, request, c, session, render, abort 
     24from cowsclient.lib.base import app_globals as g 
    2425from cowsclient.lib.wmc_util import GetWebMapContext, GetWebMapCapabilities, GetLegend, openURL, GetResponse, parseEndpointString 
    2526from cowsclient.lib.build_figure import build_figure 
     
    4041    } 
    4142     
    42     indexTemplate = 'wmsviz' 
     43    indexTemplate = 'wmsviz.html' 
    4344     
    4445    def index(self): 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/controllers/wmsviz2.py

    r6517 r7348  
    1818class Wmsviz2Controller(WmsvizController): 
    1919     
    20     indexTemplate = "wmsviz2" 
     20    indexTemplate = "wmsviz2.html" 
    2121 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/lib/app_globals.py

    r5265 r7348  
    77    """ 
    88 
    9     def __init__(self): 
     9    def __init__(self, config): 
    1010        """One instance of Globals is created during application 
    1111        initialization and is available during requests via the 'g' 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/lib/base.py

    r5821 r7348  
    44utilized by Controllers. 
    55""" 
    6 from pylons import c, cache, config, g, request, response, session 
     6from pylons import cache, config, request, response, session 
     7from pylons import tmpl_context as c 
    78from pylons.controllers import WSGIController 
    8 from pylons.controllers.util import abort, etag_cache, redirect_to 
     9from pylons.controllers.util import abort, etag_cache, redirect 
    910from pylons.decorators import jsonify, validate 
    1011from pylons.i18n import ungettext, N_ 
    11 from pylons.templating import render 
     12from pylons.templating import render_genshi as render 
    1213 
    1314import cowsclient.lib.helpers as h 
    1415import cowsclient.model as model 
     16 
     17# To simplify upgrading to Pylons-1.0 
     18app_globals = config['pylons.app_globals'] 
    1519 
    1620class BaseController(WSGIController): 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/public/index.html

    r5265 r7348  
    8181 
    8282<p> 
    83 The URL you called: ${h.url_for()} 
     83The URL you called: ${h.url.current()} 
    8484</p> 
    8585 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/layertest.html

    r5626 r7348  
    66 
    77 
    8 <script src="$g.server/js/OpenLayers.js" ></script> 
     8<script src="$app_globals.server/js/OpenLayers.js" ></script> 
    99 
    10 <script type="text/javascript" src="$g.server/js/yui/utilities/utilities.js" ></script> 
    11 <script type="text/javascript" src="$g.server/js/yui/dragdrop/dragdrop.js" ></script> 
     10<script type="text/javascript" src="$app_globals.server/js/yui/utilities/utilities.js" ></script> 
     11<script type="text/javascript" src="$app_globals.server/js/yui/dragdrop/dragdrop.js" ></script> 
    1212 
    13 <script src="$g.server/js/dragAndDrop.js"></script> 
     13<script src="$app_globals.server/js/dragAndDrop.js"></script> 
    1414 
    15 <script src="$g.server/js/layerList.js"></script> 
     15<script src="$app_globals.server/js/layerList.js"></script> 
    1616 
    1717 
    18 <link type="text/css" rel="stylesheet" href="$g.server/layout/drag_drop_style.css"/> 
     18<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/drag_drop_style.css"/> 
    1919 
    2020<script type="text/javascript"> 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/old_wmsviz.html

    r5626 r7348  
    44<xi:include href="utils.html" /> 
    55<head> 
    6 <link type="text/css" rel="stylesheet" href="$g.server/layout/ddc_style.css"/> 
    7 <link type="text/css" rel="stylesheet" href="$g.server/layout/ddc_vis.css"/> 
    8 <link type="text/css" rel="stylesheet" href="$g.server/layout/ndg2.css"/> 
     6<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ddc_style.css"/> 
     7<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ddc_vis.css"/> 
     8<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ndg2.css"/> 
    99<!-- <script type='text/javascript'  
    1010        src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> --> 
     
    1313<!-- BEGIN: Yahoo Interface Library --> 
    1414<link type="text/css" rel="stylesheet" 
    15         href="$g.server/js/yui/treeview/assets/skins/sam/treeview.css"/>  
     15        href="$app_globals.server/js/yui/treeview/assets/skins/sam/treeview.css"/>  
    1616          
    1717<!-- Dependency source files -->   
    18 <script src = "$g.server/js/yui/yahoo/yahoo-min.js" ></script>  
    19 <script src = "$g.server/js/yui/event/event-min.js" ></script>  
     18<script src = "$app_globals.server/js/yui/yahoo/yahoo-min.js" ></script>  
     19<script src = "$app_globals.server/js/yui/event/event-min.js" ></script>  
    2020   
    2121<!-- TreeView source file -->   
    22 <script src = "$g.server/js/yui/treeview/treeview-min.js" ></script>  
     22<script src = "$app_globals.server/js/yui/treeview/treeview-min.js" ></script>  
    2323 
    2424<!-- TreeView Menu Style --> 
    25 <link rel="stylesheet" type="text/css" href="$g.server/js/yui/treeview/assets/treeview-menu.css"/>  
    26  
    27 <link rel="stylesheet" type="text/css" href="$g.server/js/yui/fonts/fonts-min.css?_yuiversion=2.5.0" /> 
    28 <script type="text/javascript" src="$g.server/js/yui/utilities/utilities.js?_yuiversion=2.5.0"></script> 
    29  
    30 <script type="text/javascript" src="$g.server/js/yui/yahoo-dom-event/yahoo-dom-event.js" ></script>  
    31 <script type="text/javascript" src="$g.server/js/yui/dragdrop/dragdrop-min.js" ></script> 
    32 <script type="text/javascript" src="$g.server/js/toggleDiv.js" ></script> 
    33 <link type="text/css" rel="stylesheet" href="$g.server/layout/drag_drop_style.css"/> 
    34 <script src = "$g.server/js/dragAndDrop.js" ></script>  
     25<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui/treeview/assets/treeview-menu.css"/>  
     26 
     27<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui/fonts/fonts-min.css?_yuiversion=2.5.0" /> 
     28<script type="text/javascript" src="$app_globals.server/js/yui/utilities/utilities.js?_yuiversion=2.5.0"></script> 
     29 
     30<script type="text/javascript" src="$app_globals.server/js/yui/yahoo-dom-event/yahoo-dom-event.js" ></script>  
     31<script type="text/javascript" src="$app_globals.server/js/yui/dragdrop/dragdrop-min.js" ></script> 
     32<script type="text/javascript" src="$app_globals.server/js/toggleDiv.js" ></script> 
     33<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/drag_drop_style.css"/> 
     34<script src = "$app_globals.server/js/dragAndDrop.js" ></script>  
    3535 
    3636<!-- END: Yahoo Interface Library --> 
    3737 
    3838<!-- BEGIN: WMSC library --> 
    39 <link type="text/css" rel="stylesheet" href="$g.server/layout/control.css"/> 
    40  
    41 <script src="$g.server/js/wmsc.js"></script> 
    42 <script src="$g.server/js/prototype.js"></script> 
     39<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/control.css"/> 
     40 
     41<script src="$app_globals.server/js/wmsc.js"></script> 
     42<script src="$app_globals.server/js/prototype.js"></script> 
    4343<!--script src="http://www.openlayers.org/api/2.4/OpenLayers.js"></script--> 
    44 <script src="$g.server/js/OpenLayers.js" /> 
    45 <script src="$g.server/js/openlayers-x.js"/> 
    46 <script src="$g.server/js/dimensionControl.js"/> 
    47 <script src="$g.server/js/mapControl.js"/> 
    48 <script src="$g.server/js/layerControl.js"></script> 
    49 <script src="$g.server/js/capabilities.js"></script> 
    50 <script src="$g.server/js/wcs.js"></script> 
     44<script src="$app_globals.server/js/OpenLayers.js" /> 
     45<script src="$app_globals.server/js/openlayers-x.js"/> 
     46<script src="$app_globals.server/js/dimensionControl.js"/> 
     47<script src="$app_globals.server/js/mapControl.js"/> 
     48<script src="$app_globals.server/js/layerControl.js"></script> 
     49<script src="$app_globals.server/js/capabilities.js"></script> 
     50<script src="$app_globals.server/js/wcs.js"></script> 
    5151<!-- END: WMSC library --> 
    5252 
     
    8787       <span> 
    8888          <a href="javascript:;" title="Toggle help" onclick="toggleDiv(1,'$value','shown','hidden','$elementType'); return false;"> 
    89           <img src="$g.helpIcon" alt="Toggle help" class="helpicon"/></a> 
     89          <img src="$app_globals.helpIcon" alt="Toggle help" class="helpicon"/></a> 
    9090       </span> 
    9191</span> 
     
    172172                        Select a dataset to expand it and make its map layers visible; these can then be selected to add to the 'Layer' 
    173173                        panel for visualisation.<br/>   
    174                         Remove datasets from the display by clicking their <img src="$g.server/js/img/close.gif" /> icon. 
     174                        Remove datasets from the display by clicking their <img src="$app_globals.server/js/img/close.gif" /> icon. 
    175175        </div> 
    176176    </div> 
     
    182182                to the top.<br/> 
    183183                NB, if the topmost layer has legend data available then this will be displayed under the completed map.<br/> 
    184                 Remove layers from the displayed map by clicking their <img src="$g.server/js/img/close.gif" /> icon. 
     184                Remove layers from the displayed map by clicking their <img src="$app_globals.server/js/img/close.gif" /> icon. 
    185185        </div> 
    186186    </div> 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/utils.html

    r5270 r7348  
    1515 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" 
    1616        py:strip=""> 
    17         <script src="$g.server/js/toggleDiv.js"></script> 
     17        <script src="$app_globals.server/js/toggleDiv.js"></script> 
    1818    <span py:def="Text(elem)" py:strip=""> 
    1919        <!--! Note that we have to expect the possibility of xhtml in these elements and we won't 
     
    4646        <span> 
    4747            <a href="javascript:;" title="Toggle help" onclick="toggleDiv(1,'$value','shown','hidden','div'); return false;"> 
    48             <img src="$g.helpIcon" alt="Toggle help" class="helpicon"/></a> 
     48            <img src="$app_globals.helpIcon" alt="Toggle help" class="helpicon"/></a> 
    4949        </span> 
    5050    </span> 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/wcsdown.html

    r6452 r7348  
    3939<!-- YUI imports for autocomplete --> 
    4040 
    41 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/fonts/fonts.css" /> 
    42 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
    43 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/autocomplete/assets/skins/sam/autocomplete.css" /> 
    44  
    45 <!-- <script type="text/javascript" src="$g.server/js/yui_2.7.0b/yahoo-dom-event/yahoo-dom-event.js"></script> --> 
    46 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/yahoo/yahoo.js"></script> 
    47 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/event/event.js"></script> 
    48 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dom/dom.js"></script> 
    49 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/animation/animation.js"></script> 
    50 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/element/element.js"></script> 
    51 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/button/button.js"></script> 
    52 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/datasource/datasource.js"></script> 
    53 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/autocomplete/autocomplete.js"></script> 
    54 <script type="text/javascript" src="$g.server/js/yui_2.7.0b/event/event.js"></script> 
    55  
    56 <!--script type="text/javascript" src="$g.server/js/yui/build/datasource/datasource.js"></script--> 
     41<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/fonts/fonts.css" /> 
     42<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
     43<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/autocomplete/assets/skins/sam/autocomplete.css" /> 
     44 
     45<!-- <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/yahoo-dom-event/yahoo-dom-event.js"></script> --> 
     46<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/yahoo/yahoo.js"></script> 
     47<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/event/event.js"></script> 
     48<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dom/dom.js"></script> 
     49<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/animation/animation.js"></script> 
     50<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/element/element.js"></script> 
     51<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/button/button.js"></script> 
     52<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/datasource/datasource.js"></script> 
     53<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/autocomplete/autocomplete.js"></script> 
     54<script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/event/event.js"></script> 
     55 
     56<!--script type="text/javascript" src="$app_globals.server/js/yui/build/datasource/datasource.js"></script--> 
    5757<!-- End of autocomplete imports --> 
    5858 
    5959<script type="text/javascript" src="${h.getOpenLayersImportPath()}"></script> 
    60 <script type="text/javascript" src="$g.server/js/openlayers-x.js"></script> 
    61  
    62 <link rel="stylesheet" type="text/css" href="$g.server/layout/wcdown.css" /> 
    63 <link rel="stylesheet" type="text/css" href="$g.server/layout/yui_autocomplete.css" /> 
    64  
    65  
    66 <script src="$g.server/js/wmsc.js"></script> 
    67 <script src="$g.server/js/boundingBoxMapSelect.js"></script> 
    68 <script src="$g.server/js/boundsControl.js"></script> 
    69 <script src="$g.server/js/json2.js"></script> 
    70 <script src="$g.server/js/splitSelect.js"></script> 
    71 <script src="$g.server/js/utils.js"></script> 
    72 <script src="$g.server/js/endpoint.js"></script> 
     60<script type="text/javascript" src="$app_globals.server/js/openlayers-x.js"></script> 
     61 
     62<link rel="stylesheet" type="text/css" href="$app_globals.server/layout/wcdown.css" /> 
     63<link rel="stylesheet" type="text/css" href="$app_globals.server/layout/yui_autocomplete.css" /> 
     64 
     65 
     66<script src="$app_globals.server/js/wmsc.js"></script> 
     67<script src="$app_globals.server/js/boundingBoxMapSelect.js"></script> 
     68<script src="$app_globals.server/js/boundsControl.js"></script> 
     69<script src="$app_globals.server/js/json2.js"></script> 
     70<script src="$app_globals.server/js/splitSelect.js"></script> 
     71<script src="$app_globals.server/js/utils.js"></script> 
     72<script src="$app_globals.server/js/endpoint.js"></script> 
    7373 
    7474<script type="text/javascript"> 
    7575 
    76 var downloadAction ="$g.server/wcsdown/download"; 
    77 var refreshAction = "$g.server/wcsdown"; 
     76var downloadAction ="$app_globals.server/wcsdown/download"; 
     77var refreshAction = "$app_globals.server/wcsdown"; 
    7878 
    7979var timedata = ${h.jsonParseIfNotEmpty(c.timedata)}; 
     
    8383 
    8484 
    85     var bgImagePath = '$g.server/layout/images/clear.gif'; 
     85    var bgImagePath = '$app_globals.server/layout/images/clear.gif'; 
    8686     
    8787    var baseLayerData = ${h.jsonParseIfNotEmpty(c.baseLayerJSON)}; 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/wmsviz.html

    r6119 r7348  
    1818<head> 
    1919 
    20 <link type="text/css" rel="stylesheet" href="$g.server/layout/ndg2.css"/> 
    21 <link type="text/css" rel="stylesheet" href="$g.server/layout/ddc_style.css"/> 
    22 <link type="text/css" rel="stylesheet" href="$g.server/layout/ddc_vis.css"/> 
    23 <link type="text/css" rel="stylesheet" href="$g.server/layout/wmsviz.css"/> 
    24 <link type="text/css" rel="stylesheet" href="$g.server/layout/open_layers_map.css"/> 
     20<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ndg2.css"/> 
     21<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ddc_style.css"/> 
     22<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ddc_vis.css"/> 
     23<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/wmsviz.css"/> 
     24<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/open_layers_map.css"/> 
    2525 
    2626<!--  script type='text/javascript'  
     
    3131 
    3232<!-- css files --> 
    33 <link type="text/css" rel="stylesheet" href="$g.server/js/yui_2.7.0b/treeview/assets/skins/sam/treeview.css"/>  
    34 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_old_treeview_style/treeview-menu.css"/>  
    35 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/fonts/fonts.css" /> 
    36  
    37 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
     33<link type="text/css" rel="stylesheet" href="$app_globals.server/js/yui_2.7.0b/treeview/assets/skins/sam/treeview.css"/>  
     34<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_old_treeview_style/treeview-menu.css"/>  
     35<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/fonts/fonts.css" /> 
     36 
     37<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
    3838 
    3939<!-- Dependency source files -->   
     
    4242  <py:when test="False"> 
    4343   
    44     <script type="text/javascript" src ="$g.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
    45     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/event/event.js"></script> 
    46     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dom/dom.js" ></script> 
     44    <script type="text/javascript" src ="$app_globals.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
     45    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/event/event.js"></script> 
     46    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dom/dom.js" ></script> 
    4747     
    4848    <!-- YUI treevieew  -->   
    49     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
     49    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
    5050     
    5151    <!-- YUI drag and drop  --> 
    52     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
    53     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop.js" ></script> 
     52    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
     53    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop.js" ></script> 
    5454   
    5555  </py:when> 
     
    5757 
    5858    <!-- minified js code --> 
    59     <script type="text/javascript" src ="$g.server/js/yui_2.7.0b/yuiloader-dom-event/yuiloader-dom-event.js" ></script>  
     59    <script type="text/javascript" src ="$app_globals.server/js/yui_2.7.0b/yuiloader-dom-event/yuiloader-dom-event.js" ></script>  
    6060     
    6161    <!-- YUI treevieew  -->   
    62     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/treeview/treeview-min.js" ></script>  
     62    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/treeview/treeview-min.js" ></script>  
    6363     
    6464    <!-- YUI drag and drop  --> 
    65     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
    66     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js" ></script> 
     65    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
     66    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js" ></script> 
    6767   
    6868  </py:otherwise> 
     
    7070 
    7171<!--  customisation of the drag and drop control --> 
    72 <script type="text/javascript" src = "$g.server/js/dragAndDrop.js" ></script> 
     72<script type="text/javascript" src = "$app_globals.server/js/dragAndDrop.js" ></script> 
    7373 
    7474<!-- END: Yahoo Interface Library --> 
    7575 
    76 <link type="text/css" rel="stylesheet" href="$g.server/layout/drag_drop_style.css"/> 
    77 <link type="text/css" rel="stylesheet" href="$g.server/layout/control.css"/> 
    78 <link rel="stylesheet" type="text/css" href="$g.server/layout/layer_properties.css" /> 
    79  
    80 <script type="text/javascript" src="$g.server/js/json2.js"></script> 
     76<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/drag_drop_style.css"/> 
     77<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/control.css"/> 
     78<link rel="stylesheet" type="text/css" href="$app_globals.server/layout/layer_properties.css" /> 
     79 
     80<script type="text/javascript" src="$app_globals.server/js/json2.js"></script> 
    8181<script type="text/javascript" src="${h.getOpenLayersImportPath()}"></script> 
    82 <script type="text/javascript" src="$g.server/js/openlayers-x.js"></script> 
    83 <script type="text/javascript" src="$g.server/js/LoadingPanel.js"></script> 
    84 <script type="text/javascript" src="$g.server/js/prototype.js"></script> 
    85  
    86 <script type="text/javascript" src="$g.server/js/toggleDiv.js"></script> 
     82<script type="text/javascript" src="$app_globals.server/js/openlayers-x.js"></script> 
     83<script type="text/javascript" src="$app_globals.server/js/LoadingPanel.js"></script> 
     84<script type="text/javascript" src="$app_globals.server/js/prototype.js"></script> 
     85 
     86<script type="text/javascript" src="$app_globals.server/js/toggleDiv.js"></script> 
    8787 
    8888<!-- BEGIN: WMSC library --> 
     
    9595 <py:when test="False"> 
    9696  <py:for each="file in javascript_files"> 
    97     <script type="text/javascript" src="$g.server/js/${file}"></script> 
     97    <script type="text/javascript" src="$app_globals.server/js/${file}"></script> 
    9898  </py:for> 
    9999 </py:when> 
    100100  
    101101 <py:otherwise> 
    102    <script type="text/javascript" src="$g.server/js/compressed_client.js"></script> 
     102   <script type="text/javascript" src="$app_globals.server/js/compressed_client.js"></script> 
    103103 </py:otherwise> 
    104104   
     
    135135        var initialBounds = new OpenLayers.Bounds(-180,-90,180,90); 
    136136 
    137     var makeFigureURL = "$g.server/wmsviz/get_figure"; 
    138     var bgImagePath = '$g.server/layout/images/clear.gif'; 
     137    var makeFigureURL = "$app_globals.server/wmsviz/get_figure"; 
     138    var bgImagePath = '$app_globals.server/layout/images/clear.gif'; 
    139139     
    140140    var allEvents = []; 
     
    211211      <span> 
    212212         <a href="javascript:;" title="Toggle help" onclick="toggleDiv(1,'$value','shown','hidden','$elementType'); return false;"> 
    213          <img src="$g.helpIcon" alt="Toggle help" class="helpicon"/></a> 
     213         <img src="$app_globals.helpIcon" alt="Toggle help" class="helpicon"/></a> 
    214214      </span> 
    215215</span>     
     
    290290                                        Select a dataset to expand it and make its map layers visible; these can then be selected to add to the 'Layer' 
    291291                                        panel for visualisation.<br/>   
    292                                         Remove datasets from the display by clicking their <img src="$g.server/js/img/close.gif" alt="close" /> icon. 
     292                                        Remove datasets from the display by clicking their <img src="$app_globals.server/js/img/close.gif" alt="close" /> icon. 
    293293                                </div> 
    294294                            </div> 
     
    300300                                      to the top.<br/> 
    301301                                      NB, if the topmost layer has legend data available then this will be displayed under the completed map.<br/> 
    302                                       Remove layers from the displayed map by clicking their <img src="$g.server/js/img/close.gif" alt="close" /> icon. 
     302                                      Remove layers from the displayed map by clicking their <img src="$app_globals.server/js/img/close.gif" alt="close" /> icon. 
    303303                                </div> 
    304304                            </div> 
  • cowsclient/branches/migrate-py26-pylons10/cowsclient/templates/wmsviz2.html

    r6119 r7348  
    2525 
    2626<!-- css files --> 
    27 <link type="text/css" rel="stylesheet" href="$g.server/js/yui_2.7.0b/treeview/assets/skins/sam/treeview.css"/>  
    28 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_old_treeview_style/treeview-menu.css"/>  
    29 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/fonts/fonts.css" /> 
    30  
    31 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
    32 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/autocomplete/assets/skins/sam/autocomplete.css" /> 
    33 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/tabview/assets/skins/sam/tabview.css" /> 
    34  
    35 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/reset-fonts-grids/reset-fonts-grids.css" /> 
    36 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/resize/assets/skins/sam/resize.css" /> 
    37 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/layout/assets/skins/sam/layout.css" /> 
    38 <link rel="stylesheet" type="text/css" href="$g.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
    39  
    40 <link type="text/css" rel="stylesheet" href="$g.server/layout/drag_drop_style.css"/> 
    41 <link type="text/css" rel="stylesheet" href="$g.server/layout/ndg2.css"/> 
    42 <link type="text/css" rel="stylesheet" href="$g.server/layout/ddc_style.css"/> 
    43 <link type="text/css" rel="stylesheet" href="$g.server/layout/wmsviz2.css"/> 
    44 <link rel="stylesheet" type="text/css" href="$g.server/layout/bottom_controls.css" /> 
    45 <link rel="stylesheet" type="text/css" href="$g.server/layout/yui_autocomplete.css" /> 
     27<link type="text/css" rel="stylesheet" href="$app_globals.server/js/yui_2.7.0b/treeview/assets/skins/sam/treeview.css"/>  
     28<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_old_treeview_style/treeview-menu.css"/>  
     29<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/fonts/fonts.css" /> 
     30 
     31<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
     32<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/autocomplete/assets/skins/sam/autocomplete.css" /> 
     33<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/tabview/assets/skins/sam/tabview.css" /> 
     34 
     35<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/reset-fonts-grids/reset-fonts-grids.css" /> 
     36<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/resize/assets/skins/sam/resize.css" /> 
     37<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/layout/assets/skins/sam/layout.css" /> 
     38<link rel="stylesheet" type="text/css" href="$app_globals.server/js/yui_2.7.0b/button/assets/skins/sam/button.css" /> 
     39 
     40<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/drag_drop_style.css"/> 
     41<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ndg2.css"/> 
     42<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/ddc_style.css"/> 
     43<link type="text/css" rel="stylesheet" href="$app_globals.server/layout/wmsviz2.css"/> 
     44<link rel="stylesheet" type="text/css" href="$app_globals.server/layout/bottom_controls.css" /> 
     45<link rel="stylesheet" type="text/css" href="$app_globals.server/layout/yui_autocomplete.css" /> 
    4646 
    4747<!-- Dependency source files -->   
     
    5050  <py:when test="False"> 
    5151   
    52     <script type="text/javascript" src ="$g.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
    53     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/event/event.js"></script> 
    54     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dom/dom.js" ></script> 
     52    <script type="text/javascript" src ="$app_globals.server/js/yui_2.7.0b/yahoo/yahoo.js" ></script>  
     53    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/event/event.js"></script> 
     54    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dom/dom.js" ></script> 
    5555     
    5656    <!-- YUI treevieew  -->   
    57     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
     57    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/treeview/treeview.js" ></script>  
    5858     
    5959    <!-- YUI drag and drop  --> 
    60     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
    61     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop.js" ></script> 
     60    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
     61    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop.js" ></script> 
    6262     
    6363    <!-- YUI autocomplete  
    64     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/animation/animation.js"></script> 
    65     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/element/element.js"></script> 
    66     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/button/button.js"></script> 
    67     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/datasource/datasource.js"></script> 
    68     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/autocomplete/autocomplete.js"></script> 
     64    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/animation/animation.js"></script> 
     65    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/element/element.js"></script> 
     66    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/button/button.js"></script> 
     67    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/datasource/datasource.js"></script> 
     68    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/autocomplete/autocomplete.js"></script> 
    6969    --> 
    7070     
    7171    <!-- YUI tabs  --> 
    72     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/tabview/tabview.js"></script> 
     72    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/tabview/tabview.js"></script> 
    7373     
    7474    <!-- YUI page layout --> 
    75     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop.js"></script> 
    76     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/resize/resize.js"></script> 
    77     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/animation/animation.js"></script> 
    78     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/layout/layout.js"></script> 
     75    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop.js"></script> 
     76    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/resize/resize.js"></script> 
     77    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/animation/animation.js"></script> 
     78    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/layout/layout.js"></script> 
    7979     
    8080   
     
    8383 
    8484    <!-- minified js code --> 
    85     <script type="text/javascript" src ="$g.server/js/yui_2.7.0b/yuiloader-dom-event/yuiloader-dom-event.js" ></script>  
     85    <script type="text/javascript" src ="$app_globals.server/js/yui_2.7.0b/yuiloader-dom-event/yuiloader-dom-event.js" ></script>  
    8686     
    8787    <!-- YUI treevieew  -->   
    88     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/treeview/treeview-min.js" ></script>  
     88    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/treeview/treeview-min.js" ></script>  
    8989     
    9090    <!-- YUI drag and drop  --> 
    91     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
    92     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js" ></script> 
     91    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/utilities/utilities.js" ></script> 
     92    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js" ></script> 
    9393     
    9494    <!-- YUI autocomplete 
    95     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/animation/animation-min.js"></script> 
    96     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/element/element-min.js"></script> 
    97     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/button/button-min.js"></script> 
    98     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/datasource/datasource-min.js"></script> 
    99     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/autocomplete/autocomplete-min.js"></script>   
     95    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/animation/animation-min.js"></script> 
     96    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/element/element-min.js"></script> 
     97    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/button/button-min.js"></script> 
     98    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/datasource/datasource-min.js"></script> 
     99    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/autocomplete/autocomplete-min.js"></script>   
    100100 --> 
    101101    <!-- YUI tabs  --> 
    102     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/tabview/tabview-min.js"></script> 
     102    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/tabview/tabview-min.js"></script> 
    103103     
    104104    <!-- YUI page layout --> 
    105     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js"></script> 
    106     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/resize/resize-min.js"></script> 
    107     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/animation/animation-min.js"></script> 
    108     <script type="text/javascript" src="$g.server/js/yui_2.7.0b/layout/layout-min.js"></script> 
     105    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/dragdrop/dragdrop-min.js"></script> 
     106    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/resize/resize-min.js"></script> 
     107    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/animation/animation-min.js"></script> 
     108    <script type="text/javascript" src="$app_globals.server/js/yui_2.7.0b/layout/layout-min.js"></script> 
    109109           
    110110  </py:otherwise> 
     
    114114<!-- END: Yahoo Interface Library --> 
    115115 
    116 <script type="text/javascript" src = "$g.server/js/dragAndDrop.js" ></script>  
    117  
    118  
    119  
    120 <script type="text/javascript" src="$g.server/js/json2.js"></script> 
     116<script type="text/javascript" src = "$app_globals.server/js/dragAndDrop.js" ></script>  
     117 
     118 
     119 
     120<script type="text/javascript" src="$app_globals.server/js/json2.js"></script> 
    121121<script type="text/javascript" src="${h.getOpenLayersImportPath()}"></script> 
    122 <script type="text/javascript" src="$g.server/js/prototype.js"></script> 
    123  
    124 <script type="text/javascript" src="$g.server/js/toggleDiv.js"></script> 
    125 <script type="text/javascript" src="$g.server/js/LoadingPanel.js"></script> 
    126 <script type="text/javascript" src="$g.server/js/openlayers-x.js"></script> 
     122<script type="text/javascript" src="$app_globals.server/js/prototype.js"></script> 
     123 
     124<script type="text/javascript" src="$app_globals.server/js/toggleDiv.js"></script> 
     125<script type="text/javascript" src="$app_globals.server/js/LoadingPanel.js"></script> 
     126<script type="text/javascript" src="$app_globals.server/js/openlayers-x.js"></script> 
    127127 
    128128<!-- BEGIN: WMSC library --> 
     
    161161 <py:when test="False"> 
    162162  <py:for each="file in javascript_files"> 
    163     <script type="text/javascript" src="$g.server/js/${file}"></script> 
     163    <script type="text/javascript" src="$app_globals.server/js/${file}"></script> 
    164164  </py:for> 
    165165 </py:when> 
    166166  
    167167 <py:otherwise> 
    168    <script type="text/javascript" src="$g.server/js/compressed_client.js"></script> 
     168   <script type="text/javascript" src="$app_globals.server/js/compressed_client.js"></script> 
    169169 </py:otherwise> 
    170170   
     
    200200     
    201201    var initialSetupJSON = "${c.initialSetupJSON}"; 
    202     var makeFigureULR = "$g.server/wmsviz/get_figure"; 
    203     var bgImagePath = '$g.server/layout/images/clear.gif'; 
     202    var makeFigureULR = "$app_globals.server/wmsviz/get_figure"; 
     203    var bgImagePath = '$app_globals.server/layout/images/clear.gif'; 
    204204     
    205205    var wmcRetriever = new WMCRetriever(); 
     
    284284      <span> 
    285285         <a href="javascript:;" title="Toggle help" onclick="toggleDiv(1,'$value','shown','hidden','$elementType'); return false;"> 
    286          <img src="$g.helpIcon" alt="Toggle help" class="helpicon"/></a> 
     286         <img src="$app_globals.helpIcon" alt="Toggle help" class="helpicon"/></a> 
    287287      </span> 
    288288</span>     
     
    418418                      to the top.<br/> 
    419419                      NB, if the topmost layer has legend data available then this will be displayed under the completed map.<br/> 
    420                       Remove layers from the displayed map by clicking their <img src="$g.server/js/img/close.gif" alt="close" /> icon. 
     420                      Remove layers from the displayed map by clicking their <img src="$app_globals.server/js/img/close.gif" alt="close" /> icon. 
    421421                </div> 
    422422            </div>                     
  • cowsclient/branches/migrate-py26-pylons10/development.ini

    r6518 r7348  
    1313[server:main] 
    1414use = egg:Paste#http 
    15 host = localhost 
     15host = 0.0.0.0 
    1616port = 5005 
    1717 
     
    3939 
    4040# Add a list of pre-defined endpoints to the UI 
    41 #endpointConfig       = %(here)s/endpoints.ini 
     41endpointConfig       = %(here)s/endpoints.ini 
    4242 
    4343# Add a list of further info links for the endpoints 
     
    7171 
    7272[logger_root] 
    73 level = INFO 
     73level = DEBUG 
    7474handlers = console 
    7575 
  • cowsclient/branches/migrate-py26-pylons10/endpoints.ini

    r6013 r7348  
    11[wmsviz] 
    2 keys=cows,coast,metacarta,ndg3betaWMS 
     2#keys=cows,coast,metacarta,ndg3betaWMS 
     3keys=test 
    34 
    45[wcsdown] 
    5 keys=cows,ndg3betaWCS,ccip,motherload 
     6#keys=cows,ndg3betaWCS,ccip,motherload 
     7keys=test 
     8 
     9[Endpoint:test] 
     10service=COWS 
     11url=http://localhost:5000 
    612 
    713[Endpoint:cows] 
  • cowsclient/branches/migrate-py26-pylons10/setup.py

    r6533 r7348  
    1313    #author_email='', 
    1414    #url='', 
    15     install_requires=["Pylons==0.9.6.1", "genshi"], 
     15    install_requires=["Pylons==1.0", "genshi"], 
    1616    packages=find_packages(exclude=['ez_setup']), 
    1717    include_package_data=True, 
Note: See TracChangeset for help on using the changeset viewer.