.gitignore
sneeu/media/img/brightkite.png
sneeu/media/img/delicious.png
sneeu/media/img/flickr.png
sneeu/media/img/googlereader.png
sneeu/media/img/lastfm.png
sneeu/media/img/logo.png
sneeu/media/img/twitter.png
sneeu/templates/pages/colophon.html
sneeu/templates/pages/john.html
@@ -5,11 +5,11 @@ import views
urlpatterns = patterns('',
- url(r'^$', views.post_list),
+ url(r'^blog/$', views.post_list),
url(r'^blog/(?P<year>\d{4})/(?P<month>1[012]?|[2-9])/(?P<slug>[^/]+)/$',
views.post_detail, name='post_detail'),
- url(r'^blog/(?P<year>\d{4})/(?P<month>1[012]?|[2-9])/(?P<slug>[^/]+)/add-comment/$',
- views.add_comment, name='add_comment'),
+ # url(r'^blog/(?P<year>\d{4})/(?P<month>1[012]?|[2-9])/(?P<slug>[^/]+)/add-comment/$',
+ # views.add_comment, name='add_comment'),
url(r'^blog/(?P<url>[a-z]+)/$', 'django.contrib.syndication.views.feed',
{'feed_dict': feeds.FEEDS}),
)
\ No newline at end of file
sneeu/apps/blog/urls.py
@@ -4,7 +4,6 @@ import views
urlpatterns = patterns('',
- url(r'^john/$', views.john),
url(r'^404/$', views.four_oh_four),
url(r'^500/$', views.five_hundred),
)
\ No newline at end of file
sneeu/apps/core/urls.py
@@ -9,7 +9,3 @@ def four_oh_four(request):
def five_hundred(request):
raise RuntimeError
-
-
-def john(request):
- return render_to_response('core/john.html', {}, RequestContext(request))
\ No newline at end of file
sneeu/apps/core/views.py
@@ -2,62 +2,43 @@
body {
background: #fff;
- color: #444;
- font: 100%/1.5em "Lucida Grande","Lucida Sans",sans-serif;
-}
-a,
-a:visited {
- color: #ec972e;
- text-decoration: none;
-}
-a:hover {
- border-bottom: 1px solid;
- color: #f2bb36;
- padding-bottom: 1px;
+ color: #0072c6;
+ font: 100%/1.5 "Cambria","Georgia";
+ margin: 0 auto;
+ padding: 2em;
+ width: 1024px;
}
+
h1 {
- color: #999;
- font-size: 2em;
- line-height: 1.5em;
- padding: 0 0 0.75em;
- text-align: center;
+ float: left;
+}
+h1 a {
+ background: #fff url(../img/logo.png) no-repeat center center;
+ border: 16px solid #fff;
+ float: left;
+ height: 63px;
+ padding: 16px;
+ text-indent: -9999px;
+ width: 146px;
}
-h2 {
- color: #666;
- font-size: 1.25em;
- line-height: 1.2em;
- padding: 1.2em 0;
- text-align: center;
+h1 a:hover {
+ border-color: #ddd;
}
-h3 {
- font-weight: bold;
+h2 {
+ font-size: 2em;
}
-p, ol, ul {
+p {
padding: 0 0 1.5em;
}
-ol {
- list-style: lower-roman;
-}
-ul {
- list-style: disc;
-}
-blockquote {
- color: #666;
- font-style: italic;
- padding: 0 0 1.5em 3em;
-}
-code {
- font: 100%/0.1em "Lucida Console","Monaco",monospace;
-}
-q {
- color: #666;
- font-style: italic;
+a {
+ background: #ddd;
+ color: #0072c6;
+ margin: 0 -0.15em;
+ padding: 0.15em;
+ -webkit-border-radius: 0.2em;
}
-q:before {
- content: "“";
-}
-q:after {
- content: "”";
+a:hover {
+ color: #be0026;
}
em {
font-style: italic;
@@ -66,138 +47,73 @@ strong {
font-weight: bold;
}
-form label {
- display: block;
-}
-form .textinput input {
- border: 1px solid #bbb;
- color: #444;
- font: 100%/1.5em "Lucida Grande","Lucida Sans",sans-serif;
- margin: -2px -1px 1.5em;
- padding: 0.75em;
-}
-form .textarea textarea {
- border: 1px solid #bbb;
- color: #444;
- font: 100%/1.5em "Lucida Grande","Lucida Sans",sans-serif;
- margin: -2px -1px 1.5em;
- padding: 0.75em;
-}
-form .submit button {
- border: 1px solid #bbb;
- color: #444;
- font: 100%/1.5em "Lucida Grande","Lucida Sans",sans-serif;
- margin: -2px -1px 1.5em;
- padding: 0.75em;
-}
-form .submit button:after {
- content: " »";
-}
-form .errors {
- color: #e43d24;
- list-style: none;
- margin: 0;
- padding: 0;
+.frame {
+ border: 0.2em solid #ddd;
+ display: inline-block;
+ line-height: 0;
+ padding: 0.3em;
}
-.caps {
- font-variant: small-caps;
- letter-spacing: 0.1em;
- text-transform: lowercase;
+
+.hfeed .logentry {
+ background-position: 0 0.5em;
+ background-repeat: no-repeat;
+ margin-left: -48px;
+ padding-left: 48px;
+ padding-bottom: 1.5em;
}
-.hfeed {
- list-style: none;
+.hfeed .meta {
+ padding-bottom: 0;
}
-.hentry {
- padding-bottom: 1.5em;
+.hfeed .author {
+ display: none;
}
-.meta {
- color: #bbb;
- display: block;
- font-size: 0.75em;
- line-height: 2em;
- margin-top: -2em;
+.hfeed .meta {
+ color: #aaa;
padding: 0;
- text-align: center;
}
-.comment_stat {
- text-align: center;
+
+.brightkite {
+ background-image: url(../img/brightkite.png);
}
-.entry-content {
- text-align: left;
+.twitter {
+ background-image: url(../img/twitter.png);
}
-.entry-content .standfirst {
- font-style: italic;
+.delicious {
+ background-image: url(../img/delicious.png);
}
-.blogpost .author {
- display: none;
+.googlereader {
+ background-image: url(../img/googlereader.png);
}
-.comment_list {
- list-style: none;
+.lastfm {
+ background-image: url(../img/lastfm.png);
}
-.comment {
- border-top: 1px solid #bbb;
- margin-top: -1px;
- padding-top: 1.5em;
+.flickr {
+ background-image: url(../img/flickr.png);
}
-.comment h3 {
- color: #999;
- font-style: italic;
+
+#introduction {
+ border-bottom: 1px dotted #bbb;
+ margin: -1px 0 1.5em;
+ padding-bottom: 1.5em;
}
-.frame {
- text-align: center;
+#introduction p {
+ background: #ddd;
+ display: inline;
+ font-size: 2em;
+ margin-right: 0.3em;
+ padding: 0;
}
-.frame a img {
- border: 1px solid #bbb;
- padding: 1px;
+#introduction p:after {
+ color: #aaa;
+ content: " ¶";
}
-.frame .caption {
+#introduction p .amp {
+ font-family: Baskerville,Palatino,"Book Antiqua",serif;
font-style: italic;
}
-.paginator {
- font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
- text-align: center;
-}
-.download_vcard a {
- background: url(../img/hcard-download.png) no-repeat center center;
- float: right;
- height: 3em;
- text-indent: -9999px;
- width: 3em;
-}
-.download_vcard a:hover {
- border: 1px solid #bbb;
- margin: -1px;
-}
+
#interest {
- margin: 3em auto;
- padding: 0 1.5em;
- width: 48em;
-}
-#feed {
- background: #fff;
- margin-bottom: -1.5em;
- padding: 0 1.5em;
-}
-#feed a {
- background: url(../img/rss.png) no-repeat left center;
- border: 0;
- color: #fff;
- display: block;
- height: 1.5em;
- margin: 0 auto;
- padding: 0.75em 0;
- text-indent: 48px;
- width: 48em;
-}
-#feed a span {
- display: none;
-}
-#feed a:hover {
- color: #ec972e;
-}
-#feed a:hover span {
- border-bottom: 1px solid;
- display: inline;
- padding-bottom: 1px;
-}
+ float: right;
+ width: 752px;
+}
\ No newline at end of file
sneeu/media/css/base.css
@@ -24,17 +24,13 @@
</head>
<body>
- <p id="feed">
- <a href="http://feeds.feedburner.com/sneeu"><span>You might like my RSS feed!</span></a>
- </p>
-
- <div id="interest">
- {% block body %}
- <h1><a href="/">{{ site.name }}</a></h1>
+ {% block body %}
+ <h1 id="branding"><a href="/">{{ site.name }}</a></h1>
+ <div id="interest">
{% block content %}{% endblock %}
- {% endblock %}
- </div>
+ </div>
+ {% endblock %}
</body>
</html>
sneeu/templates/base.html
@@ -16,7 +16,7 @@
{% if object.standfirst %}<p class="standfirst">{{ object.standfirst|safe }}</p>{% endif %}
{{ object.copy|typogrify|safe }}
</div>
- <p class="author vcard"><a href="{% url apps.core.views.john %}" class="url"><abbr class="fn" title="John Sutherland">John</abbr></a></p>
+ <p class="author vcard"><a href="/{{ post.author.username }}/" class="url"><abbr class="fn" title="{{ post.author.get_full_name }}">{{ post.author.first_name }}</abbr></a></p>
</div>
{% if object.postcomment_set.all %}
@@ -32,6 +32,7 @@
</ol>
{% endif %}
+{% comment %}
{% if object.comments_open %}
<form action="{{ object.get_add_comment_url }}" method="post">
<p>Add your comment, URL is not required.</p>
@@ -45,5 +46,6 @@
{% else %}
<p>Sorry, comments are closed for this post.</p>
{% endif %}
+{% endcomment %}
{% endblock %}
sneeu/templates/blog/post_detail.html
@@ -29,8 +29,8 @@
{{ post.copy|typogrify|safe }}
{% endif %}
</div>
- <p class="author vcard"><a href="{% url apps.core.views.john %}" class="url"><abbr class="fn" title="John Sutherland">John</abbr></a></p>
- <p class="comment_stat">{% if post.comments_open %}(<a href="{{ post.get_absolute_url }}"><abbr title="{{ post.postcomment_set.all|length }} comments">{{ post.postcomment_set.all|length }}</abbr></a>){% else %}<abbr title="Comments are closed">—</abbr>{% endif %}</p>
+ <p class="author vcard"><a href="/{{ post.author.username }}/" class="url"><abbr class="fn" title="{{ post.author.get_full_name }}">{{ post.author.first_name }}</abbr></a></p>
+ {#<p class="comment_stat">{% if post.comments_open %}(<a href="{{ post.get_absolute_url }}"><abbr title="{{ post.postcomment_set.all|length }} comments">{{ post.postcomment_set.all|length }}</abbr></a>){% else %}<abbr title="Comments are closed">—</abbr>{% endif %}</p>#}
</li>
{% endfor %}
</ol>
sneeu/templates/blog/post_list.html
@@ -17,27 +17,33 @@
{% block content %}
+ {% if not page_obj.has_previous %}
+ <div id="introduction">
+ <p>Finally, the website <a href="/john/">I've</a> been dreaming about for months—nay years—is finally here. Read about <a href="/colophon/">how it works</a>.</p>
+ </div>
+ {% endif %}
+
<ol class="hfeed">
{% for log in page_obj.object_list %}
- <li class="logentry">
+ <li class="logentry {{ log.service.ff_id }}">
<h2><a rel="bookmark" href="{{ log.link }}">{{ log.title|typogrify|safe }}</a></h2>
- <p class="meta"><abbr class="published updated" title="{{ log.published|iso8601 }}">{{ log.published|date:"d/N/Y" }}</abbr></p>
+ <p class="meta"><abbr class="published updated" title="{{ log.published|iso8601 }}">{{ log.published|timesince }} ago</abbr></p>
<div class="entry-content">
{% if log.media_set.all %}
{% for media in log.media_set.all %}
- <p>[Media]</p>
+ <div class="frame"><img src="{{ media.url }}" /></div>
{% endfor %}
{% endif %}
</div>
- <p class="author vcard"><a href="{% url apps.core.views.john %}" class="url"><abbr class="fn" title="John Sutherland">John</abbr></a></p>
+ <p class="author vcard"><a href="/john/" class="url"><abbr class="fn" title="John Sutherland">John</abbr></a></p>
</li>
{% endfor %}
</ol>
{% if page_obj.has_next or page_obj.has_previous %}
<p class="paginator">
- {% if page_obj.has_previous %}<a class="previous" href="{% ifequal page_obj.previous_page_number 1 %}.{% else %}?page={{ page_obj.previous_page_number }}{% endifequal %}" rel="prev" title="Newer">←</a>{% endif %}
- {% if page_obj.has_next %}<a class="next" href="?page={{ page_obj.next_page_number }}" rel="next" title="Older">→</a>{% endif %}
+ {% if page_obj.has_previous %}<a class="previous" href="{% ifequal page_obj.previous_page_number 1 %}.{% else %}?page={{ page_obj.previous_page_number }}{% endifequal %}" rel="prev" title="Newer">←Newer </a>{% endif %}
+ {% if page_obj.has_next %}<a class="next" href="?page={{ page_obj.next_page_number }}" rel="next" title="Older">Older →</a>{% endif %}
</p>
{% endif %}
sneeu/templates/tumble/log_list.html
@@ -10,6 +10,7 @@ urlpatterns = patterns('',
(r'^admin/(.*)', admin.site.root),
(r'^books/', include('apps.ebooks.urls')),
(r'^', include('apps.blog.urls')),
+ (r'^', include('apps.tumble.urls')),
(r'^', include('apps.core.urls')),
(r'^', include('apps.pages.urls')),
)
sneeu/urls.py
sneeu/templates/core/john.html
b9b8e3d295fef0914729d61821c1ad08fe48ab3c
John Sutherland
john@sneeu.com
http://github.com/sneeu/sneeu_com/commit/062dc9f5fc522af8dbd73715c971bc726f36b70c
062dc9f5fc522af8dbd73715c971bc726f36b70c
2008-11-11T16:15:43-08:00
2008-11-11T16:15:43-08:00
Literally a lot of work.
a5e7a05a428d8c73bf7268a50842180a56f7495d
John Sutherland
john@sneeu.com