Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-17 08:08:29 -07:00
commit aa7356e399
2 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
resources/catalog/stylesheet.css
View File

@ -12,8 +12,8 @@ p.title {
p.author { p.author {
margin-top:0em; margin-top:0em;
margin-bottom:0em; margin-bottom:0em;
text-align: left; text-align: center;
text-indent: 1em; text-indent: 0em;
font-size:large; font-size:large;
} }
@ -27,17 +27,28 @@ p.author_index {
} }
p.tags { p.tags {
margin-top:0em; margin-top:0.5em;
margin-bottom:0em; margin-bottom:0em;
text-align: left; text-align: left;
text-indent: 1em; text-indent: 0.0in;
font-size:small;
} }
p.description { p.formats {
text-align:left; font-size:90%;
font-style:normal;
margin-top:0em; margin-top:0em;
margin-bottom:0.5em;
text-align: left;
text-indent: 0.0in;
}
div.description > p:first-child {
margin: 0 0 0 0;
text-indent: 0em;
}
div.description {
margin: 0 0 0 0;
text-indent: 1em;
} }
p.date_index { p.date_index {
@ -121,5 +132,5 @@ td.rating {
text-align: center; text-align: center;
} }
td.thumbnail img { td.thumbnail img {
-webkit-box-shadow: 6px 6px 6px #888; -webkit-box-shadow: 4px 4px 12px #999;
} }

45
src/calibre/library/catalog.py
View File

@ -1666,7 +1666,8 @@ class EPUB_MOBI(CatalogPlugin):
elif self.opts.connected_kindle and title['id'] in self.bookmarked_books: elif self.opts.connected_kindle and title['id'] in self.bookmarked_books:
authorTag.insert(0, NavigableString(self.READING_SYMBOL + " by ")) authorTag.insert(0, NavigableString(self.READING_SYMBOL + " by "))
else: else:
authorTag.insert(0, NavigableString(self.NOT_READ_SYMBOL + " by ")) #authorTag.insert(0, NavigableString(self.NOT_READ_SYMBOL + " by "))
authorTag.insert(0, NavigableString("by "))
authorTag.insert(1, aTag) authorTag.insert(1, aTag)
''' '''
@ -1695,6 +1696,7 @@ class EPUB_MOBI(CatalogPlugin):
tagsTag = body.find(attrs={'class':'tags'}) tagsTag = body.find(attrs={'class':'tags'})
ttc = 0 ttc = 0
'''
# Insert a spacer to match the author indent # Insert a spacer to match the author indent
fontTag = Tag(soup,"font") fontTag = Tag(soup,"font")
fontTag['style'] = 'color:white;font-size:large' fontTag['style'] = 'color:white;font-size:large'
@ -1703,6 +1705,7 @@ class EPUB_MOBI(CatalogPlugin):
fontTag.insert(0, NavigableString(" by ")) fontTag.insert(0, NavigableString(" by "))
tagsTag.insert(ttc, fontTag) tagsTag.insert(ttc, fontTag)
ttc += 1 ttc += 1
'''
for tag in title['tags']: for tag in title['tags']:
aTag = Tag(soup,'a') aTag = Tag(soup,'a')
@ -1711,11 +1714,19 @@ class EPUB_MOBI(CatalogPlugin):
aTag.insert(0,escape(NavigableString(tag))) aTag.insert(0,escape(NavigableString(tag)))
emTag = Tag(soup, "em") emTag = Tag(soup, "em")
emTag.insert(0, aTag) emTag.insert(0, aTag)
if ttc < len(title['tags']): if ttc < len(title['tags'])-1:
emTag.insert(1, NavigableString(' &middot; ')) emTag.insert(1, NavigableString(' &middot; '))
tagsTag.insert(ttc, emTag) tagsTag.insert(ttc, emTag)
ttc += 1 ttc += 1
# Insert formats
if 'formats' in title:
formatsTag = body.find(attrs={'class':'formats'})
formats = []
for format in sorted(title['formats']):
formats.append(format.rpartition('.')[2].upper())
formatsTag.insert(0, NavigableString(' &middot; '.join(formats)))
# Insert the cover <img> if available # Insert the cover <img> if available
imgTag = Tag(soup,"img") imgTag = Tag(soup,"img")
if 'cover' in title: if 'cover' in title:
@ -1859,7 +1870,7 @@ class EPUB_MOBI(CatalogPlugin):
ptc = 0 ptc = 0
# book with read|reading|unread symbol or wishlist item # book with read|reading|unread symbol or wishlist item
if self.opts.wishlist_tag in book['tags']: if self.opts.wishlist_tag in book.get('tags', []):
pBookTag['class'] = "wishlist_item" pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL)) pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1 ptc += 1
@ -2166,7 +2177,7 @@ class EPUB_MOBI(CatalogPlugin):
ptc = 0 ptc = 0
# book with read|reading|unread symbol or wishlist item # book with read|reading|unread symbol or wishlist item
if self.opts.wishlist_tag in new_entry['tags']: if self.opts.wishlist_tag in new_entry.get('tags', []):
pBookTag['class'] = "wishlist_item" pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL)) pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1 ptc += 1
@ -2217,7 +2228,7 @@ class EPUB_MOBI(CatalogPlugin):
ptc = 0 ptc = 0
# book with read|reading|unread symbol or wishlist item # book with read|reading|unread symbol or wishlist item
if self.opts.wishlist_tag in new_entry['tags']: if self.opts.wishlist_tag in new_entry.get('tags', []):
pBookTag['class'] = "wishlist_item" pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL)) pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1 ptc += 1
@ -2671,7 +2682,7 @@ class EPUB_MOBI(CatalogPlugin):
book['read'] = False book['read'] = False
# book with read|reading|unread symbol or wishlist item # book with read|reading|unread symbol or wishlist item
if self.opts.wishlist_tag in book['tags']: if self.opts.wishlist_tag in book.get('tags', []):
pBookTag['class'] = "wishlist_item" pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL)) pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1 ptc += 1
@ -3964,7 +3975,7 @@ class EPUB_MOBI(CatalogPlugin):
for x in output_profiles(): for x in output_profiles():
if x.short_name == self.opts.output_profile: if x.short_name == self.opts.output_profile:
# .9" width aspect ratio: 3:4 # .9" width aspect ratio: 3:4
self.thumbWidth = int(x.dpi * .9) self.thumbWidth = int(x.dpi * 1)
self.thumbHeight = int(self.thumbWidth * 1.33) self.thumbHeight = int(self.thumbWidth * 1.33)
if 'kindle' in x.short_name and self.opts.fmt == 'mobi': if 'kindle' in x.short_name and self.opts.fmt == 'mobi':
# Kindle DPI appears to be off by a factor of 2 # Kindle DPI appears to be off by a factor of 2
@ -4169,7 +4180,8 @@ class EPUB_MOBI(CatalogPlugin):
pBookTag = Tag(soup, "p") pBookTag = Tag(soup, "p")
ptc = 0 ptc = 0
# book with read|reading|unread symbol or wishlist item '''
# This if clause does not display MISSING_SYMBOL for wishlist items
# If this is the wishlist_tag genre, don't show missing symbols # If this is the wishlist_tag genre, don't show missing symbols
# normalized_wishlist_tag = self.genre_tags_dict[self.opts.wishlist_tag] # normalized_wishlist_tag = self.genre_tags_dict[self.opts.wishlist_tag]
if self.opts.wishlist_tag in book['tags'] and \ if self.opts.wishlist_tag in book['tags'] and \
@ -4177,6 +4189,13 @@ class EPUB_MOBI(CatalogPlugin):
pBookTag['class'] = "wishlist_item" pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL)) pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1 ptc += 1
'''
# book with read|reading|unread symbol or wishlist item
if self.opts.wishlist_tag in book.get('tags', []):
pBookTag['class'] = "wishlist_item"
pBookTag.insert(ptc,NavigableString(self.MISSING_SYMBOL))
ptc += 1
else: else:
if book['read']: if book['read']:
# check mark # check mark
@ -4238,34 +4257,28 @@ class EPUB_MOBI(CatalogPlugin):
<p class="author"></p> <p class="author"></p>
<!--p class="series"></p--> <!--p class="series"></p-->
<p class="tags">&nbsp;</p> <p class="tags">&nbsp;</p>
<p class="formats">&nbsp;</p>
<table width="100%" border="0"> <table width="100%" border="0">
<tr> <tr>
<td class="thumbnail" rowspan="7"></td> <td class="thumbnail" rowspan="7" width="40%"></td>
<!--td>&nbsp;</td-->
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<!--td>&nbsp;</td-->
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<!--td>Publisher</td-->
<td class="publisher"></td> <td class="publisher"></td>
</tr> </tr>
<tr> <tr>
<!--td>Published</td-->
<td class="date"></td> <td class="date"></td>
</tr> </tr>
<tr> <tr>
<!--td>Rating</td-->
<td class="rating"></td> <td class="rating"></td>
</tr> </tr>
<tr> <tr>
<!--td class="notes_label">Notes</td-->
<td class="notes"></td> <td class="notes"></td>
</tr> </tr>
<tr> <tr>
<!--td>&nbsp;</td-->
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
</table> </table>