[Projeler-commits] r181 - in zangetsu: . blog blog/templatetags locale/tr/LC_MESSAGES templates templates/blog templates/feeds
projeler-uludag at uludag.org.tr
projeler-uludag at uludag.org.tr
2 Eki 2006 Pzt 03:14:57 EEST
Author: caglar
Date: Mon Oct 2 03:14:57 2006
New Revision: 181
Added:
zangetsu/AUTHORS
zangetsu/templates/feeds/
zangetsu/templates/feeds/atom_description.html
zangetsu/templates/feeds/atom_title.html
zangetsu/templates/feeds/rss_description.html
zangetsu/templates/feeds/rss_title.html
Modified:
zangetsu/blog/feeds.py
zangetsu/blog/models.py
zangetsu/blog/templatetags/library.py
zangetsu/locale/tr/LC_MESSAGES/django.po
zangetsu/settings.py
zangetsu/templates/base.html
zangetsu/templates/blog/entry_brief.html
zangetsu/templates/blog/entry_detail.html
zangetsu/urls.py
Log:
untested patch from Bahadır to remove hardcoded values and atom/rss improvements
Modified: zangetsu/blog/feeds.py
=================================================================
--- zangetsu/blog/feeds.py (original)
+++ zangetsu/blog/feeds.py Mon Oct 2 03:14:57 2006
@@ -3,15 +3,16 @@
from django.utils.feedgenerator import Atom1Feed
from zangetsu.blog.models import Entry
from zangetsu.blog import defaults
+from zabgetsu.blog import WEB_URL
class RssFeed(Feed):
title = defaults.BLOG_NAME
- link = '/blog/feeds/rss/'
+ link = '%s/blog/feeds/rss/' % WEB_URL
description = defaults.BLOG_DESC
def items(self):
return Entry.objects.order_by('-pubdate')[:10]
class AtomFeed(RssFeed):
- link = '/blog/feeds/atom/'
+ link = '%s/blog/feeds/atom/' % WEB_URL
feed_type = Atom1Feed
Modified: zangetsu/blog/models.py
=================================================================
--- zangetsu/blog/models.py (original)
+++ zangetsu/blog/models.py Mon Oct 2 03:14:57 2006
@@ -3,40 +3,49 @@
class Link(models.Model):
- title = models.CharField(maxlength = 64)
- url = models.URLField()
+ title = models.CharField(maxlength = 64, verbose_name=_('title'))
+ url = models.URLField(verbose_name=_('url'))
def __str__(self):
return self.title
+ class Meta:
+ verbose_name = _('link')
+ verbose_name_plural = _('links')
+
class Admin:
list_display = ['title']
class Tag(models.Model):
- title = models.CharField(maxlength = 32)
+ title = models.CharField(maxlength = 32, verbose_name=_('title'))
def __str__(self):
return self.title
+ class Meta:
+ verbose_name = _("tag")
+ verbose_name_plural = _("tags")
+
class Admin:
list_display = ('id', 'title')
class Entry(models.Model):
- title = models.CharField(maxlength = 256)
- content = models.TextField()
- tag = models.ManyToManyField(Tag)
- pubdate = models.DateTimeField()
+ title = models.CharField(maxlength = 256, verbose_name=_('title'))
+ content = models.TextField(verbose_name=_('content'))
+ tag = models.ManyToManyField(Tag, verbose_name=_('tag'))
+ pubdate = models.DateTimeField(verbose_name=_('publish date'))
def __str__(self):
return self.title
def get_absolute_url(self):
- return '/blog/%s/%s/' % (self.pubdate.strftime('%Y/%m/%d').lower(), self.id)
+ return '%s/blog/%s/%s/' % (WEB_URL, self.pubdate.strftime('%Y/%m/%d').lower(), self.id)
class Meta:
- pass
+ verbose_name = _("entry")
+ verbose_name_plural = _("entries")
class Admin:
list_display = ('id', 'title', 'pubdate')
Modified: zangetsu/blog/templatetags/library.py
=================================================================
--- zangetsu/blog/templatetags/library.py (original)
+++ zangetsu/blog/templatetags/library.py Mon Oct 2 03:14:57 2006
@@ -2,6 +2,7 @@
from django.template import Library,Node
from zangetsu.blog.models import Entry, Tag, Link
from zangetsu.blog import defaults
+from zangetsu.setting import WEB_URL
register = Library()
@@ -9,6 +10,7 @@
def render(self, context):
context['blog_name'] = defaults.BLOG_NAME
context['blog_desc'] = defaults.BLOG_DESC
+ context['blog_url'] = '%s/blog' % WEB_URL
return ''
class LinkMenuObject(Node):
Modified: zangetsu/locale/tr/LC_MESSAGES/django.po
=================================================================
--- zangetsu/locale/tr/LC_MESSAGES/django.po (original)
+++ zangetsu/locale/tr/LC_MESSAGES/django.po Mon Oct 2 03:14:57 2006
@@ -1,13 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
+# Django
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-25 22:20+0300\n"
+"POT-Creation-Date: 2006-10-02 01:23+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Turkish LL at li.org>\n"
@@ -15,18 +15,58 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: templates/base.html:53
+#: blog/models.py:7 blog/models.py:22 blog/models.py:36
+msgid "title"
+msgstr "başlık"
+
+#: blog/models.py:8
+msgid "url"
+msgstr "adres"
+
+#: blog/models.py:14
+msgid "link"
+msgstr "bağlantı"
+
+#: blog/models.py:15
+msgid "links"
+msgstr "bağlantılar"
+
+#: blog/models.py:28 blog/models.py:38
+msgid "tag"
+msgstr "etiket"
+
+#: blog/models.py:29
+msgid "tags"
+msgstr "etiketler"
+
+#: blog/models.py:37
+msgid "content"
+msgstr "içerik"
+
+#: blog/models.py:39
+msgid "publish date"
+msgstr "yayınlama tarihi"
+
+#: blog/models.py:48
+msgid "entry"
+msgstr "girdi"
+
+#: blog/models.py:49
+msgid "entries"
+msgstr "girdiler"
+
+#: templates/base.html:57
msgid "Archives"
msgstr "Arşivler"
-#: templates/base.html:59
+#: templates/base.html:63
msgid "Tags"
msgstr "Kategoriler"
-#: templates/base.html:65
+#: templates/base.html:69
msgid "Links"
msgstr "Bağlantılar"
-#: templates/blog/entry_brief.html:11
+#: templates/blog/entry_brief.html:15
msgid "Tags:"
msgstr "Kategoriler:"
Modified: zangetsu/settings.py
=================================================================
--- zangetsu/settings.py (original)
+++ zangetsu/settings.py Mon Oct 2 03:14:57 2006
@@ -1,13 +1,16 @@
# -*- coding: utf-8 -*-
# Django settings for zangetsu project.
-DEBUG = True
+DEBUG = False
TEMPLATE_DEBUG = DEBUG
ADMINS = (
('S.Çağlar Onur', 'caglar at pardus.org.tr'),
)
+WEB_URL = 'http://cekirdek.pardus.org.tr/~caglar'
+DOCUMENT_ROOT = '/home/caglar/public_html'
+
MANAGERS = ADMINS
DATABASE_ENGINE = 'sqlite3' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
@@ -39,16 +42,16 @@
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/home/caglar/zangetsu/static'
+MEDIA_ROOT = '%s/zangetsu/static' % DOCUMENT_ROOT
# URL that handles the media served from MEDIA_ROOT.
# Example: "http://media.lawrence.com"
-MEDIA_URL = 'http://10.0.0.65:8000/static/'
+MEDIA_URL = '%s/static/' % WEB_URL
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '%s/static/admin/media/' %WEB_URL
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'I_AM_A_SECRET_KEY_DONT_MAKE_ME_LOLO'
@@ -71,7 +74,7 @@
ROOT_URLCONF = 'zangetsu.urls'
TEMPLATE_DIRS = (
- '/home/caglar/zangetsu/templates',
+ '%s/zangetsu/templates' % DOCUMENT_ROOT,
)
INSTALLED_APPS = (
Modified: zangetsu/templates/base.html
=================================================================
--- zangetsu/templates/base.html (original)
+++ zangetsu/templates/base.html Mon Oct 2 03:14:57 2006
@@ -1,6 +1,7 @@
<!-- Localization -->
{% load i18n %}
{% load library %}
+{% build_blog_name %}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -32,13 +33,13 @@
<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="feed/rss">
<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="feed/atom/">
-<link rel="stylesheet" href="/static/blog.css" type="text/css">
+<link rel="stylesheet" href="{{ blog_url }}/../static/blog.css" type="text/css">
-<title>Sandra Blog!</title>
+<title>{{ blog_name }}</title>
</head>
<body>
<div id="header">
- <center><a href="http://10.0.0.65:8000/blog/">{% build_blog_name %}{{blog_name}}</a><br /><br /></center>
+ <center><a href="{{ blog_url }}">{{ blog_name }}</a><br /><br /></center>
</div>
<!-- content -->
@@ -48,20 +49,20 @@
<!-- menu -->
<div id="menu">
- <center>{% build_blog_name %}{{blog_desc}}</center>
+ <center>{{ blog_desc }}</center>
<a id="tooCool" href="http://www.w3junkies.com/toocool/">Too Cool for Internet Explorer</a>
<br />
<br />
<b>{% trans "Archives" %}</b><hr>
{% build_month_list %}
{% for month in blog_months %}
- <a href="/blog/{{ month|date:"Y/m"|lower }}/">{{ month|date:"M Y" }}</a><br />
+ <a href="{{ blog_url }}/{{ month|date:"Y/m"|lower }}/">{{ month|date:"M Y" }}</a><br />
{% endfor %}
<br />
<b>{% trans "Tags" %}</b><hr>
{% build_tag_list %}
{% for tag in blog_tags %}
- <a href="/blog/tag/{{tag.title}}/">{{ tag.title }}</a><br />
+ <a href="{{ blog_url }}/tag/{{tag.title}}/">{{ tag.title }}</a><br />
{% endfor %}
<br />
<b>{% trans "Links" %}</b><hr>
Modified: zangetsu/templates/blog/entry_brief.html
=================================================================
--- zangetsu/templates/blog/entry_brief.html (original)
+++ zangetsu/templates/blog/entry_brief.html Mon Oct 2 03:14:57 2006
@@ -1,4 +1,6 @@
{% load i18n %}
+{% load library %}
+{% build_blog_name %}
<div class="entry">
<b><a href="{{object.get_absolute_url}}">{{object.title}}</a></b>
<span class="date">
@@ -10,6 +12,6 @@
<br />
{% trans "Tags:" %}
{% for tag in object.tag.all %}
- <a href="/blog/tag/{{tag.title}}">{{tag.title}}</a>
+ <a href="{{ blog_url }}/tag/{{tag.title}}">{{tag.title}}</a>
{% endfor %}
</div>
Modified: zangetsu/templates/blog/entry_detail.html
=================================================================
--- zangetsu/templates/blog/entry_detail.html (original)
+++ zangetsu/templates/blog/entry_detail.html Mon Oct 2 03:14:57 2006
@@ -1,4 +1,6 @@
{% extends "base.html" %}
+{% load library %}
+{% build_blog_name %}
{% block content %}
<div class="entry">
<b><a href="{{object.get_absolute_url}}">{{object.title}}</a></b>
@@ -11,7 +13,7 @@
{{object.pubdate|date:"d M y, l \@ H:i"}}
</span>
{% for tag in object.tag.all %}
- {{tag.title}}
+ <a href="{{ blog_url }}/tag/{{tag.title}}">{{tag.title}}</a>
{% endfor %}
</div>
{% endblock %}
Modified: zangetsu/urls.py
=================================================================
--- zangetsu/urls.py (original)
+++ zangetsu/urls.py Mon Oct 2 03:14:57 2006
@@ -1,8 +1,13 @@
# -*- coding: utf-8 -*-
from django.conf.urls.defaults import *
+from blackrock.settings import WEB_URL, DOCUMENT_ROOT
+
+root = '/'.join(WEB_URL.split("/")[3:])
+
urlpatterns = patterns('',
- (r'^admin/', include('django.contrib.admin.urls')),
- (r'^blog/', include('zangetsu.blog.urls')),
- (r'^static/(.*)$', 'django.views.static.serve', {'document_root': '/home/caglar/zangetsu/static', 'show_indexes': True}),
+ (r'^%s/admin/' % root, include('django.contrib.admin.urls')),
+ (r'^%s/blog/' % root, include('blackrock.blog.urls')),
+ (r'^%s/$' % root, 'django.views.generic.simple.redirect_to', {'url': '/%s/blog' % root}),
+ (r'^%s/static/(.*)$' % root, 'django.views.static.serve', {'document_root': '%s/blackrock/static' % DOCUMENT_ROOT, 'show_indexes': True}),
)
Projeler-commits mesaj listesiyle ilgili
daha fazla bilgi