Added 'entry' container around each entry

This commit is contained in:
Stefan Ritter 2009-05-18 21:24:58 +02:00
parent 03a1d02ee3
commit 9cbc71157e
1 changed files with 30 additions and 27 deletions

View File

@ -1,3 +1,4 @@
w
#!/usr/bin/python #!/usr/bin/python
# This program is free software. It comes without any warranty, to # This program is free software. It comes without any warranty, to
@ -290,19 +291,19 @@ else:
# Staticpage # Staticpage
if static_display != "": if static_display != "":
content = open(staticpages_dir + static_display, "r") content = open(staticpages_dir + static_display, "r")
print ' <div class="entry_title">' + re.sub('\d+?-', '', static_display) + '</div>' print ' <div class="entry">'
print ' <div class="entry_content">' print ' <div class="entry_title">' + re.sub('\d+?-', '', static_display) + '</div>'
print ' <p>' print ' <div class="entry_content">'
print ' <p>'
for line in content: for line in content:
print ' ' + line.strip() + '<br />' print ' ' + line.strip() + '<br />'
print ' </p>' print ' </p>'
print ' </div>' print ' </div>'
print ' <div class="entry_footer"></div>' print ' <div class="entry_footer"></div>'
print ' <div class="entry_comments"></div>' print ' <div class="entry_border_left"></div>'
print ' <div class="entry_border_left"></div>' print ' <div class="entry_border_right"></div>'
print ' <div class="entry_border_right"></div>' print ' <div class="entry_border_top"></div>'
print ' <div class="entry_border_top"></div>' print ' <div class="entry_border_bottom"></div>'
print ' <div class="entry_border_bottom"></div>'
content.close() content.close()
# Entry # Entry
else: else:
@ -318,20 +319,20 @@ else:
if post_display == title or not post_display: if post_display == title or not post_display:
if allentries_display == "1" or entry_counter < entries_per_page: if allentries_display == "1" or entry_counter < entries_per_page:
content = open(entry, "r") content = open(entry, "r")
print ' <div class="entry">'
if permalinks: if permalinks:
print ' <div class="entry_title"><a href="?p=' + title + '" class="entry_title">' + title + '</a></div>' print ' <div class="entry_title"><a href="?p=' + title + '" class="entry_title">' + title + '</a></div>'
else: else:
print ' <div class="entry_title">' + title + '</div>' print ' <div class="entry_title">' + title + '</div>'
print ' <div class="entry_content">' print ' <div class="entry_content">'
for line in content: for line in content:
print ' ' + line.strip() + '<br />' print ' ' + line.strip() + '<br />'
print ' </div>' print ' </div>'
print ' <div class="entry_footer"></div>' print ' <div class="entry_footer"></div>'
print ' <div class="entry_comments"></div>' print ' <div class="entry_border_left"></div>'
print ' <div class="entry_border_left"></div>' print ' <div class="entry_border_right"></div>'
print ' <div class="entry_border_right"></div>' print ' <div class="entry_border_top"></div>'
print ' <div class="entry_border_top"></div>' print ' <div class="entry_border_bottom"></div>'
print ' <div class="entry_border_bottom"></div>'
# Comments... # Comments...
# ... are shown when post_display and comments_file isn't false # ... are shown when post_display and comments_file isn't false
@ -374,8 +375,9 @@ else:
if comments == "True": if comments == "True":
comments_file = glob.glob(entries_dir + title + '.comments') comments_file = glob.glob(entries_dir + title + '.comments')
if not comments_file and not post_display: if not comments_file and not post_display:
print ' <div class="entry_comments">' print ' <div class="entry_comments">'
print ' <a href="?p=' + title + '" class="entry_comments">no comments</a>' print ' <a href="?p=' + title + '" class="entry_comments">no comments</a>'
print ' </div>'
print ' </div>' print ' </div>'
print '' print ''
elif comments_file and not post_display: elif comments_file and not post_display:
@ -383,8 +385,9 @@ else:
comments_counter = 0 comments_counter = 0
for line in comments_content: for line in comments_content:
if line.split(".", 1)[0] == "-": comments_counter += 1 if line.split(".", 1)[0] == "-": comments_counter += 1
print ' <div class="entry_comments">' print ' <div class="entry_comments">'
print ' <a href="?p=' + title + '" class="entry_comments">comments (' + str(comments_counter) + ')</a>' print ' <a href="?p=' + title + '" class="entry_comments">comments (' + str(comments_counter) + ')</a>'
print ' </div>'
print ' </div>' print ' </div>'
print '' print ''
comments_content.close() comments_content.close()