diff --git a/.gitignore b/.gitignore index 7ca3969..3b968e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc init.sql +blog.cfg .ropeproject diff --git a/blog.py b/blog.py index 2763033..2bc1842 100755 --- a/blog.py +++ b/blog.py @@ -52,13 +52,13 @@ def db(self): def write_error(self, status_code, **kwargs): if status_code == 400: error = "400: Bad Request" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) if status_code == 405: error = "405: Method Not Allowed" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) if status_code == 404: error = "404: Page Not Found" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) def get_current_user(self): return self.get_secure_cookie('user') @@ -76,7 +76,9 @@ def get(self): page = p.page(1) isAdmin = self.isAdmin() label_list = Label.group(self.db) - self.render('index.html', articles=page.object_list, label_list=label_list, isAdmin=isAdmin, page=page) + self.render('index.html', articles=page.object_list, label_list=label_list, + isAdmin=isAdmin, page=page, home_title=options.home_title, + user=options.user, photo=options.photo) class ArticleListHandler(BaseHandler): @@ -85,7 +87,9 @@ def get(self, pageId): page = p.page(int(pageId)) isAdmin = self.isAdmin() label_list = Label.group(self.db) - self.render('index.html', articles=page.object_list, label_list=label_list, isAdmin=isAdmin, page=page) + self.render('index.html', articles=page.object_list, label_list=label_list, + isAdmin=isAdmin, page=page, home_title=options.home_title, + user=options.user, photo=options.photo) class ArticleHandler(BaseHandler): @@ -93,13 +97,14 @@ def get(self, id): article = Article.get(self.db, id) if article is None: error = '404: Page Not Found' - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) else: isAdmin = self.isAdmin() label_list = Label.group(self.db) blog_hostname = options.blog_hostname self.render('article.html', article=article, label_list=label_list, - blog_hostname=blog_hostname, isAdmin=isAdmin) + blog_hostname=blog_hostname, isAdmin=isAdmin, home_title=options.home_title, + user=options.user, photo=options.photo) class PreviewHandler(BaseHandler): @@ -121,7 +126,8 @@ def post(self): data['labels'] = self.get_argument('labels') data['content'] = content_md - self.render('preview.html', article=article, data=data) + self.render('preview.html', article=article, data=data, + user=options.user, photo=options.photo) class EditArticleHandler(BaseHandler): @@ -130,7 +136,7 @@ def get(self, id): article = Article.get(self.db, id) if article is None: error = '404: Page Not Found' - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) else: labels = ' '.join(map(lambda item: '[' + item['detail'] + ']', article['labels'])) self.render('editArticle.html', article=article, labels=labels) @@ -155,7 +161,7 @@ def post(self, id): self.redirect('/article/' + id, permanent=True) except: error = "The post data invalid" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) class CreateArticleHandler(BaseHandler): @@ -180,7 +186,7 @@ def post(self): self.redirect('/', permanent=True) except: error = "The post data invalid" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) class SearchHandler(BaseHandler): @@ -196,7 +202,9 @@ def get(self): isAdmin = self.isAdmin() label_list = Label.group(self.db) - self.render('search.html', articles=page.object_list, label_list=label_list, isAdmin=isAdmin, page=page) + self.render('search.html', articles=page.object_list, label_list=label_list, + isAdmin=isAdmin, page=page, home_title=options.home_title, + user=options.user, photo=options.photo) class LoginHandler(BaseHandler): @@ -227,7 +235,7 @@ def post(self): self.redirect('/login', permanent=True) except: error = "The user not exists" - self.render('error.html', error=error) + self.render('error.html', error=error, home_title=options.home_title) def validate(self, username): regex = re.compile(r'^[\w\d]+$') @@ -246,6 +254,9 @@ def main(): define("mysql_user", default=mysql['user']) define("mysql_password", default=mysql['password']) define("blog_hostname", default=blog['hostname']) + define("user", default=blog['user']) + define("home_title", default=blog['home_title']) + define("photo", default=blog['photo']) http_server = tornado.httpserver.HTTPServer(Application()) http_server.listen(options.port) diff --git a/install.py b/install.py index 32cd602..ad7f22c 100755 --- a/install.py +++ b/install.py @@ -73,10 +73,23 @@ hostname = raw_input('请输入博客域名: ') port = raw_input('请输入程序监听的端口号: ') + user = raw_input('请输入博主的名字（默认: Adonis Ling）: ') + home_title = raw_input("请输入主页的标题（默认: Adonis's Blog ）: ") + photo = raw_input('请输入博主头像的文件名(默认: talent.jpg）') + + if len(user) == 0: + user = 'Adonis Ling' + if len(home_title) == 0: + home_title = "Adonis's Blog" + if len(photo) == 0: + photo = 'talent.jpg' config.add_section('blog') config.set('blog', 'hostname', hostname) config.set('blog', 'port', port) + config.set('blog', 'user', user) + config.set('blog', 'home_title', home_title) + config.set('blog', 'photo', photo) with open('blog.cfg', 'w') as cfg: config.write(cfg) diff --git a/templates/base.html b/templates/base.html index a77688a..bfdb573 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,7 +1,7 @@ - + diff --git a/templates/editArticle.html b/templates/editArticle.html index 0b73423..a773342 100644 --- a/templates/editArticle.html +++ b/templates/editArticle.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% block title %} -Post an Article +Edit an Article {% end %} {% block content %} diff --git a/templates/error.html b/templates/error.html index daa0036..fd64a6d 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %} -Adonis's Blog +{{ home_title }} {% end %} {% block content %} diff --git a/templates/index.html b/templates/index.html index 8fe5c05..0c883c4 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,15 +1,15 @@ {% extends "base.html" %} {% block title %} -Adonis's Blog +{{ home_title }} {% end %} {% block content %}