From c21a06d5c84432e7e672a9f1d3d59c9ef8bd5ab7 Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Fri, 12 Oct 2018 18:56:27 -0400 Subject: [PATCH 1/5] Get basic, admin-editable POI working --- apps/map/admin.py | 3 ++- apps/map/models.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/map/admin.py b/apps/map/admin.py index ab2740d..daa97de 100644 --- a/apps/map/admin.py +++ b/apps/map/admin.py @@ -3,7 +3,7 @@ from django import forms from dal import autocomplete from leaflet.admin import LeafletGeoAdmin -from .models import CaseStudy, CaseStudyDraft, SpatialRefSys +from .models import CaseStudy, CaseStudyDraft, SpatialRefSys, PointOfInterest class CaseStudyDraftAdmin(admin.ModelAdmin): @@ -51,3 +51,4 @@ class CaseStudyAdmin(LeafletGeoAdmin): admin.site.register(CaseStudy, CaseStudyAdmin) admin.site.register(SpatialRefSys) admin.site.register(CaseStudyDraft, CaseStudyDraftAdmin) +admin.site.register(PointOfInterest) diff --git a/apps/map/models.py b/apps/map/models.py index a71ddee..227028e 100644 --- a/apps/map/models.py +++ b/apps/map/models.py @@ -1016,6 +1016,12 @@ class CaseStudy(models.Model): class PointOfInterest(models.Model): + class Meta: + verbose_name_plural = 'points of interest' + + def __str__(self): + return self.title + author = models.ForeignKey( User, models.SET_NULL, @@ -1026,7 +1032,7 @@ class PointOfInterest(models.Model): date_created = models.DateTimeField(auto_now_add=True, null=False) - slug = AutoSlugField(populate_from=['entry_name'], editable=False) + slug = AutoSlugField(populate_from=['title'], editable=False) approved = models.BooleanField(default=False) From b0aea72c12f0597da1b1657bb85936a852231f7e Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Fri, 12 Oct 2018 19:51:59 -0400 Subject: [PATCH 2/5] Redesign form selector screen --- apps/map/templates/map/form-selector.html | 126 ++++++++++++++++------ ojusomap/templates/base.html | 6 +- 2 files changed, 98 insertions(+), 34 deletions(-) diff --git a/apps/map/templates/map/form-selector.html b/apps/map/templates/map/form-selector.html index 931a594..f4b76fb 100644 --- a/apps/map/templates/map/form-selector.html +++ b/apps/map/templates/map/form-selector.html @@ -1,4 +1,4 @@ -{% extends "base_page.html" %} +{% extends "base.html" %} {% load bootstrap3 %} {% load compress %} {% load i18n %} @@ -7,41 +7,101 @@ {% block stylesheets %} {{ block.super }} {% endblock %} -{% block title %}{% trans "How much time do you have?" %}{% endblock %} -{% block description %} - {% trans "A complete picture is always more helpful but sometimes you don't have the time" %} -{% endblock %} -{% block inner %} -
- -

20+ Minutes

-

Full Form (Preferred)

+{% block content %} + +
+
+ +
+ +

{% trans "Create a new entry" %}

+

{% trans "What kind of entry do you want to create?" %}

+ + + +
+

{% trans "Case study" %}

+

+ {% trans "A collection of data about a particular land-based project" %} +

+
- -

5-10 Minutes

-

Express Form

+ + + +
+

{% trans "Case study (short)" %}

+

+ {% trans "For when you have less information or less time" %} +

+
+ + + +
+

{% trans "Point of interest" %}

+

+ {% trans "Marking somewhere as being of interest to the renewable energy transition" %} +

+
+ +
-{% endblock %} \ No newline at end of file + +
+
+ +{% endblock %} + diff --git a/ojusomap/templates/base.html b/ojusomap/templates/base.html index 6ea215d..bd3e79a 100644 --- a/ojusomap/templates/base.html +++ b/ojusomap/templates/base.html @@ -102,7 +102,11 @@ {% if user.is_authenticated %} - New Case Study + + + Contribute + +