Permalink
Browse files

Updating config. Minor tag reference fix.

  • Loading branch information...
1 parent 82252de commit 5d345aa950343f406b4891b6cc7a7e1f7522907b @DocSavage committed Aug 22, 2008
Showing with 22 additions and 26 deletions.
  1. +15 −23 config.py
  2. +1 −1 handlers/bloog/blog.py
  3. +2 −2 view.py
  4. +4 −0 views/default/bloog/blog/article.html
View
@@ -11,7 +11,7 @@
# Don't change default_blog or default_page to prevent conflicts when merging # Bloog source code updates.
# Do change blog or page dictionaries at the bottom of this config module.
-DEFAULT_BLOG = {
+BLOG = {
"bloog_version": "0.8",
"html_type": "text/html",
"charset": "utf-8",
@@ -43,8 +43,8 @@
#"legacy_blog_software": "Drupal"
}
-DEFAULT_PAGE = {
- "title": DEFAULT_BLOG["title"],
+PAGE = {
+ "title": BLOG["title"],
"navlinks": [
{ "title": "Link", "description": "Short description", "url": "#"},
{ "title": "Link", "description": "Short description", "url": "#"},
@@ -55,9 +55,6 @@
"title": "Bloog Development",
"description": "Get involved",
"entries": [
- { "title": "Announcement",
- "url": "http://billkatz-test.appspot.com",
- "description": "Author's Bloog" },
{ "title": "Source Code",
"url": "http://github.com/DocSavage/bloog",
"description": "GitHub repository" },
@@ -67,10 +64,12 @@
{ "title": "Group",
"url": "http://groups.google.com/group/bloog/topics",
"description": "Developer discussion" },
+ { "title": "Author's Bloog",
+ "url": "http://www.billkatz.com",
+ "description": "What's brewing" },
{ "title": "Architecture Diagram",
"url": "/static/images/architecture2.png",
- "description":
- "How Bloog interacts with clients through REST HTTP" }
+ "description": "RESTful Bloog" }
]
},
"featuredOthersPages": {
@@ -80,22 +79,15 @@
{ "title": "Google App Engine",
"url": "http://code.google.com/appengine/",
"description": "The mothership" },
- { "title": "AppEngine Group",
+ { "title": "App Engine Group",
"url": "http://groups.google.com/group/google-appengine",
- "description": "Google Group for App Engine developers" },
- { "title": "GAE SWF Project",
- "url": "http://gaeswf.appspot.com/",
- "description": "Flash and Flex on Google AppEngine" },
- { "title": "Dev Console",
- "url": "http://localhost:8080/_ah/admin/datastore",
- "description":
- "Your datastore viewer and console if running locally" }
+ "description": "Developer group" },
+ { "title": "App Engine Open Source",
+ "url": "http://groups.google.com/group/google-appengine/web/google-app-engine-open-source-projects",
+ "description": "Code!" },
+ { "title": "App Engine Console",
+ "url": "http://appengine.google.com",
+ "description": "Your apps" }
]
},
}
-
-# Customize the following two dictionaries to tailor this Bloog to your taste.
-# The view will preferentially use 'blog' and 'page' dictionaries.
-
-BLOG = DEFAULT_BLOG
-PAGE = DEFAULT_PAGE
View
@@ -90,7 +90,7 @@ def get_format(format_string):
return format_string
def get_tag_key(tag_name):
- obj = models.blog.Tag.get_or_insert(tag_name.lower())
+ obj = models.blog.Tag.get_or_insert(tag_name)
return obj.key()
def process_tag(tag_name, tags):
View
@@ -160,10 +160,10 @@ def full_render(self, handler, template_info, more_params):
"user_is_admin": users.is_current_user_admin(),
"login_url": users.create_login_url(handler.request.uri),
"logout_url": users.create_logout_url(handler.request.uri),
- "blog": config.BLOG or config.DEFAULT_BLOG,
+ "blog": config.BLOG,
"blog_tags": tags
}
- template_params.update(config.PAGE or config.DEFAULT_PAGE)
+ template_params.update(config.PAGE)
template_params.update(more_params)
return template.render(template_info['file'], template_params,
debug=config.DEBUG,
@@ -83,3 +83,7 @@
{% endblock %}
+{% if two_columns %}
+{% block third_column %}
+{% endblock %}
+{% endif %}

0 comments on commit 5d345aa

Please sign in to comment.