mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
82ab206727
@ -1,7 +1,7 @@
|
||||
<div id="summary_{id}" class="summary">
|
||||
<div class="left">
|
||||
<img alt="Cover of {title}" src="/get/thumb_90_120/{id}" />
|
||||
<a href="{href}" class="read" title="{read_tooltip}">{read_string}</a>
|
||||
{get_button}
|
||||
</div>
|
||||
<div class="right">
|
||||
<div class="stars">
|
||||
|
@ -466,7 +466,10 @@ class BrowseServer(object):
|
||||
fmts = ''
|
||||
fmts = [x.lower() for x in fmts.split(',') if x]
|
||||
pf = prefs['output_format'].lower()
|
||||
try:
|
||||
fmt = pf if pf in fmts else fmts[0]
|
||||
except:
|
||||
fmt = None
|
||||
args = {'id':id_, 'mi':mi,
|
||||
}
|
||||
for key in mi.all_field_keys():
|
||||
@ -496,6 +499,7 @@ class BrowseServer(object):
|
||||
continue
|
||||
args, fmt, fmts, fname = self.browse_get_book_args(mi, id_)
|
||||
args['other_formats'] = ''
|
||||
if fmts and fmt:
|
||||
other_fmts = [x for x in fmts if x.lower() != fmt.lower()]
|
||||
if other_fmts:
|
||||
ofmts = [u'<a href="/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'\
|
||||
@ -506,10 +510,18 @@ class BrowseServer(object):
|
||||
_('Other formats') + ofmts
|
||||
|
||||
args['details_href'] = '/browse/details/'+str(id_)
|
||||
args['read_tooltip'] = \
|
||||
_('Read %s in the %s format')%(args['title'], fmt.upper())
|
||||
args['href'] = '/get/%s/%s_%d.%s'%(
|
||||
|
||||
if fmt:
|
||||
href = '/get/%s/%s_%d.%s'%(
|
||||
fmt, fname, id_, fmt)
|
||||
rt = xml(_('Read %s in the %s format')%(args['title'],
|
||||
fmt.upper()), True)
|
||||
|
||||
args['get_button'] = \
|
||||
'<a href="%s" class="read" title="%s">%s</a>' % \
|
||||
(xml(href, True), rt, xml(_('Get')))
|
||||
else:
|
||||
args['get_button'] = ''
|
||||
args['comments'] = comments_to_html(mi.comments)
|
||||
args['stars'] = ''
|
||||
if mi.rating:
|
||||
@ -519,7 +531,6 @@ class BrowseServer(object):
|
||||
args['tags']
|
||||
if args['series']:
|
||||
args['series'] = args['series']
|
||||
args['read_string'] = xml(_('Read'), True)
|
||||
args['details'] = xml(_('Details'), True)
|
||||
args['details_tt'] = xml(_('Show book details'), True)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user