raoul/old-scribeengine
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Projects 1 Releases Wiki Activity

Reworked urls

Browse Source
This commit is contained in:
David Rubin 2010-01-19 00:41:00 +02:00
commit 36dbb226ca
11 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scribeengine/config/routing.py
View File

@ -43,9 +43,9 @@ def make_map():
# CUSTOM ROUTES HERE # CUSTOM ROUTES HERE
map.connect('/archive/{year}', controller='blog', action='archive') map.connect('/archive/{year}', controller='blog', action='archive',month=None,day=None,url=None)
map.connect('/archive/{year}/{month}', controller='blog', action='archive') map.connect('/archive/{year}/{month}', controller='blog', action='archive',day=None,url=None)
map.connect('/archive/{year}/{month}/{day}', controller='blog', action='archive') map.connect('/archive/{year}/{month}/{day}', controller='blog', action='archive',url=None)
map.connect('/archive/{year}/{month}/{day}/{url}', controller='blog', action='view') map.connect('/archive/{year}/{month}/{day}/{url}', controller='blog', action='view')
map.connect('/{controller}/{action}') map.connect('/{controller}/{action}')

2
scribeengine/controllers/blog.py
View File

@ -88,5 +88,5 @@ class BlogController(BaseController):
Session.add(post) Session.add(post)
Session.commit() Session.commit()
h.flash.set_message(u'Successfully submitted your comment.', u'success') h.flash.set_message(u'Successfully submitted your comment.', u'success')
h.redirect_to(h.full_url(post)) h.redirect_to(h.url_for_post(post))

15
scribeengine/lib/helpers.py
View File

@ -78,10 +78,15 @@ def teaser(text, url):
text = text[:position] text = text[:position]
return text return text
def full_url(post): def url_for_post(post):
return '/archive/%s/%s/%s/%s' % (str(post.created.strftime('%Y')), \ #TODO: this is hard coded.
str(post.created.strftime('%m')), \ return url_for(
str(post.created.strftime('%d')), \ controller='blog',
str(post.url)) action='view',
year=post.created.strftime('%Y'),
month=post.created.strftime('%m'),
day=post.created.strftime('%d'),
url=post.url
)
flash = Flash() flash = Flash()

2
scribeengine/templates/admin/login.mako
View File

@ -3,7 +3,7 @@
<h2 class="title">Log in</h2> <h2 class="title">Log in</h2>
<%include file="/flash.mako"/> <%include file="/flash.mako"/>
<%include file="/errors.mako"/> <%include file="/errors.mako"/>
<form id="post-new" action="${h.url_for('/admin/login')}" method="post"> <form id="post-new" action="${h.url_for(controller='admin', action='login')}" method="post">
<fieldset> <fieldset>
<div class="form-item"> <div class="form-item">
<label for="login-email">E-mail:</label> <label for="login-email">E-mail:</label>

2
scribeengine/templates/admin/register.mako
View File

@ -3,7 +3,7 @@
<h2 class="title">Register</h2> <h2 class="title">Register</h2>
<%include file="/flash.mako"/> <%include file="/flash.mako"/>
<%include file="/errors.mako"/> <%include file="/errors.mako"/>
<form id="post-new" action="${h.url_for('/admin/register')}" method="post"> <form id="post-new" action="${h.url_for(controller='admin', action='register')}" method="post">
<fieldset> <fieldset>
<div class="form-item"> <div class="form-item">
<label for="register-nick">Nick:</label> <label for="register-nick">Nick:</label>

6
scribeengine/templates/base.mako
View File

@ -20,10 +20,10 @@
<li><a href="${page.url}">${page.name}</a></li> <li><a href="${page.url}">${page.name}</a></li>
% endfor % endfor
% if c.current_user: % if c.current_user:
<li><a href="${h.url_for('/post/new')}">New</a></li> <li><a href="${h.url_for(controller='post',action='new')}">New Post</a></li>
<li><a href="${h.url_for('/admin/logout')}">Logout</a></li> <li><a href="${h.url_for(controller='admin',action='logout')}">Logout</a></li>
% else: % else:
<li><a href="${h.url_for('/admin/login')}">Login</a></li> <li><a href="${h.url_for(controller='admin',action='login')}">Login</a></li>
% endif % endif
</ul> </ul>
</div> </div>

12
scribeengine/templates/blog/index.mako
View File

