diff options
| -rw-r--r-- | app/jrnl/build.py | 6 | ||||
| -rw-r--r-- | app/locations/urls.py | 5 | ||||
| -rw-r--r-- | config/base_urls.py | 1 | ||||
| -rw-r--r-- | design/sass/_homepage.scss | 2 | ||||
| -rw-r--r-- | design/templates/archives/map.html | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/app/jrnl/build.py b/app/jrnl/build.py index 2c4d202..5b5d929 100644 --- a/app/jrnl/build.py +++ b/app/jrnl/build.py @@ -48,7 +48,8 @@ class BuildJrnl(BuildNew): pages = self.get_pages(qs, 24) for page in range(pages): base_path = reverse("jrnl:list_country", kwargs={'slug': c.slug, 'page': page + 1}) - response = self.client.get(base_path, HTTP_HOST='127.0.0.1') + response = self.client.get(base_path) + print(response.content) if page == 0: self.write_file(base_path[:-2], response.content) else: @@ -67,8 +68,7 @@ class BuildJrnl(BuildNew): base_path=reverse("map:maplist"), paginate_by=1000000 ) - url = "/media/js/mainmap.js" - response = self.client.get("/media/js/mainmap.js", HTTP_HOST='127.0.0.1') + response = self.client.get(reverse("map:mapdata")) self.write_file("media/js/mainmap", response.content, 'js', '') diff --git a/app/locations/urls.py b/app/locations/urls.py index df9854a..abe9f0a 100644 --- a/app/locations/urls.py +++ b/app/locations/urls.py @@ -5,6 +5,11 @@ from . import views app_name = "locations" urlpatterns = [ + path( + r'mapdata/', + views.MapDataList.as_view(), + name="mapdata" + ), re_path(r'data/(?P<id>\d+)/$', views.data_json), path( r'', diff --git a/config/base_urls.py b/config/base_urls.py index 1d2156d..c48d75e 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -53,6 +53,7 @@ urlpatterns = [ path(r'figments/', include('figments.urls', namespace='figments')), path(r'resume/', include('resume.urls', namespace='resume')), path(r'map', include('locations.urls', namespace='map')), + path(r'map/', include('locations.urls', namespace='map')), path(r'', HomepageList.as_view(), name="homepage"), path(r'comments/', include('django_comments.urls')), path(r'<slug>', PageDetailView.as_view()), diff --git a/design/sass/_homepage.scss b/design/sass/_homepage.scss index ecf4eb5..96e88e1 100644 --- a/design/sass/_homepage.scss +++ b/design/sass/_homepage.scss @@ -259,7 +259,7 @@ } .hero--wrapper { @include breakpoint(gamma) { - margin-top: -245px; + margin-top: -225px; } } } diff --git a/design/templates/archives/map.html b/design/templates/archives/map.html index 8195e6d..5a0797a 100644 --- a/design/templates/archives/map.html +++ b/design/templates/archives/map.html @@ -52,6 +52,6 @@ Google Maps code {% endblock %} {% block js %} <!--<script type="text/javascript" src="/media/js/mainmap.js"></script>--> -<script type="text/javascript" src="/media/js/mainmap.js"></script> +<script src="/media/js/mainmap.js"></script> {% endblock%} |