From 69173ab423b281b34972819b60a1b92372e2a145 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Fri, 24 May 2013 13:03:08 +0000
Subject: fixed a bug in the image path of BlogImages

---
 app/blog/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/blog/models.py')

diff --git a/app/blog/models.py b/app/blog/models.py
index bf319ce..b7c7d87 100644
--- a/app/blog/models.py
+++ b/app/blog/models.py
@@ -39,7 +39,7 @@ TEMPLATES = (
     )
 class PostImage(models.Model):
     title = models.CharField(max_length=100)
-    image = models.ImageField(upload_to="%s%s" %(settings.IMAGES_ROOT, datetime.datetime.today().strftime("%Y")))
+    image = models.ImageField(upload_to="%s/%s" %(settings.IMAGES_ROOT, datetime.datetime.today().strftime("%Y")))
 
     def __unicode__(self):
         return self.title
@@ -114,7 +114,7 @@ class Entry(models.Model):
  
     def save(self): 
         md = image_url_replace(self.body_markdown)
-        self.body_html = markdown.markdown(self.body_markdown, extensions=['extra',], safe_mode = False)
+        self.body_html = markdown.markdown(md, extensions=['extra',], safe_mode = False)
         self.dek == markdown.markdown(self.dek, safe_mode = False)
         super(Entry, self).save()
 
-- 
cgit v1.2.3-70-g09d2


From 7ba10b77f38576b688d7833237e2ec3f36c3292a Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Fri, 24 May 2013 21:41:02 -0400
Subject: changed backend code to validate location using only the point and
 prompt if no location exists

---
 README                          |  6 ++++++
 app/blog/admin.py               | 11 +----------
 app/blog/models.py              |  4 ++++
 app/locations/models.py         | 16 ++++++++++++++++
 config/settings/settings.py     |  3 ++-
 config/settings/settings_dev.py |  7 ++++---
 6 files changed, 33 insertions(+), 14 deletions(-)

(limited to 'app/blog/models.py')

diff --git a/README b/README
index 8dc3b4d..e2de269 100644
--- a/README
+++ b/README
@@ -23,3 +23,9 @@ What I should do is refactor both into a single clean module with methods for bu
 # The whole goddamn thing.
 
 In build each model has a build function that calls all the routines necessary to build everything. I like that model, but then I need to expose those functions a bit more.
