Changeset 416f127 in osmose-frontend


Ignore:
Timestamp:
Mar 8, 2014 10:31:41 PM (6 years ago)
Author:
Frédéric Rodrigo <fred.rodrigo@…>
Children:
6902499
Parents:
706a492
git-author:
Frédéric Rodrigo <fred.rodrigo@…> (28/02/2014 17:49:09)
git-committer:
Frédéric Rodrigo <fred.rodrigo@…> (08/03/2014 22:31:41)
Message:

Add webassets support

Files:
2 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • README

    rebbddc3 r416f127  
    1313  requests >= 2.2 
    1414  beaker >= 1.6 
     15  cssutils >= 1.0 
    1516  python-imaging 
    1617  librsvg2-bin                     # to generate markers with rsvg 
  • map.py

    r93046fc r416f127  
    2222 
    2323from bottle import route, request, template, response, redirect, abort, static_file 
    24 from tools import utils 
    25 from tools import query 
    26 from tools import query_meta 
     24from tools import utils, query, query_meta, assets 
    2725import byuser 
    2826import errors 
     
    180178        active_items=active_items, useDevItem=params["useDevItem"], 
    181179        urls=urls, helps=helps, delay=delay, allowed_languages=allowed_languages, translate=utils.translator(lang), 
    182         website=utils.website, request=request, 
     180        website=utils.website, request=request, assets=assets.environment, 
    183181        user=user, user_error_count=user_error_count) 
    184182 
  • views/map/index.tpl

    r93046fc r416f127  
    66  <meta name="description" content="Contrôle, vérification et correction d'erreurs d'OpenStreetMap"> 
    77  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> 
    8   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='css/style.css')}}"> 
    9   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='/map/leaflet/leaflet.css')}}" /> 
    10   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='/map/leaflet-sidebar/src/L.Control.Sidebar.css')}}"> 
    11   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='/map/leaflet-control-geocoder/Control.Geocoder.css')}}"> 
    12   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='/map/style.css')}}"> 
    13   <link rel="stylesheet" type="text/css" href="{{get_url('static', filename='/map/Osmose.Menu.css')}}"> 
     8%for css in assets['css_map'].urls(): 
     9  <link rel="stylesheet" type="text/css" href="{{get_url('static', filename=css)}}"> 
     10%end 
    1411  <script id="popupTpl" type="text/template" src="{{get_url('static', filename='/tpl/popup.tpl')}}"></script> 
    15   <script type="text/javascript" src="{{get_url('static', filename='/js/jquery-1.7.2.min.js')}}"></script> 
    16   <script type="text/javascript" src="{{get_url('static', filename='/js/mustache.js')}}"></script> 
    17   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet/leaflet-src.js')}}"></script> 
    18   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet-plugins/control/Permalink.js')}}"></script> 
    19   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet-plugins/control/Permalink.Layer.js')}}"></script> 
    20   <script type="text/javascript" src="{{get_url('static', filename='/map/Permalink.Overlay.js')}}"></script> 
    21   <script type="text/javascript" src="{{get_url('static', filename='/map/Permalink.Item.js')}}"></script> 
    22   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet-plugins/layer/tile/Bing.js')}}"></script> 
    23   <script type="text/javascript" src="{{get_url('static', filename='/map/layers.js')}}"></script> 
    24   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet-sidebar/src/L.Control.Sidebar.js')}}"></script> 
    25   <script type="text/javascript" src="{{get_url('static', filename='/map/leaflet-control-geocoder/Control.Geocoder.js')}}"></script> 
    26   <script type="text/javascript" src="{{get_url('static', filename='/map/Leaflet.Spin/spin.js')}}"></script> 
    27   <script type="text/javascript" src="{{get_url('static', filename='/map/Leaflet.Spin/leaflet.spin.js')}}"></script> 
    28   <script type="text/javascript" src="{{get_url('static', filename='/map/Location.js')}}"></script> 
    29   <script type="text/javascript" src="{{get_url('static', filename='/map/Osmose.Menu.js')}}"></script> 
    30   <script type="text/javascript" src="{{get_url('static', filename='/map/Osmose.Heatmap.js')}}"></script> 
    31   <script type="text/javascript" src="{{get_url('static', filename='/map/Osmose.Marker.js')}}"></script> 
    32   <script type="text/javascript" src="{{get_url('static', filename='/map/Osmose.Errors.js')}}"></script> 
    33   <script type="text/javascript" src="{{get_url('static', filename='/map/map.js')}}"></script> 
    34   <script type="text/javascript" src="{{get_url('static', filename='/map/menu.js')}}"></script> 
     12%for js in assets['js_map'].urls(): 
     13  <script type="text/javascript" src="{{get_url('static', filename=js)}}"></script> 
     14%end 
    3515  <script type="text/javascript"> 
    3616    var lat={{lat}}; 
Note: See TracChangeset for help on using the changeset viewer.