summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/birds/migrations/0001_initial.py2
-rw-r--r--app/books/migrations/0005_auto_20171214_2239.py21
-rw-r--r--app/jrnl/migrations/0001_initial.py2
-rw-r--r--app/links/migrations/0003_auto_20171214_2239.py21
-rw-r--r--app/locations/admin.py8
-rw-r--r--app/locations/migrations/0001_initial.py104
-rw-r--r--app/locations/migrations/0002_checkin.py31
-rw-r--r--app/locations/migrations/__init__.py0
-rw-r--r--app/locations/models.py32
-rw-r--r--app/notes/admin.py2
-rw-r--r--app/notes/migrations/0001_initial.py2
-rw-r--r--app/notes/migrations/0003_auto_20160208_1120.py2
-rw-r--r--app/notes/migrations/0008_remove_luxnote_date_last_updated.py19
-rw-r--r--app/photos/migrations/0001_initial.py2
-rw-r--r--app/unused_apps/daily/migrations/0001_initial.py2
-rw-r--r--app/unused_apps/daily/migrations/0011_auto_20171214_2239.py21
-rw-r--r--app/unused_apps/daily/models.py2
-rw-r--r--config/base_urls.py3
-rw-r--r--design/templates/admin/index.html8
19 files changed, 268 insertions, 16 deletions
diff --git a/app/birds/migrations/0001_initial.py b/app/birds/migrations/0001_initial.py
index 0e18574..b20387e 100644
--- a/app/birds/migrations/0001_initial.py
+++ b/app/birds/migrations/0001_initial.py
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('locations', '__first__'),
+ #('locations', '__first__'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
diff --git a/app/books/migrations/0005_auto_20171214_2239.py b/app/books/migrations/0005_auto_20171214_2239.py
new file mode 100644
index 0000000..175cc73
--- /dev/null
+++ b/app/books/migrations/0005_auto_20171214_2239.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:39
+from __future__ import unicode_literals
+
+import books.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('books', '0004_auto_20161219_1058'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='book',
+ name='image',
+ field=models.FileField(blank=True, null=True, upload_to=books.models.get_upload_path),
+ ),
+ ]
diff --git a/app/jrnl/migrations/0001_initial.py b/app/jrnl/migrations/0001_initial.py
index fb2542e..7938b94 100644
--- a/app/jrnl/migrations/0001_initial.py
+++ b/app/jrnl/migrations/0001_initial.py
@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('locations', '__first__'),
+ #('locations', '__first__'),
('photos', '0003_luxgallery_caption_style'),
]
diff --git a/app/links/migrations/0003_auto_20171214_2239.py b/app/links/migrations/0003_auto_20171214_2239.py
new file mode 100644
index 0000000..138cc4c
--- /dev/null
+++ b/app/links/migrations/0003_auto_20171214_2239.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('links', '0002_link_body_markdown'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='link',
+ name='pub_date',
+ field=models.DateTimeField(default=django.utils.timezone.now),
+ ),
+ ]
diff --git a/app/locations/admin.py b/app/locations/admin.py
index 1938336..c3419b1 100644
--- a/app/locations/admin.py
+++ b/app/locations/admin.py
@@ -1,6 +1,7 @@
from django.contrib import admin
from django.contrib.gis.admin import OSMGeoAdmin
-from locations.models import Region, Country, Location, State, Route
+from locations.models import Region, Country, Location, State, Route, CheckIn
+from utils.widgets import OLAdminBase
class RegionAdmin(OSMGeoAdmin):
@@ -232,3 +233,8 @@ class RouteAdmin(OSMGeoAdmin):
openlayers_url = '/static/admin/js/OpenLayers.js'
admin.site.register(Route, RouteAdmin)
+
+
+@admin.register(CheckIn)
+class CheckInAdmin(OLAdminBase):
+ list_display = ('date', 'location')
diff --git a/app/locations/migrations/0001_initial.py b/app/locations/migrations/0001_initial.py
new file mode 100644
index 0000000..1854dbf
--- /dev/null
+++ b/app/locations/migrations/0001_initial.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:25
+from __future__ import unicode_literals
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Country',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=50)),
+ ('area', models.IntegerField(help_text='Area of Country in SQ meters')),
+ ('pop2005', models.IntegerField(verbose_name='Population 2005')),
+ ('fips', models.CharField(help_text='<a href="http://www.census.gov/geo/www/fips/fips.html">Federal Information Processing Standard Code</a>', max_length=2, verbose_name='FIPS Code')),
+ ('iso2', models.CharField(help_text='<a href="http://www.iso.org/">International Organization for Standardization</a>', max_length=2, verbose_name='2 Digit ISO')),
+ ('iso3', models.CharField(help_text='<a href="http://www.iso.org/">International Organization for Standardization</a>', max_length=3, verbose_name='3 Digit ISO')),
+ ('un', models.IntegerField(verbose_name='United Nations Code')),
+ ('region', models.IntegerField(choices=[(0, 'MISC'), (2, 'Africa'), (9, 'Oceania'), (19, 'Americas'), (142, 'Asia'), (150, 'Europe')], verbose_name='Region Code')),
+ ('subregion', models.IntegerField(choices=[(0, 'MISC'), (5, 'South America'), (11, 'Western Africa'), (13, 'Central America'), (14, 'Eastern Africa'), (15, 'Northern Africa'), (17, 'Middle Africa'), (18, 'Southern Africa'), (21, 'North America'), (29, 'Caribbean'), (30, 'Eastern Asia'), (34, 'Southern Asia'), (35, 'Southeast Asia'), (39, 'Southern Europe'), (53, 'Australia and New Zealand'), (54, 'Melanesia'), (57, 'Micronesia'), (61, 'Polynesia'), (143, 'Central Asia'), (145, 'Western Asia'), (151, 'Eastern Europe'), (154, 'Northern Europe'), (155, 'Western Europe')], verbose_name='Sub-Region Code')),
+ ('lon', models.FloatField(help_text='Longitude of centerpoint', verbose_name='Longitude')),
+ ('lat', models.FloatField(help_text='Latitude of centerpoint', verbose_name='Latitude')),
+ ('zoom_level', models.CharField(max_length=2, null=True)),
+ ('slug', models.SlugField(null=True)),
+ ('visited', models.BooleanField(default=False)),
+ ('pub_date', models.DateTimeField(null=True, verbose_name='Date published')),
+ ('geometry', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, verbose_name='Country Border')),
+ ],
+ options={
+ 'verbose_name_plural': 'Countries',
+ 'ordering': ['name'],
+ },
+ ),
+ migrations.CreateModel(
+ name='Location',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=50)),
+ ('slug', models.SlugField()),
+ ('pub_date', models.DateTimeField(null=True, verbose_name='Date published')),
+ ('geometry', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Region',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=50)),
+ ('slug', models.SlugField()),
+ ('pub_date', models.DateTimeField(null=True, verbose_name='Date published')),
+ ('geometry', django.contrib.gis.db.models.fields.MultiPolygonField(null=True, srid=4326)),
+ ('lon', models.FloatField(help_text='Longitude of centerpoint', null=True, verbose_name='Longitude')),
+ ('lat', models.FloatField(help_text='Latitude of centerpoint', null=True, verbose_name='Latitude')),
+ ('zoom_level', models.CharField(max_length=2, null=True)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Route',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('slug', models.SlugField()),
+ ('zoom', models.CharField(max_length=2, null=True)),
+ ('template_var_name', models.CharField(max_length=10, null=True)),
+ ('pub_date', models.DateTimeField(null=True, verbose_name='Date published')),
+ ('geometry', django.contrib.gis.db.models.fields.MultiPointField(srid=4326)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='State',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(blank=True, max_length=250, null=True)),
+ ('slug', models.SlugField()),
+ ('code', models.CharField(blank=True, max_length=2, null=True)),
+ ('pub_date', models.DateTimeField(null=True, verbose_name='Date published')),
+ ('geometry', django.contrib.gis.db.models.fields.MultiPolygonField(null=True, srid=4326)),
+ ('country', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.Country')),
+ ],
+ options={
+ 'ordering': ['name'],
+ },
+ ),
+ migrations.AddField(
+ model_name='location',
+ name='state',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='locations.State'),
+ ),
+ migrations.AddField(
+ model_name='country',
+ name='lux_region',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Region'),
+ ),
+ ]
diff --git a/app/locations/migrations/0002_checkin.py b/app/locations/migrations/0002_checkin.py
new file mode 100644
index 0000000..f479d8b
--- /dev/null
+++ b/app/locations/migrations/0002_checkin.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:32
+from __future__ import unicode_literals
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('locations', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='CheckIn',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('point', django.contrib.gis.db.models.fields.PointField(blank=True, srid=4326)),
+ ('date', models.DateField(default=django.utils.timezone.now)),
+ ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='locations.Location')),
+ ],
+ options={
+ 'ordering': ('-date',),
+ 'get_latest_by': 'date',
+ },
+ ),
+ ]
diff --git a/app/locations/migrations/__init__.py b/app/locations/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/locations/migrations/__init__.py
diff --git a/app/locations/models.py b/app/locations/models.py
index b4ee2af..1baa964 100644
--- a/app/locations/models.py
+++ b/app/locations/models.py
@@ -4,6 +4,8 @@ from django.contrib.gis.geos import GEOSGeometry, fromstr, MultiPolygon
from django.contrib.gis.db import models
from django.contrib.sitemaps import Sitemap
from django.utils.safestring import mark_safe
+from django.utils import timezone
+
"http://staticmap.openstreetmap.de/staticmap.php?center=object.location.geometry.centroid.y,object.location.geometry.centroid.x&zoom=14&size=1140x300&maptype=osmarenderer&markers=40.702147,-74.015794,lightblue1"
@@ -158,6 +160,36 @@ class Route(models.Model):
return self.name
+class CheckIn(models.Model):
+ point = models.PointField(blank=True)
+ location = models.ForeignKey(Location, blank=True, null=True)
+ date = models.DateField(default=timezone.now)
+
+ class Meta:
+ ordering = ('-date',)
+ get_latest_by = 'date'
+
+ def __str__(self):
+ return str(self.date)
+
+ @property
+ def lon(self):
+ '''Get the site's longitude.'''
+ return self.point.x
+
+ @property
+ def lat(self):
+ '''Get the site's latitude.'''
+ return self.point.y
+
+ def save(self):
+ try:
+ self.location = Location.objects.filter(geometry__contains=self.point).get()
+ except Location.DoesNotExist:
+ raise forms.ValidationError("There is no location associated with that point, add it: %sadmin/locations/location/add/" % (settings.BASE_URL))
+ super(CheckIn, self).save()
+
+
class WritingbyCountrySitemap(Sitemap):
changefreq = "weekly"
priority = 0.6
diff --git a/app/notes/admin.py b/app/notes/admin.py
index 62a7539..3d1d593 100644
--- a/app/notes/admin.py
+++ b/app/notes/admin.py
@@ -5,7 +5,7 @@ from notes.models import Note, LuxNote
from utils.widgets import LGEntryForm, OLAdminBase
-@register(LuxNote)
+@admin.register(LuxNote)
class LuxNoteAdmin(OLAdminBase):
prepopulated_fields = {"slug": ('title',)}
list_display = ('slug', 'pub_date', 'location')
diff --git a/app/notes/migrations/0001_initial.py b/app/notes/migrations/0001_initial.py
index cf8396a..598b81b 100644
--- a/app/notes/migrations/0001_initial.py
+++ b/app/notes/migrations/0001_initial.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('locations', '__first__'),
+ #('locations', '__first__'),
]
operations = [
diff --git a/app/notes/migrations/0003_auto_20160208_1120.py b/app/notes/migrations/0003_auto_20160208_1120.py
index ccdf46f..43f49a6 100644
--- a/app/notes/migrations/0003_auto_20160208_1120.py
+++ b/app/notes/migrations/0003_auto_20160208_1120.py
@@ -10,7 +10,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('locations', '__first__'),
+ #('locations', '__first__'),
('notes', '0002_auto_20160208_1107'),
]
diff --git a/app/notes/migrations/0008_remove_luxnote_date_last_updated.py b/app/notes/migrations/0008_remove_luxnote_date_last_updated.py
new file mode 100644
index 0000000..b16b2ea
--- /dev/null
+++ b/app/notes/migrations/0008_remove_luxnote_date_last_updated.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:39
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('notes', '0007_auto_20160617_2143'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='luxnote',
+ name='date_last_updated',
+ ),
+ ]
diff --git a/app/photos/migrations/0001_initial.py b/app/photos/migrations/0001_initial.py
index a98bc97..711af1d 100644
--- a/app/photos/migrations/0001_initial.py
+++ b/app/photos/migrations/0001_initial.py
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
dependencies = [
('taggit', '0002_auto_20150616_2121'),
- ('locations', '__first__'),
+ #('locations', '__first__'),
]
operations = [
diff --git a/app/unused_apps/daily/migrations/0001_initial.py b/app/unused_apps/daily/migrations/0001_initial.py
index b3ba687..70a9755 100644
--- a/app/unused_apps/daily/migrations/0001_initial.py
+++ b/app/unused_apps/daily/migrations/0001_initial.py
@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('locations', '__first__'),
+ #('locations', '__first__'),
]
operations = [
diff --git a/app/unused_apps/daily/migrations/0011_auto_20171214_2239.py b/app/unused_apps/daily/migrations/0011_auto_20171214_2239.py
new file mode 100644
index 0000000..2cf9207
--- /dev/null
+++ b/app/unused_apps/daily/migrations/0011_auto_20171214_2239.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-12-14 22:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('daily', '0010_auto_20161023_2014'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='checkin',
+ name='location',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='adsjf', to='locations.Location'),
+ ),
+ ]
diff --git a/app/unused_apps/daily/models.py b/app/unused_apps/daily/models.py
index 1bf7bfd..bd5f018 100644
--- a/app/unused_apps/daily/models.py
+++ b/app/unused_apps/daily/models.py
@@ -10,7 +10,7 @@ from utils.widgets import markdown_to_html
class CheckIn(models.Model):
point = models.PointField(blank=True)
- location = models.ForeignKey(Location, blank=True, null=True)
+ location = models.ForeignKey(Location, blank=True, null=True, related_name='adsjf')
date = models.DateField(default=timezone.now)
class Meta:
diff --git a/config/base_urls.py b/config/base_urls.py
index 88ddfdb..c865c20 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -15,7 +15,6 @@ from photos.models import PhotoGallerySitemap
from src.models import SrcSitemap
from figments.models import FigmentSitemap
from projects.models.base import ProjectSitemap
-from syndication.views import FacebookFeedView
import builder.views
import utils.views
@@ -70,7 +69,6 @@ urlpatterns += [
r'^birds/',
include('birds.urls', namespace='birds')
),
- url(r'^travel-guide/', include('guide.urls')),
url(r'^src/', include('src.urls', namespace='src')),
url(r'^figments/', include('figments.urls', namespace='figments')),
url(r'^resume/', include('resume.urls', namespace='resume')),
@@ -81,7 +79,6 @@ urlpatterns += [
name="homepage"
),
# facebook ia feed
- url(r'^iafeed.xml$', FacebookFeedView.as_view()),
url(r'^comments/', include('django_comments.urls')),
# pages
url(r'^(?P<slug>[-\w]+)/?$', PageDetailView.as_view()),
diff --git a/design/templates/admin/index.html b/design/templates/admin/index.html
index 813a3e8..0b9a60d 100644
--- a/design/templates/admin/index.html
+++ b/design/templates/admin/index.html
@@ -42,16 +42,16 @@ td, th {
<td><a href="/admin/photos/luximage/add/" class="addlink">Add</a></td>
</tr>
<tr>
- <th scope="row"><a href="/admin/photos/luxgallery/">galleries</a></th>
- <td><a href="/admin/photos/luxgallery/add/" class="addlink">Add</a></td>
+ <th scope="row"><a href="/admin/locations/checkin/">check in</a></th>
+ <td><a href="/admin/locations/checkin/add/" class="addlink">Add</a></td>
</tr>
<tr>
<th scope="row"><a href="/admin/pages/page/">pages</a></th>
<td><a href="/admin/pages/page/add/" class="addlink">Add</a></td>
</tr>
<tr>
- <th scope="row"><a href="/admin/links/link/">links</a></th>
- <td><a href="/admin/links/link/add/" class="addlink">Add</a></td>
+ <th scope="row"><a href="/admin/notes/luxnote/">notes</a></th>
+ <td><a href="/admin/notes/luxnote/add/" class="addlink">Add</a></td>
</tr>
</table>
</div>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-04-02 04:07:45 +0000