diff options
| -rw-r--r-- | initial_data.json | 1 | ||||
| -rw-r--r-- | main/widgets.py | 8 | ||||
| -rw-r--r-- | settings.py | 3 | ||||
| -rw-r--r-- | static/edit_map.js | 5 | ||||
| -rw-r--r-- | static/main_map.js | 4 | ||||
| -rw-r--r-- | static/styles.css | 21 | ||||
| -rw-r--r-- | templates/main_map.html | 2 |
7 files changed, 30 insertions, 14 deletions
diff --git a/initial_data.json b/initial_data.json index 2dd46b9..1468d0b 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1,2 +1 @@ -libgeos_c.so.1 [{"pk": 13, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 5}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 6}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_category", "name": "Can add Category", "content_type": 10}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_icon", "name": "Can add Icon", "content_type": 11}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_marker", "name": "Can add Point of interest", "content_type": 13}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_news", "name": "Can add News", "content_type": 9}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_property", "name": "Can add Property", "content_type": 15}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_propertymodel", "name": "Can add Property model", "content_type": 14}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_subcategory", "name": "Can add Subcategory", "content_type": 12}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_category", "name": "Can change Category", "content_type": 10}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_icon", "name": "Can change Icon", "content_type": 11}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_marker", "name": "Can change Point of interest", "content_type": 13}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_news", "name": "Can change News", "content_type": 9}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_property", "name": "Can change Property", "content_type": 15}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_propertymodel", "name": "Can change Property model", "content_type": 14}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_subcategory", "name": "Can change Subcategory", "content_type": 12}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_category", "name": "Can delete Category", "content_type": 10}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_icon", "name": "Can delete Icon", "content_type": 11}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_marker", "name": "Can delete Point of interest", "content_type": 13}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_news", "name": "Can delete News", "content_type": 9}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_property", "name": "Can delete Property", "content_type": 15}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_propertymodel", "name": "Can delete Property model", "content_type": 14}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_subcategory", "name": "Can delete Subcategory", "content_type": 12}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 8}}, {"pk": 1, "model": "auth.group", "fields": {"name": "moderator", "permissions": [37, 38, 39]}}, {"pk": 2, "model": "auth.group", "fields": {"name": "administrator", "permissions": [28, 31, 37, 25, 34, 29, 32, 38, 26, 35, 30, 33, 39, 27, 36]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2008-11-24 19:46:47", "groups": [], "user_permissions": [], "password": "sha1$45760$a367dbdcb3de8966a1ff34621cabb12f354c8ac0", "email": "", "date_joined": "2008-11-24 19:43:35"}}, {"pk": 5, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:52:46", "object_repr": "admin", "object_id": "1", "change_message": "Modifi\u00e9 username.", "user": 1, "content_type": 3}}, {"pk": 4, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 19:52:04", "object_repr": "administrator", "object_id": "2", "change_message": "", "user": 1, "content_type": 2}}, {"pk": 3, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 19:50:31", "object_repr": "moderator", "object_id": "1", "change_message": "", "user": 1, "content_type": 2}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:48:40", "object_repr": "administrator", "object_id": "1", "change_message": "Modifi\u00e9 username.", "user": 1, "content_type": 3}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 19:48:14", "object_repr": "etienne", "object_id": "1", "change_message": "Modifi\u00e9 email.", "user": 1, "content_type": 3}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "category", "name": "Category", "app_label": "main"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 11, "model": "contenttypes.contenttype", "fields": {"model": "icon", "name": "Icon", "app_label": "main"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "message", "name": "message", "app_label": "auth"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "news", "name": "News", "app_label": "main"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 13, "model": "contenttypes.contenttype", "fields": {"model": "marker", "name": "Point of interest", "app_label": "main"}}, {"pk": 15, "model": "contenttypes.contenttype", "fields": {"model": "property", "name": "Property", "app_label": "main"}}, {"pk": 14, "model": "contenttypes.contenttype", "fields": {"model": "propertymodel", "name": "Property model", "app_label": "main"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 12, "model": "contenttypes.contenttype", "fields": {"model": "subcategory", "name": "Subcategory", "app_label": "main"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": "c7df39146d51f7affbbd27c995cd431f", "model": "sessions.session", "fields": {"expire_date": "2008-12-08 19:46:47", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwFVCmxhc3RfdmlzaXRxBVUIMDgtMTEt\nMjRxBnUuOTQxNTNiYTcyYjY5OTkxNjlmOWJjNzA1NDZhMzFkYmY=\n"}}, {"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}] diff --git a/main/widgets.py b/main/widgets.py index ba609e0..fea8a72 100644 --- a/main/widgets.py +++ b/main/widgets.py @@ -29,15 +29,15 @@ from chimere import settings from django.contrib.gis.db import models URL_OSM_JS = ["http://www.openlayers.org/api/OpenLayers.js", - "http://openstreetmap.org/openlayers/OpenStreetMap.js"] + "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] def getMapJS(): '''Variable initialization for drawing the map ''' # projection, center and bounds definitions - js = u"epsg_display_projection = new OpenLayers.Projection('EPSG:%d');\n" %\ - settings.EPSG_DISPLAY_PROJECTION - js += u"epsg_projection = new OpenLayers.Projection('EPSG:%d');\n" % \ + js = u"var epsg_display_projection = new OpenLayers.Projection('EPSG:%d')\ +;\n" % settings.EPSG_DISPLAY_PROJECTION + js += u"var epsg_projection = new OpenLayers.Projection('EPSG:%d');\n" % \ settings.EPSG_PROJECTION js += u"var centerLonLat = new OpenLayers.LonLat(%f,\ %f).transform(epsg_display_projection, epsg_projection);\n" % \ diff --git a/settings.py b/settings.py index 322167b..88dbd7d 100644 --- a/settings.py +++ b/settings.py @@ -1,9 +1,8 @@ # Django settings for chimere project. # GDAL path for GeoDjango -GDAL_LIBRARY_PATH = '/usr/local/lib/libgdal.so' -ROOT_PATH = '/home/etienne/Documents/Prog/chimere/' +ROOT_PATH = '/var/local/django/chimere/' DEBUG = True TEMPLATE_DEBUG = DEBUG diff --git a/static/edit_map.js b/static/edit_map.js index 05b3a24..b43db42 100644 --- a/static/edit_map.js +++ b/static/edit_map.js @@ -18,6 +18,8 @@ See the file COPYING for details. /* map edit */ +var map; + /* availaible map layers */ var layerMapnik = new OpenLayers.Layer.OSM.Mapnik('Mapnik'); var layerMarkers = new OpenLayers.Layer.Markers('POIs'); @@ -30,7 +32,7 @@ var icon = new OpenLayers.Icon('http://www.openlayers.org/dev/img/marker.png', s /* set a marker with a click on the map */ var setMarker = function (event){ event = event || window.event; - lonlat = layerMarkers.getLonLatFromViewPortPx(event.xy); + var lonlat = layerMarkers.getLonLatFromViewPortPx(event.xy); putMarker(lonlat); OpenLayers.Event.stop(event); } @@ -66,7 +68,6 @@ function init(){ map.addLayers([layerMapnik, layerMarkers]); map.events.register('click', map, setMarker); map.setCenter(centerLonLat, 12); - } diff --git a/static/main_map.js b/static/main_map.js index 93f64ad..4a9e684 100644 --- a/static/main_map.js +++ b/static/main_map.js @@ -29,6 +29,8 @@ function hide(id){ document.getElementById(id).style.display = 'None'; } +var map; + /* availaible map layers */ var layerMapnik = new OpenLayers.Layer.OSM.Mapnik('Classic'); var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle map", { @@ -185,7 +187,7 @@ function setDetail(response){ /* main initialisation function */ function init(){ /* set the main map */ - map = new OpenLayers.Map ('map', { + map = new OpenLayers.Map('map', { controls:[new OpenLayers.Control.Navigation(), new OpenLayers.Control.PanZoomBar(), new OpenLayers.Control.ScaleLine()], diff --git a/static/styles.css b/static/styles.css index 0942301..205521e 100644 --- a/static/styles.css +++ b/static/styles.css @@ -59,6 +59,7 @@ border-bottom:1px solid black; #action li{ display:inline; padding:3px; +padding-top:0px; margin-right:6px; border:1px solid black; -moz-border-radius: 4px 4px 0 0; @@ -138,7 +139,6 @@ bottom:38px; right:18px; width:300px; background-color:#FFF; -opacity:0.8; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; @@ -149,6 +149,10 @@ overflow:auto; height:90%; } +#detail_content img{ +width:280px; +} + #detail_footer{ text-align:center; } @@ -161,14 +165,25 @@ text-decoration:None; } #map{ -border: 1px solid black; position:absolute; +border: 1px solid black; +margin:0px; +padding:0px; +height:92%; top:40px; bottom:8px; left:8px; right:8px; } +#permalink { +z-index:10000; +position:absolute; +bottom:50px; +left:12px; +font-size:smaller; +} + .news{ } @@ -215,4 +230,4 @@ font-weight:bold; .fieldWrapper{ padding:6px; -}
\ No newline at end of file +} diff --git a/templates/main_map.html b/templates/main_map.html index c7b9e2f..47a495a 100644 --- a/templates/main_map.html +++ b/templates/main_map.html @@ -20,5 +20,5 @@ init(); // --> </script>{% endblock %} {% block footer %} - <div id='map-footer'><a href='javascript:show("welcome");'>{% trans "Welcome message"%}</a> - {% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div> + <div id='map-footer'><a href='javascript:show("welcome");'>{% trans "Welcome message"%}</a> - {% trans "Map"%} © <a href='http://openstreetmap.org/'>OpenStreetMap</a> - {% trans "This site uses Chimère"%} - Copyright © 2008 <a href='http://redmine.peacefrogs.net/projects/show/chimere'>Chimère project</a></div> {% endblock %} |