From 4215b41a05670fbef5e147543d2bccf33456de6e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 21 Feb 2013 17:36:02 +0530
Subject: [PATCH] Content server: Allow clicking on the book cover to download
 it. Useful on small screen devices where clicking the Get button may be
 difficult

---
 resources/content_server/browse/browse.css   |  8 ++++++++
 resources/content_server/browse/details.html |  2 +-
 resources/content_server/browse/summary.html |  2 +-
 src/calibre/library/server/browse.py         | 17 +++++++++++++----
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index b32c470803..e7242fce6d 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -356,6 +356,10 @@ h2.library_name {
     color: red;
 }
 
+#booklist a.summary_thumb img {
+    border: none
+}
+
 #booklist > #pagelist { display: none; }
 
 #goto_page_dialog ul {
@@ -474,5 +478,9 @@ h2.library_name {
     color: red
 }
 
+.details a.details_thumb img {
+    border: none
+}
+
 /* }}} */
 
diff --git a/resources/content_server/browse/details.html b/resources/content_server/browse/details.html
index ece693cad5..bbcab841dc 100644
--- a/resources/content_server/browse/details.html
+++ b/resources/content_server/browse/details.html
@@ -1,6 +1,6 @@
 <div id="details_{id}" class="details">
     <div class="left">
-        <img alt="Cover of {title}" src="{prefix}/get/cover/{id}" />
+        <a href="{get_url}" title="Click to read {title} in the {fmt} format" class="details_thumb"><img alt="Cover of {title}" src="{prefix}/get/cover/{id}" /></a>
     </div>
     <div class="right">
         <div class="field formats">{formats}</div>
diff --git a/resources/content_server/browse/summary.html b/resources/content_server/browse/summary.html
index d6a4293b25..e9739f7f69 100644
--- a/resources/content_server/browse/summary.html
+++ b/resources/content_server/browse/summary.html
@@ -1,6 +1,6 @@
 <div id="summary_{id}" class="summary">
     <div class="left">
-        <img alt="Cover of {title}" src="{prefix}/get/thumb_90_120/{id}" />
+        <a href="{get_url}" class="summary_thumb" title="Click to read {title} in the {fmt} format"><img alt="Cover of {title}" src="{prefix}/get/thumb_90_120/{id}" /></a>
         {get_button}
     </div>
     <div class="right">
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 527f842463..697e725884 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -772,6 +772,7 @@ class BrowseServer(object):
                 continue
             args, fmt, fmts, fname = self.browse_get_book_args(mi, id_)
             args['other_formats'] = ''
+            args['fmt'] = fmt
             if fmts and fmt:
                 other_fmts = [x for x in fmts if x.lower() != fmt.lower()]
                 if other_fmts:
@@ -794,8 +795,9 @@ class BrowseServer(object):
                 args['get_button'] = \
                         '<a href="%s" class="read" title="%s">%s</a>' % \
                         (xml(href, True), rt, xml(_('Get')))
+                args['get_url'] = xml(href, True)
             else:
-                args['get_button'] = ''
+                args['get_button'] = args['get_url'] = ''
             args['comments'] = comments_to_html(mi.comments)
             args['stars'] = ''
             if mi.rating:
@@ -825,6 +827,12 @@ class BrowseServer(object):
         else:
             args, fmt, fmts, fname = self.browse_get_book_args(mi, id_,
                     add_category_links=True)
+            args['fmt'] = fmt
+            if fmt:
+                args['get_url'] = xml(self.opts.url_prefix + '/get/%s/%s_%d.%s'%(
+                    fmt, fname, id_, fmt), True)
+            else:
+                args['get_url'] = ''
             args['formats'] = ''
             if fmts:
                 ofmts = [u'<a href="{4}/get/{0}/{1}_{2}.{0}" title="{3}">{3}</a>'\
@@ -879,9 +887,10 @@ class BrowseServer(object):
                              c[1]) for c in comments]
             comments = u'<div class="comments">%s</div>'%('\n\n'.join(comments))
 
-            return self.browse_details_template.format(id=id_,
-                    title=xml(mi.title, True), fields=fields,
-                    formats=args['formats'], comments=comments)
+            return self.browse_details_template.format(
+                id=id_, title=xml(mi.title, True), fields=fields,
+                get_url=args['get_url'], fmt=args['fmt'],
+                formats=args['formats'], comments=comments)
 
     @Endpoint(mimetype='application/json; charset=utf-8')
     def browse_details(self, id=None):