diff --git a/blogs/middleware.py b/blogs/middleware.py index bea1079..9e68b86 100644 --- a/blogs/middleware.py +++ b/blogs/middleware.py @@ -35,3 +35,6 @@ class BlogMiddleware: if host == 'nicksergeant.com': request.blog_user = User.objects.get(id=3) + + if host == 'ashleysergeant.com': + request.blog_user = User.objects.get(id=18) diff --git a/blogs/templates/blogs/themes/default/rss.xml b/blogs/templates/blogs/themes/default/rss.xml index e56bd56..51243fd 100644 --- a/blogs/templates/blogs/themes/default/rss.xml +++ b/blogs/templates/blogs/themes/default/rss.xml @@ -5,6 +5,11 @@ Nick Sergeant Nick Sergeant http://nicksergeant.com/?rss + {% elif request.blog_user.username == 'ashley' %} + + Ashley Sergeant + Ashley Sergeant + http://ashleysergeant.com/?rss {% elif request.blog_user.username == 'rochacbruno' %} Bruno Cezar Rocha diff --git a/blogs/templates/blogs/themes/pro-adams/base.html b/blogs/templates/blogs/themes/pro-adams/base.html index 154abaf..de03e63 100644 --- a/blogs/templates/blogs/themes/pro-adams/base.html +++ b/blogs/templates/blogs/themes/pro-adams/base.html @@ -52,13 +52,20 @@ Nick Sergeant {% elif blog_user.username == 'blog' %} Snipt Blog + {% elif blog_user.username == 'ashley' %} + Ashley Sergeant {% else %} {{ blog_user.username }} {% endif %} -

- I'm a front-end web developer in Rochester, NY working on the Amara project for PCF. I also created Snipt. -

+ {% if blog_user.username == 'nick' %} +

+ I'm a front-end web developer in Rochester, NY working on the Amara project for PCF. I also created Snipt. +

+ {% endif %} + {% if blog_user.username == 'ashley' %} +

Life is like photography, we use
the negatives to develop.

+ {% endif %} {% endblock %} @@ -67,37 +74,48 @@ {% block content %}{% endblock %} diff --git a/blogs/views.py b/blogs/views.py index 168ebc3..37f950a 100644 --- a/blogs/views.py +++ b/blogs/views.py @@ -41,7 +41,7 @@ def blog_list(request, username_or_custom_slug=None): context['snipts'] = context['snipts'][:20] return rss(request, context) - if request.blog_user.profile.is_pro and request.blog_user.username == 'nick': + if request.blog_user.profile.is_pro and request.blog_user.username in ['nick', 'ashley']: template = 'blogs/themes/pro-adams/list.html' else: template = 'blogs/themes/default/list.html' @@ -84,7 +84,7 @@ def blog_post(request, username_or_custom_slug): 'snipt': snipt, } - if request.blog_user.profile.is_pro and request.blog_user.username == 'nick': + if request.blog_user.profile.is_pro and request.blog_user.username in ['nick', 'ashley']: template = 'blogs/themes/pro-adams/post.html' else: template = 'blogs/themes/default/post.html' diff --git a/snipts/models.py b/snipts/models.py index 8d413c2..74b7274 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -120,6 +120,8 @@ class Snipt(models.Model): return 'http://nick.snipt.localhost/{}/'.format(self.slug) else: return 'http://nicksergeant.com/{}/'.format(self.slug) + elif self.user.id == 18: + return 'http://ashleysergeant.com/{}/'.format(self.slug) elif self.user.id == 2156: return 'http://rochacbruno.com.br/{}/'.format(self.slug) elif self.user.id == 10325: @@ -143,6 +145,8 @@ class Snipt(models.Model): return 'http://nick.snipt.localhost/{}/'.format(self.slug) else: return 'http://nicksergeant.com/{}/'.format(self.slug) + elif self.user.id == 18: + return 'http://ashleysergeant.com/{}/'.format(self.slug) elif self.user.id == 2156: return 'http://rochacbruno.com.br/{}/'.format(self.slug) elif self.user.id == 10325: