From 606d2e1df3de211b250ef7cd6108cc7a3a763504 Mon Sep 17 00:00:00 2001 From: Ailin Fang Date: Thu, 16 Jul 2015 17:31:54 -0400 Subject: [PATCH 1/5] Make edit page standalone --- mapper/.DS_Store | Bin 0 -> 6148 bytes .../maps.scssc | Bin 22861 -> 28130 bytes mapper/static/.DS_Store | Bin 0 -> 6148 bytes mapper/static/js/mapper.js | 6 +-- mapper/static/js/mapper_generate.js | 2 - mapper/static/js/mapper_view.js | 18 +++++++ mapper/static/js/ui.js | 27 +++++++++- mapper/templates/base.html | 2 + mapper/templates/map.html | 46 ++++++++++++++---- mapper/urls.py | 2 +- 10 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 mapper/.DS_Store create mode 100644 mapper/static/.DS_Store create mode 100644 mapper/static/js/mapper_view.js diff --git a/mapper/.DS_Store b/mapper/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0) zF$9fk6Y)w~#sxnu3rHXWCN6anU1~Br6HSb|(~UcK>bdv*-Ifj$S(M!OzVn^$p6{Id z?)RtMZ$ELL_`8O#kH!Z_5(#NIF&G_54h|0uB!;7r$Z#SuI5ZL&n2jc+NF)*280+M& zp2+Xqt_p>_1$_Kg;OzI?RWITD5v%BiCyPp25*DSUWuZH4LACc#H$uoVeFW<${$G)U1o{Oh$K&*dnM(rI;aIgKYrLUM$sJ_kHC zCJ#Jxy1W)svQw2z_D96J98@e>>N4|`zvorp&ujd7!k?!)^T2O4`N`6QQ$0=i<7hL! z>G1@)E!3zWe=Ta#_p(JWX2=%)S_nJ`R>#5`#=Q-1GBqJQE<9=X)jv{qtelsCiHsg(;Z=y1k(MF-DRcu0S zVgQBJ?TY*ZMl6B&h}Z=q;}iH`zzbP#1NBZgQ4;j`4UWt75{Q0gxf;y zAh)B-(feQr@bzZBcksV0fm@YfOb3%Fw~@uD^#&tk2k-a-b-+aVMgCLT6!@XgIvStN zC=1J3sk|9>%f;%g3ydH&e4F%BPH0x2olQ&>!E5aBJ1-xGEaq!cyl)II>wOir?N;&+>xppGqA2)TmXp{`D!)c}k5&MrTG+`E#Fr&3b7 zFEg*KkkVxYrih-`s}Rd^_&eSdTNoEnLt(KkCQF@7d2;pPkv?L z$n7>MhQsEa)>?jJ72da61tAohSKgD-un^$Sydu&E_}NtBx*(WWtZYnx`xTX;O;XOJ7UGX$OUjZ&pm0f+v$C=j6ZCKL^PjHB$?QA;;X_40pstF@!#_;< z*VjlceaJyyt)56wGm*DtLtf!@pc^wHXBU*jLqv%$2&GLFAPrm^ZREv{w{QLj(pfrK delta 91 zcmaEKoAK->#tD)dX{kn*DQ1S2W~Sz5CdR2LX%=azDJCh&hDN4|=7vV*DdvU-$w{V` v6CKqVl{aR__%W;MYfavmExq}P9}Dy3mnnQqvh16Grfg>e3Z_h6o@)&NQ8FI^ diff --git a/mapper/static/.DS_Store b/mapper/static/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dc4850a1fa7ea28864dc8bf0611f70b1fffd8448 GIT binary patch literal 6148 zcmeHKJ5EDE3>+sBibRu=a<9M*R#7+s7l05zAW(`Z{i`?^M`QevAbLp^(L`g(JG*`! zuig~T&j4(>-`oNV0CTz{zI+**KX)J5q#}+MHJ-71+3cRy+wI3F`*^^)S9rrG9`TAl zd=|t6@4p2-Ad>=8Knh3!DIf*TRiHZR{QBHN;!6Q3aB&Lw_o2}pd*P56pAIfD0uW~m zhjAaX1hIL5*b9e5Mrf8)Vp6R}3`;uWt@3)|keGB>+{`+4v(@~ literal 0 HcmV?d00001 diff --git a/mapper/static/js/mapper.js b/mapper/static/js/mapper.js index 24957b2..4e31450 100644 --- a/mapper/static/js/mapper.js +++ b/mapper/static/js/mapper.js @@ -14,9 +14,9 @@ var Mapper = new function() { this.map_id; this.init = function() { - Mapper.ui.init(); - Mapper.gallery.init(); - } + Mapper.ui.init(); + Mapper.gallery.init(); + } }(); diff --git a/mapper/static/js/mapper_generate.js b/mapper/static/js/mapper_generate.js index 40871ee..8f2da57 100644 --- a/mapper/static/js/mapper_generate.js +++ b/mapper/static/js/mapper_generate.js @@ -37,7 +37,6 @@ 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); @@ -53,7 +52,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..ddbcc1e --- /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.Notes.text(data.notes); + }); + } + +} diff --git a/mapper/static/js/ui.js b/mapper/static/js/ui.js index 64b0433..8adfc50 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,26 @@ Mapper.ui = new function() { _ui.els.cancelMap.hide(); } + this.openMapEditor = function() { + _ui.els.mapPreview.hide(); + _ui.els.editMap.hide(); + _ui.els.savePublish.show(); + _ui.els.cancelEditMap.show(); + _ui.els.formInputs.val(''); + _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..29aa010 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 +
+
+
+
+ +