@ -2,19 +2,19 @@
<%include file="/flash.mako"/> <%include file="/flash.mako"/>
% for post in c.posts: % for post in c.posts:
<div class="post"> <div class="post">
<h2 class="title"><a href="${h.full_url(post)}">${post.title}</a></h2> <h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2>
<div class="entry"> <div class="entry">
${h.literal(h.teaser(post.body, h.full_url(post)))} ${h.literal(h.teaser(post.body, h.url_for_post(post)))}
</div> </div>
<p class="meta"> <p class="meta">
<span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span> <span class="byline">Posted by ${post.user.nick} on ${post.created.strftime('%B %d, %Y')}</span>
<a href="${h.full_url(post)}" class="read-more">Read more</a> <a href="${h.url_for_post(post)}" class="read-more">Read more</a>
% if len(post.comments) == 0: % if len(post.comments) == 0:
<a href="${h.full_url(post)}#comments" class="comments">No comments</a> <a href="${h.url_for_post(post)}#comments" class="comments">No comments</a>
% elif len(post.comments) == 1: % elif len(post.comments) == 1:
<a href="${h.full_url(post)}#comments" class="comments">1 comment</a> <a href="${h.url_for_post(post)}#comments" class="comments">1 comment</a>
% else: % else:
<a href="${h.full_url(post)}#comments" class="comments">${len(post.comments)} comments</a> <a href="${h.url_for_post(post)}#comments" class="comments">${len(post.comments)} comments</a>
% endif % endif
</p> </p>
</div> </div>

4
scribeengine/templates/blog/teaser.mako
View File

@ -1,8 +1,8 @@
<div class="post"> <div class="post">
<%include file="/flash.mako"/> <%include file="/flash.mako"/>
<h2 class="title"><a href="${h.url_for(year=post.created.strftime('%Y'), month=post.created.strftime('%m'), day=post.created.strftime('%d'), url=post.url)}">${post.title}</a></h2> <h2 class="title"><a href="${h.url_for_post(post)}">${post.title}</a></h2>
<div class="entry"> <div class="entry">
${h.literal(post.body)} ${h.literal(post.body)}
</div> </div>
<p class="meta"><span class="byline">Posted by ${post.user.first_name} on ${post.created.strftime('%B %d, %Y')}</span> <a href="${h.url_for(year=post.created.strftime('%Y'), month=post.created.strftime('%m'), day=post.created.strftime('%d'), url=post.url)}#comments" class="comments">18 comments</a></p> <p class="meta"><span class="byline">Posted by ${post.user.first_name} on ${post.created.strftime('%B %d, %Y')}</span> <a href="${h.url_for_post(post)}#comments" class="comments">18 comments</a></p>
</div> </div>

6
scribeengine/templates/blog/view.mako
View File

@ -38,10 +38,10 @@
% if c.post.comment_status == u'open': % if c.post.comment_status == u'open':
<h3 id="respond">Leave a Reply</h3> <h3 id="respond">Leave a Reply</h3>
% if not c.current_user: % if not c.current_user:
<p>You must be <a href="${h.url_for('/admin/login')}">logged in</a> to post a comment.</p> <p>You must be <a href="${h.url_for(controller='admin', action='login')}">logged in</a> to post a comment.</p>
% else: % else:
<form action="${h.url_for('/blog/comment/%s' % c.post.id)}" method="post" id="commentform"> <form action="${h.url_for(controller='blog',action='comment', id= c.post.id)}" method="post" id="commentform">
<p class="user-details">Logged in as <em>${c.current_user.nick}</em>. <a href="/logout" title="Log out of this account">Logout &raquo;</a></p> <p class="user-details">Logged in as <em>${c.current_user.nick}</em>. <a href="${h.url_for(controller='admin',action='logout')}" title="Log out of this account">Logout &raquo;</a></p>
<p><input type="text" name="title" class="form-text" value="RE: ${c.post.title}" /></p> <p><input type="text" name="title" class="form-text" value="RE: ${c.post.title}" /></p>
<p><textarea name="body" class="form-textarea" cols="80" rows="10" tabindex="4"></textarea></p> <p><textarea name="body" class="form-textarea" cols="80" rows="10" tabindex="4"></textarea></p>
<p> <p>

2
scribeengine/templates/post/edit.mako
View File

@ -3,7 +3,7 @@
<h2 class="title">Edit Post: ${c.post.title}</h2> <h2 class="title">Edit Post: ${c.post.title}</h2>
<%include file="/flash.mako"/> <%include file="/flash.mako"/>
<%include file="/errors.mako"/> <%include file="/errors.mako"/>
<form id="post-new" action="${h.url_for('/post/edit/%s' % str(c.post.id))}" method="post"> <form id="post-new" action="${h.url_for(controller='post',action='edit', id=c.post.id)}" method="post">
<fieldset> <fieldset>
<div class="form-item"> <div class="form-item">
<!-- <label for="post-title">Title:</label> --> <!-- <label for="post-title">Title:</label> -->

2
scribeengine/templates/sidebar.mako
View File

@ -20,7 +20,7 @@
<h2>Categories</h2> <h2>Categories</h2>
<ul> <ul>
% for category in c.categories: % for category in c.categories:
<li><a href="${h.url_for('/category/%s' % str(category.url))}" title="${category.name}">${category.name}</a> (${len(category.posts)}) </li> <li><a href="${h.url_for(controller='category', action=category.url)}" title="${category.name}">${category.name}</a> (${len(category.posts)}) </li>
% endfor % endfor
</ul> </ul>
</li> </li>