templates/config.html
utils.py
@@ -10,9 +10,4 @@ handlers:
script: webapp.py
- url: /new
script: webapp.py
- login: admin
-- url: /shooin
- script: shooin.py
- login: admin
-
-
+ login: admin
\ No newline at end of file
app.yaml
@@ -15,7 +15,7 @@ from google.appengine.api import users
import functools
import os
from lib import utils, markdown2, BeautifulSoup
-from requesthandler import TehRequestHandler
+from utils import TehRequestHandler, administrator
import shooin
class Entry(db.Model):
@@ -35,20 +35,6 @@ class Entry(db.Model):
if self.static == False: return '/entry/'+self.slug
else: return '/'+self.slug
-def administrator(method):
- @functools.wraps(method)
- def wrapper(self, *args, **kwargs):
- user = users.get_current_user()
- if not user:
- if self.request.method == "GET":
- self.redirect(users.create_login_url(self.request.uri))
- return
- if not users.is_current_user_admin():
- raise webapp.Error(403)
- else:
- return method(self, *args, **kwargs)
- return wrapper
-
class EntryIndexHandler(TehRequestHandler):
def get(self):
entries = Entry.all().filter("static =", False)
blog.py
@@ -16,7 +16,7 @@ from google.appengine.api import users
from google.appengine.api import urlfetch
import os
from lib import utils, markdown2, BeautifulSoup
-from requesthandler import TehRequestHandler
+from utils import TehRequestHandler
from blog import Entry
from lib import demjson
from StringIO import StringIO
shooin.py
@@ -56,6 +56,12 @@ form {
top: 15px;
}
+#logo a span{
+ font-size:1.5em;
+ color:#fff;
+ text-decoration:none;
+}
+
#feed {
position: absolute;
top: 12px;
@@ -98,7 +104,10 @@ form {
}
.full .entry h1 a,
-.full .entry h1 a:visited {
+.full .entry h1 a:visited,
+.full .entry h2 a,
+.full .entry h2 a:visited,
+ {
text-decoration: none;
color: #222222;
}
static/css/base.css
@@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>
+<title>{{config.title}} |
{% block title %}
- TEH - minimalist blog tool powered by Google App Engine
+ minimalist blog tool powered by Google App Engine
{% endblock %}
</title>
{% block css %}
@@ -17,7 +17,10 @@
<body>
<div id="header">
<div id="logo">
- <a href="/"><img src="/static/images/logo.png" alt="Teh blog"/></a>
+ <a href="/">
+ <!-- img src="/static/images/logo.png" alt="Teh blog"/ -->
+ <span>{{config.title}}</span>
+ </a>
</div><!-- logo -->
<div id="feed"><a href="http://teh.appspot.com/feed">
<img src="/static/images/feed.png" alt="Subscribe to this blog"/></a>
@@ -53,6 +56,9 @@
<div id="footer">
©2008 Teh blog - <a href="/about">About Teh</a> - <a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons License</a>
+ {% block extrafooter %}
+
+ {% endblock %}
</div>
<!--
Layout for Teh blog app - http://teh.appspot.com
templates/base.html
@@ -7,6 +7,31 @@
<div class="body">
{{entry.body_html}}
</div><!-- body -->
+ {% if config.disqus %}
+ <div class="entrycomment">
+ <a href="{{entry.url}}#disqus_thread">Comments</a>
+ </div><!-- entrycomment -->
+ {% endif %}
</div><!-- entry -->
{% endfor %}
+{% endblock %}
+
+{% block extrafooter %}
+{% if config.disqus %}
+ <script type="text/javascript">
+ //<![CDATA[
+ (function() {
+ var links = document.getElementsByTagName('a');
+ var query = '?';
+ for (var i = 0; i < links.length; i++) {
+ if (links[i].href.indexOf('#disqus_thread') >= 0) {
+ query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+ }
+ }
+ document.write('<script type="text/javascript" src="http://disqus.com/forums/{{config.disqus}}/get_num_replies.js' + query + '"></' + 'script>');
+ })();
+ //]]>
+ </script>
+
+ {% endif %}
{% endblock %}
\ No newline at end of file
templates/home.html
@@ -1,4 +1,7 @@
{% extends "base.html" %}
+{% block title %}
+{{entry.title}}
+{% endblock %}
{% block content %}
<div class="entry">
<h1><a href="{{entry.url}}">{{entry.title}}</a></h1>
@@ -11,10 +14,17 @@
{% endfor %}
</div><!-- tags -->
</div><!-- body -->
+<div id="disqus_thread"></div>
<div id="controls">
{% if users.is_current_user_admin %}
<a href="{{entry.url}}/edit">edit</a> | <a href="{{entry.url}}/del">delete</a>
{% endif %}
</div><!-- controls -->
</div><!-- entry -->
+{% endblock %}
+
+{% block extrafooter %}
+ {% if config.disqus %}
+ <script type="text/javascript" src="http://disqus.com/forums/{{config.disqus}}/embed.js"></script>
+ {% endif %}
{% endblock %}
\ No newline at end of file
templates/page.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "formbase.html" %}
{% block title %}
Data importer
{% endblock %}
templates/shooin.html
@@ -12,10 +12,10 @@ from google.appengine.ext import webapp
from google.appengine.ext import db
from google.appengine.ext.webapp import template
from google.appengine.api import users
-import functools
+
import os
from lib import utils, markdown2, BeautifulSoup
-from requesthandler import TehRequestHandler
+from utils import TehRequestHandler, administrator, Config
import shooin
import blog
@@ -42,13 +42,26 @@ class HomePageHandler(TehRequestHandler):
entries.order('-published').fetch(limit=5)
self.render("templates/home.html", entries=entries)
-
+class ConfigHandler(TehRequestHandler):
+ @administrator
+ def get(self):
+ self.render("templates/config.html")
+ @administrator
+ def post(self):
+ config = Config.all()
+ config = config.fetch(1)[0]
+ config.title = self.request.get("title")
+ config.disqus = self.request.get("disqus")
+ config.put()
+ self.redirect('/')
+
def main():
application = webapp.WSGIApplication([
(r"/", HomePageHandler),
(r"/login", LoginHandler),
(r"/logout", LogoutHandler),
-
+ (r"/config", ConfigHandler),
+
(r"/entries", blog.EntryIndexHandler),
(r"/feed", blog.FeedHandler),
(r"/entry/([^/]+)", blog.EntryHandler),
@@ -59,9 +72,16 @@ def main():
(r"/new", blog.NewEntryHandler),
(r"/topic/([^/]+)", blog.TagHandler),
(r"/shooin/([^/]+)", shooin.ShooinHandler),
-
(r"/([^/]+)", blog.PageHandler),
], debug=True)
+
+ config = Config.all()
+ if config.count() > 0:
+ config = config.fetch(1)[0]
+ else:
+ config1 = Config(title="TEH Blog")
+ config1.put()
+
wsgiref.handlers.CGIHandler().run(application)
if __name__ == "__main__":
webapp.py
requesthandler.py
e638a455ff4e6a854dbedfff8d75a0bdbcb58dc9
btbytes
pradeep@btbytes.com
http://github.com/btbytes/teh/commit/d428f76f0ad8e6d85320fc35239383ff9ff266e0
d428f76f0ad8e6d85320fc35239383ff9ff266e0
2008-04-30T21:32:14-07:00
2008-04-30T21:32:14-07:00
disqus enabled commenting works; configuration works
17ceb54f9297ea472a235158d8bc8bdf5d1c0512
btbytes
pradeep@btbytes.com