-{% block body %} +
-
- Edit this Map - Save and Publish - Cancel +
+ +

+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
-
-
{% 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')), From 578c38a0151de5ab9e8d4e1110957661d427ac60 Mon Sep 17 00:00:00 2001 From: Ailin Fang Date: Thu, 16 Jul 2015 17:41:26 -0400 Subject: [PATCH 2/5] Move edit view to its own page --- mapper/static/js/mapper_view.js | 2 +- mapper/static/js/ui.js | 1 - mapper/templates/map.html | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mapper/static/js/mapper_view.js b/mapper/static/js/mapper_view.js index ddbcc1e..ebd078e 100644 --- a/mapper/static/js/mapper_view.js +++ b/mapper/static/js/mapper_view.js @@ -11,7 +11,7 @@ Mapper.view = new function() { function(data) { console.log(data); Mapper.ui.els.mapTitle.text(data.name); - Mapper.ui.els.Notes.text(data.notes); + Mapper.ui.els.mapNotes.text(data.notes); }); } diff --git a/mapper/static/js/ui.js b/mapper/static/js/ui.js index 8adfc50..16a0f07 100644 --- a/mapper/static/js/ui.js +++ b/mapper/static/js/ui.js @@ -89,7 +89,6 @@ Mapper.ui = new function() { _ui.els.editMap.hide(); _ui.els.savePublish.show(); _ui.els.cancelEditMap.show(); - _ui.els.formInputs.val(''); _ui.els.formInputs.parents().removeClass('form-error'); _ui.els.mapCreator.slideDown(250, function() { Mapper.generate.init(); diff --git a/mapper/templates/map.html b/mapper/templates/map.html index 29aa010..f34a117 100644 --- a/mapper/templates/map.html +++ b/mapper/templates/map.html @@ -18,6 +18,7 @@ Mapper.map_id = {{map_id}} Mapper.view.loadData(); +
Edit this Map Save and Publish From 013773c0e109daa0983ae566d4159f065427ebad Mon Sep 17 00:00:00 2001 From: Ailin Fang Date: Thu, 16 Jul 2015 18:03:08 -0400 Subject: [PATCH 3/5] git hell --- mapper/static/js/mapper_generate.js | 1 - 1 file changed, 1 deletion(-) diff --git a/mapper/static/js/mapper_generate.js b/mapper/static/js/mapper_generate.js index 8f2da57..91c8b8d 100644 --- a/mapper/static/js/mapper_generate.js +++ b/mapper/static/js/mapper_generate.js @@ -41,7 +41,6 @@ Mapper.generate = new function() { Mapper.map_components.storageMarkerLayer.addData(data.points); Mapper.ui.els.savedPins.empty(); - var markers = data.points; $.each(markers, function(x, marker) { From 9209dab2b980480ae94257f677b92213734a43f6 Mon Sep 17 00:00:00 2001 From: Ailin Fang Date: Fri, 17 Jul 2015 10:12:18 -0400 Subject: [PATCH 4/5] Stop initializing gallery on individual page --- mapper/static/js/mapper.js | 9 +++++++-- mapper/templates/map.html | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mapper/static/js/mapper.js b/mapper/static/js/mapper.js index 4e31450..772efbe 100644 --- a/mapper/static/js/mapper.js +++ b/mapper/static/js/mapper.js @@ -14,10 +14,15 @@ var Mapper = new function() { this.map_id; this.init = function() { + if (Mapper.map_id) { + Mapper.ui.init(); + Mapper.view.loadData(); + } + else { Mapper.ui.init(); Mapper.gallery.init(); - } - + } + } }(); diff --git a/mapper/templates/map.html b/mapper/templates/map.html index f34a117..a6b94e1 100644 --- a/mapper/templates/map.html +++ b/mapper/templates/map.html @@ -16,9 +16,8 @@ {% block body %} - +
Edit this Map Save and Publish From 5729ae42131180a04bcad3d4aa51c98d6b6f6375 Mon Sep 17 00:00:00 2001 From: Jane Kelly Date: Fri, 17 Jul 2015 10:22:36 -0400 Subject: [PATCH 5/5] changing static --- mapper/static/js/ui.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mapper/static/js/ui.js b/mapper/static/js/ui.js index 16a0f07..65b6b73 100644 --- a/mapper/static/js/ui.js +++ b/mapper/static/js/ui.js @@ -87,12 +87,16 @@ Mapper.ui = new function() { 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() {