From 109cafbcf6a48c175bd8031b8b4bd7aa10407655 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Tue, 24 Jul 2012 23:31:32 -0400 Subject: [PATCH] Starting pro-adams theme. --- .../blogs/themes/pro-adams/base.html | 61 +++++++++++++++++++ .../blogs/themes/pro-adams/list.html | 50 +++++++++++++++ .../blogs/themes/pro-adams/post.html | 39 ++++++++++++ .../blogs/themes/pro-adams/snipt-list.html | 7 +++ blogs/views.py | 25 ++++++-- snipts/models.py | 5 +- 6 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 blogs/templates/blogs/themes/pro-adams/base.html create mode 100644 blogs/templates/blogs/themes/pro-adams/list.html create mode 100644 blogs/templates/blogs/themes/pro-adams/post.html create mode 100644 blogs/templates/blogs/themes/pro-adams/snipt-list.html diff --git a/blogs/templates/blogs/themes/pro-adams/base.html b/blogs/templates/blogs/themes/pro-adams/base.html new file mode 100644 index 0000000..b7abd86 --- /dev/null +++ b/blogs/templates/blogs/themes/pro-adams/base.html @@ -0,0 +1,61 @@ +{% extends "base.html" %} + +{% block body-class %}blog-site{% endblock %} +{% block html-class %}blog-site{% endblock %} + +{% block page-title %}{% if blog_user.username == 'nick' %}// Nick Sergeant {% elif blog_user.username == 'blog' %}// Snipt Blog{% else %}// {{ blog_user.username }}{% endif %}{% endblock %} + +{% block page-description %}{% endblock %} +{% block rochester-made %}{% endblock %} +{% block keyboard-shortcuts %}{% endblock %} +{% block intercom %}{% endblock %} +{% block js %} + {{ block.super }} + window.blog_post = true; +{% endblock %} + +{% block header %} +
+ +
+{% endblock %} +{% block sub-header %} +
+
+
    +
  • //
  • +
  • blog
  • + {% block breadcrumb %}{% endblock %} +
  • + RSS +
  • +
+
+
+{% endblock %} +{% block aside %} + +{% endblock %} diff --git a/blogs/templates/blogs/themes/pro-adams/list.html b/blogs/templates/blogs/themes/pro-adams/list.html new file mode 100644 index 0000000..c9c3de7 --- /dev/null +++ b/blogs/templates/blogs/themes/pro-adams/list.html @@ -0,0 +1,50 @@ +{% extends "blogs/themes/pro-adams/base.html" %} + +{% load pagination_tags %} + +{% block body-class %}{{ block.super }} blog-list{% endblock %} + +{% block js %} + {{ block.super }} + window.detail = false; +{% endblock %} + +{% block content %} +
+ {% autopaginate snipts 10 %} + {% for snipt in snipts %} + {% include "blogs/themes/pro-adams/snipt-list.html" %} + {% empty %} +
+ {{ blog_user.username }} has no public blog posts. +
+ {% endfor %} + {% paginate %} +
+ + +{% endblock %} diff --git a/blogs/templates/blogs/themes/pro-adams/post.html b/blogs/templates/blogs/themes/pro-adams/post.html new file mode 100644 index 0000000..a0ba01a --- /dev/null +++ b/blogs/templates/blogs/themes/pro-adams/post.html @@ -0,0 +1,39 @@ +{% extends "blogs/themes/pro-adams/base.html" %} + +{% block html-class %}blog-site blog-detail{% endblock %} +{% block body-class %}blog-site blog-detail{% endblock %} + +{% block js %} + {{ block.super }} + window.detail = true; +{% endblock %} + +{% block page-title %}// {{ snipt.title }} {{ block.super }}{% endblock %} +{% block breadcrumb %} +
  • // {{ snipt.title }}
  • +{% endblock %} + +{% block content %} +
    + {% with 'true' as detail %} + {% include "blogs/themes/pro-adams/snipt-list.html" %} + {% endwith %} +
    + +
    +{% endblock %} + diff --git a/blogs/templates/blogs/themes/pro-adams/snipt-list.html b/blogs/templates/blogs/themes/pro-adams/snipt-list.html new file mode 100644 index 0000000..bb9c120 --- /dev/null +++ b/blogs/templates/blogs/themes/pro-adams/snipt-list.html @@ -0,0 +1,7 @@ +{% extends "snipts/snipt-list.html" %} + +{% load humanize %} + +{% block aside %}{% endblock %} +{% block author %}{% endblock %} +{% block lexer %}{% endblock %} diff --git a/blogs/views.py b/blogs/views.py index 80ea78f..96695d8 100644 --- a/blogs/views.py +++ b/blogs/views.py @@ -1,12 +1,10 @@ from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext -from annoying.decorators import render_to from annoying.functions import get_object_or_None from snipts.models import Snipt -@render_to('blogs/themes/default/list.html') def blog_list(request, username_or_custom_slug=None): if username_or_custom_slug: @@ -30,9 +28,17 @@ def blog_list(request, username_or_custom_slug=None): context['snipts'] = context['snipts'][:20] return rss(request, context) - return context + if request.blog_user.profile.is_pro: + template = 'blogs/themes/pro-adams/list.html' + else: + template = 'blogs/themes/default/list.html' + + return render_to_response( + template, + context, + context_instance=RequestContext(request) + ) -@render_to('blogs/themes/default/post.html') def blog_post(request, username_or_custom_slug): snipt = get_object_or_404(Snipt, user=request.blog_user, @@ -54,7 +60,16 @@ def blog_post(request, username_or_custom_slug): 'snipt': snipt, } - return context + if request.blog_user.profile.is_pro: + template = 'blogs/themes/pro-adams/post.html' + else: + template = 'blogs/themes/default/post.html' + + return render_to_response( + template, + context, + context_instance=RequestContext(request) + ) def rss(request, context): return render_to_response( diff --git a/snipts/models.py b/snipts/models.py index c566fff..d06e3bc 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -106,7 +106,10 @@ class Snipt(models.Model): if self.blog_post: if self.user.id == 3: - return 'http://nicksergeant.com/{}/'.format(self.slug) + if settings.DEBUG: + return 'http://nick.snipt.localhost/{}/'.format(self.slug) + else: + return 'http://nicksergeant.com/{}/'.format(self.slug) elif self.user.id == 10325: return 'http://snipt.joshhudnall.com/{}/'.format(self.slug) else: