Commits

Chris Mutel committed 309001a

Fix conflict with blueprint CSS

Comments (0)

Files changed (3)

 from geo_types import string_to_field
 from models import Geography
 
-LAYERS = {'layers': ['google.physical', 'osm.mapnik', 'osm.osmarender', 
-    'google.streets', 'google.satellite', 'google.hybrid', 've.road', 
-    've.shaded', 've.aerial', 've.hybrid'], 'map_div_style': {'width': '500px'}, 
-    'is_collection': False}
+LAYERS = {'layers': ['osm.mapnik', 'osm.osmarender',
+    # 'google.streets', 'google.satellite', 'google.hybrid', 
+    've.road', 've.shaded', 've.aerial', 've.hybrid'
+    ], 
+    'map_div_style': {'width': '500px'}, 
+    'isCollection': False, 
+    'editable': True,
+    'controls': ['LayerSwitcher', 'SelectFeature',
+    # 'Navigation', 'PanZoom', 'Attribution', 
+    ]
+    }
 
 point_options = LAYERS.copy()
 point_options['geometry'] = 'point'
             widget=HiddenInput())
         for key, value in string_to_field.iteritems():
             if key != shape_type:
-                # Add hidden fields for other geography types
+                # Overwrite hidden fields for other geography types
                 self.fields[value] = forms.CharField(widget=HiddenInput(), 
                     required=False)
 

media/olwidget/css/olwidget.css

     font-weight: bold;
     font-size: smaller;
 }
-.olwidgetEditableLayerSwitcher .container {
+.olwidgetEditableLayerSwitcher .olw-container {
     background-color: darkblue;
 }
 .olwidgetEditableLayerSwitcher .maxmin {

media/olwidget/js/olwidget.js

 
         // Container for corners.
         this.container = document.createElement("div");
-        OpenLayers.Element.addClass(this.container, "container");
+        OpenLayers.Element.addClass(this.container, "olw-container");
         this.div.appendChild(this.container);
         OpenLayers.Rico.Corner.round(this.div, {
             corners: "bl br",