This commit is contained in:
Kovid Goyal 2013-06-19 12:39:20 +05:30
parent 8bd6cc840c
commit 8020f489ca

View File

@ -13,7 +13,7 @@ from lxml.html.builder import HTML, HEAD, TITLE, STYLE, DIV, BODY, \
from calibre import preferred_encoding, strftime, isbytestring from calibre import preferred_encoding, strftime, isbytestring
def CLASS(*args, **kwargs): # class is a reserved word in Python def CLASS(*args, **kwargs): # class is a reserved word in Python
kwargs['class'] = ' '.join(args) kwargs['class'] = ' '.join(args)
return kwargs return kwargs
@ -26,7 +26,7 @@ class Template(object):
self.html_lang = lang self.html_lang = lang
def generate(self, *args, **kwargs): def generate(self, *args, **kwargs):
if not kwargs.has_key('style'): if 'style' not in kwargs:
kwargs['style'] = '' kwargs['style'] = ''
for key in kwargs.keys(): for key in kwargs.keys():
if isbytestring(kwargs[key]): if isbytestring(kwargs[key]):
@ -152,8 +152,8 @@ class FeedTemplate(Template):
body.append(div) body.append(div)
if getattr(feed, 'image', None): if getattr(feed, 'image', None):
div.append(DIV(IMG( div.append(DIV(IMG(
alt = feed.image_alt if feed.image_alt else '', alt=feed.image_alt if feed.image_alt else '',
src = feed.image_url src=feed.image_url
), ),
CLASS('calibre_feed_image'))) CLASS('calibre_feed_image')))
if getattr(feed, 'description', None): if getattr(feed, 'description', None):
@ -261,8 +261,8 @@ class TouchscreenIndexTemplate(Template):
for i, feed in enumerate(feeds): for i, feed in enumerate(feeds):
if feed: if feed:
tr = TR() tr = TR()
tr.append(TD( CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i))) tr.append(TD(CLASS('calibre_rescale_120'), A(feed.title, href='feed_%d/index.html'%i)))
tr.append(TD( '%s' % len(feed.articles), style="text-align:right")) tr.append(TD('%s' % len(feed.articles), style="text-align:right"))
toc.append(tr) toc.append(tr)
div = DIV( div = DIV(
masthead_p, masthead_p,
@ -307,7 +307,7 @@ class TouchscreenFeedTemplate(Template):
if f > 0: if f > 0:
link = A(CLASS('feed_link'), link = A(CLASS('feed_link'),
trim_title(feeds[f-1].title), trim_title(feeds[f-1].title),
href = '../feed_%d/index.html' % int(f-1)) href='../feed_%d/index.html' % int(f-1))
navbar_tr.append(TD(CLASS('feed_prev'),link)) navbar_tr.append(TD(CLASS('feed_prev'),link))
# Up to Sections # Up to Sections
@ -319,13 +319,12 @@ class TouchscreenFeedTemplate(Template):
if f < len(feeds)-1: if f < len(feeds)-1:
link = A(CLASS('feed_link'), link = A(CLASS('feed_link'),
trim_title(feeds[f+1].title), trim_title(feeds[f+1].title),
href = '../feed_%d/index.html' % int(f+1)) href='../feed_%d/index.html' % int(f+1))
navbar_tr.append(TD(CLASS('feed_next'),link)) navbar_tr.append(TD(CLASS('feed_next'),link))
navbar_t.append(navbar_tr) navbar_t.append(navbar_tr)
top_navbar = navbar_t top_navbar = navbar_t
bottom_navbar = copy.copy(navbar_t) bottom_navbar = copy.copy(navbar_t)
#print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True) # print "\n%s\n" % etree.tostring(navbar_t, pretty_print=True)
# Build the page # Build the page
head = HEAD(TITLE(feed.title)) head = HEAD(TITLE(feed.title))
@ -342,8 +341,8 @@ class TouchscreenFeedTemplate(Template):
if getattr(feed, 'image', None): if getattr(feed, 'image', None):
div.append(DIV(IMG( div.append(DIV(IMG(
alt = feed.image_alt if feed.image_alt else '', alt=feed.image_alt if feed.image_alt else '',
src = feed.image_url src=feed.image_url
), ),
CLASS('calibre_feed_image'))) CLASS('calibre_feed_image')))
if getattr(feed, 'description', None): if getattr(feed, 'description', None):
@ -411,6 +410,7 @@ class TouchscreenNavBarTemplate(Template):
navbar_tr.append(TD(CLASS('article_next'),link)) navbar_tr.append(TD(CLASS('article_next'),link))
navbar_t.append(navbar_tr) navbar_t.append(navbar_tr)
navbar.append(navbar_t) navbar.append(navbar_t)
#print "\n%s\n" % etree.tostring(navbar, pretty_print=True) # print "\n%s\n" % etree.tostring(navbar, pretty_print=True)
self.root = HTML(head, BODY(navbar)) self.root = HTML(head, BODY(navbar))