+
+ToDo:
+
+build out entry aside model
+Add JavaScript to dynamically build asides. maybe.
+create css for large image pages light and dark (should just need structural css, dark class name could be enough to work for large image dark pages.
diff --git a/app/blog/admin.py b/app/blog/admin.py
index c4b7e77..c0d72d9 100644
--- a/app/blog/admin.py
+++ b/app/blog/admin.py
@@ -3,12 +3,10 @@ from django import forms
 from blog.models import Entry, PostImage, EntryAside
 from blog.widgets import AdminImageWidget
 from django.contrib.gis.admin import OSMGeoAdmin
-from django.contrib.gis.maps.google import GoogleMap
 from django.conf import settings
 from models import *
 
 
-GMAP = GoogleMap(key=settings.GOOGLE_MAPS_API_KEY)
 
 class EntryAsideInline(admin.TabularInline):
     model = EntryAside
@@ -24,15 +22,8 @@ class BlogEntryForm(forms.ModelForm):
         widgets = {
              'body_markdown': forms.Textarea(attrs={'rows':50, 'cols':100}),
         }
-    def clean_point(self):
-        try:
-            location = Location.objects.filter(geometry__contains=self.cleaned_data['point']).get()
-            self.location = location
-        except Location.DoesNotExist:
-            raise forms.ValidationError("There is no location associated with that point")
-        return self.cleaned_data['point']
-
 
+        
 class EntryAdmin(OSMGeoAdmin):
     form = BlogEntryForm
     inlines = [EntryAsideInline,]
diff --git a/app/blog/models.py b/app/blog/models.py
index b7c7d87..80ec303 100644
--- a/app/blog/models.py
+++ b/app/blog/models.py
@@ -116,6 +116,10 @@ class Entry(models.Model):
         md = image_url_replace(self.body_markdown)
         self.body_html = markdown.markdown(md, extensions=['extra',], safe_mode = False)
         self.dek == markdown.markdown(self.dek, safe_mode = False)
+        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(Entry, self).save()
 
 class EntryAside(models.Model):
diff --git a/app/locations/models.py b/app/locations/models.py
index e088697..6fc85cf 100644
--- a/app/locations/models.py
+++ b/app/locations/models.py
@@ -159,6 +159,22 @@ class Location(models.Model):
         
     def __unicode__(self): return self.name
 
+class BirdingLocation(models.Model):
+    location = models.ForeignKey(Location)
+    name = models.CharField(max_length=50)
+    slug = models.SlugField()
+    date_visited = models.DateTimeField('Date visited',null=True)
+    point = models.PointField()
+    # GeoManager, a subclass that adds a rich set of geospatial queryset methods
+    objects = models.GeoManager()
+        
+    def get_absolute_url(self):
+        return "/birdinglocations/%s/%s/%s/" % (self.state.country.slug, self.state.slug, self.slug)
+
+        
+    def __unicode__(self): return self.name
+
+
 class Route(models.Model):
     name = models.CharField(max_length=200)
     slug = models.SlugField()
diff --git a/config/settings/settings.py b/config/settings/settings.py
index 47b5562..13bcb5e 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -37,7 +37,8 @@ GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29
 # API key for Flickr imports
 FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
 FLICKR_USER_ID = '85322932@N00'
-
+#root url
+BASE_URL = "http://luxagraf.net/"
 #path to the folder that holds the generated html files
 FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
 #media and image URLs for the generated html files
diff --git a/config/settings/settings_dev.py b/config/settings/settings_dev.py
index 010ac31..bb7c21b 100644
--- a/config/settings/settings_dev.py
+++ b/config/settings/settings_dev.py
@@ -29,7 +29,7 @@ SITE_URL = 'http://luxagraf.net/'
 GRAPPELLI_ADMIN_TITLE =  'Luxagraf Admin'
 USE_I18N = False
 USE_L10N = True
-USE_TZ = True
+USE_TZ = False
 
 #API key for Google Maps in Admin 
 MAP_API = "google"
@@ -39,6 +39,7 @@ GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29
 FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
 FLICKR_USER_ID = '85322932@N00'
 
+BASE_URL = "http://127.0.0.1:8000/"
 #path to the folder that holds the generated html files
 FLATFILES_ROOT = os.path.join(PROJ_ROOT, 'site/')
 #media and image URLs for the generated html files
@@ -142,8 +143,8 @@ INSTALLED_APPS = (
     'templatetags',
     'projects',
     'guide',
-    'pages'
-    
+    'pages',
+    'birds'
 )
 DEVELOPMENT = True
 if DEVELOPMENT:
-- 
cgit v1.2.3-70-g09d2


From a73d0e0498f0784859b154840de1da4b0742cc38 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Sun, 26 May 2013 21:58:48 -0400
Subject: fixed bug regarding location data in template code

---
 app/blog/models.py                  | 8 ++++++++
 design/templates/details/entry.html | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'app/blog/models.py')

diff --git a/app/blog/models.py b/app/blog/models.py
index 80ec303..0f73f86 100644
--- a/app/blog/models.py
+++ b/app/blog/models.py
@@ -89,6 +89,14 @@ class Entry(models.Model):
         image_dir, img = self.image.url.split('post-images/')[1].split('/')
         return '%spost-images/%s/%s' %(settings.IMAGES_URL, image_dir, img)
 
+    @property
+    def state(self):
+        return self.location.state
+    
+    @property
+    def country(self):
+        return self.location.state.country
+ 
     @property
     def region(self):
         return self.location.state.country.lux_region
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 5209d09..adc1c1c 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -19,13 +19,13 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
     <article role="main">
         <header>
             <h1>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
             <aside class="geo bl">
-                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}
+                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
                 <meta itemprop="latitude" content="{{object.latitude}}" />
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span>
                 {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
             </aside>
-            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
         </header>
         <div class="post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}">
             {{object.body_html|smartypants|widont|safe}}
-- 
cgit v1.2.3-70-g09d2