diff --git a/mapper/.DS_Store b/mapper/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/mapper/.DS_Store differ diff --git a/mapper/.sass-cache/0135bf367c35a9fbd1b687fab751a92d0439e966/maps.scssc b/mapper/.sass-cache/0135bf367c35a9fbd1b687fab751a92d0439e966/maps.scssc index bb6b66f..ab9e2f4 100644 Binary files a/mapper/.sass-cache/0135bf367c35a9fbd1b687fab751a92d0439e966/maps.scssc and b/mapper/.sass-cache/0135bf367c35a9fbd1b687fab751a92d0439e966/maps.scssc differ diff --git a/mapper/static/.DS_Store b/mapper/static/.DS_Store new file mode 100644 index 0000000..dc4850a Binary files /dev/null and b/mapper/static/.DS_Store differ diff --git a/mapper/static/js/mapper.js b/mapper/static/js/mapper.js index 24957b2..772efbe 100644 --- a/mapper/static/js/mapper.js +++ b/mapper/static/js/mapper.js @@ -14,11 +14,16 @@ var Mapper = new function() { this.map_id; this.init = function() { - Mapper.ui.init(); - Mapper.gallery.init(); + if (Mapper.map_id) { + Mapper.ui.init(); + Mapper.view.loadData(); + } + else { + Mapper.ui.init(); + Mapper.gallery.init(); + } } - }(); $(document).ready(function() { diff --git a/mapper/static/js/mapper_generate.js b/mapper/static/js/mapper_generate.js index 40871ee..91c8b8d 100644 --- a/mapper/static/js/mapper_generate.js +++ b/mapper/static/js/mapper_generate.js @@ -37,12 +37,10 @@ Mapper.generate = new function() { dataType: "json", url: "/api/maps/"+Mapper.map_id,}).done( function(data) { - _generate.markerCounter = data.points.length + 1; Mapper.map_components.storageMarkerLayer.addData(data.points); Mapper.ui.els.savedPins.empty(); - var markers = data.points; $.each(markers, function(x, marker) { @@ -53,7 +51,6 @@ Mapper.generate = new function() { ) } - this.addListeners = function() { Mapper.map_components.map.on('dblclick', Mapper.annotate.addMarker) } diff --git a/mapper/static/js/mapper_view.js b/mapper/static/js/mapper_view.js new file mode 100644 index 0000000..ebd078e --- /dev/null +++ b/mapper/static/js/mapper_view.js @@ -0,0 +1,18 @@ +Mapper.view = new function() { + + _view = this; + var map_id = Mapper.map_id + + this.loadData = function(map_id) { + $.ajax({ + dataType: "json", + url: "/api/maps/"+Mapper.map_id+"?include=points"} + ).done( + function(data) { + console.log(data); + Mapper.ui.els.mapTitle.text(data.name); + Mapper.ui.els.mapNotes.text(data.notes); + }); + } + +} diff --git a/mapper/static/js/ui.js b/mapper/static/js/ui.js index 64b0433..65b6b73 100644 --- a/mapper/static/js/ui.js +++ b/mapper/static/js/ui.js @@ -13,14 +13,16 @@ Mapper.ui = new function() { 'markerCancelBtn': '#markerCancelBtn', 'markerList': '#markerList', 'createNewMap': '#createNewMapBtn', + 'editMap' : '#editMapBtn', + 'cancelEditMap' : '#cancelEditMapBtn', 'savePublish': '#savePublishBtn', 'cancelMap': '#cancelMapBtn', + 'mapPreview' : '#mapPreview', 'mapTitle': '#mapTitle', 'mapNotes': '#mapNotes', 'formInputs': '.form-input', 'savedPins': '#saved-pins', 'mapGrid': '#map-grid', - 'editMapBtn': '.edit-map-btn' }; this.templates = {}; this.events = {}; @@ -46,6 +48,8 @@ Mapper.ui = new function() { _ui.els.markerSaveButton.click(Mapper.annotate.saveMarker); _ui.els.markerCancelBtn.click(Mapper.annotate.cancelMarker); _ui.els.createNewMap.click(_ui.openMapCreator); + _ui.els.editMap.click(_ui.openMapEditor); + _ui.els.cancelEditMap.click(_ui.closeMapEditor); _ui.els.cancelMap.click(_ui.closeMapCreator); _ui.els.savePublish.click(Mapper.save.init); _ui.els.formInputs.keyup(_ui.toggleInputError); @@ -80,5 +84,29 @@ Mapper.ui = new function() { _ui.els.cancelMap.hide(); } + this.openMapEditor = function() { + _ui.els.mapPreview.hide(); + _ui.els.editMap.hide(); + _ui.openMapCreator(); + _ui.els.cancelEditMap.show(); + /* + _ui.els.editMap.hide(); + _ui.els.savePublish.show(); + _ui.els.cancelEditMap.show(); + _ui.els.formInputs.parents().removeClass('form-error'); + _ui.els.mapCreator.slideDown(250, function() { + Mapper.generate.init(); + });*/ + } + + this.closeMapEditor = function() { + _ui.els.mapCreator.hide(); + _ui.els.mapPreview.show(); + _ui.els.editMap.show(); + _ui.els.savePublish.hide(); + _ui.els.cancelEditMap.hide(); + } + + }(); diff --git a/mapper/templates/base.html b/mapper/templates/base.html index 36cccb8..57ccccd 100644 --- a/mapper/templates/base.html +++ b/mapper/templates/base.html @@ -18,6 +18,7 @@ + @@ -27,6 +28,7 @@ diff --git a/mapper/templates/map.html b/mapper/templates/map.html index ea1fdb2..a6b94e1 100644 --- a/mapper/templates/map.html +++ b/mapper/templates/map.html @@ -12,19 +12,47 @@ {% endblock %} - - + {% block body %} +
- Edit this Map - Save and Publish - Cancel + Edit this Map + Save and Publish + Cancel
-
-
-{% include "map-creator.html" %} -
+
+
+
+ +

+ +
+ +
+ +

+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+ +{% include "map-creator.html" %} + {% endblock %} diff --git a/mapper/urls.py b/mapper/urls.py index cedf463..99f0faa 100644 --- a/mapper/urls.py +++ b/mapper/urls.py @@ -28,7 +28,7 @@ url(r'^api/maps/(?P[0-9]+)/$', views.map_detail), url(r'^bpage$', TemplateView.as_view(template_name='bpage.html')), url(r'^cms$', TemplateView.as_view(template_name='cms.html')), - url(r'^map$', TemplateView.as_view(template_name='map.html')), + url(r'^maps/(?P[0-9]+)/$', TemplateView.as_view(template_name='map.html')), url(r'^gallery$', TemplateView.as_view(template_name='gallery.html')), url(r'^demo/test$', TemplateView.as_view(template_name='demo/test.html')), url(r'^creator-test$', TemplateView.as_view(template_name='creator-test.html')),