More shadows :)

resources/content_server/browse/browse.css

@@ -82,6 +82,10 @@ body {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   text-shadow: #27211b 1px 1px 1px;
+    -moz-box-shadow: 5px 5px 5px #222;
+    -webkit-box-shadow: 5px 5px 5px #ccc;
+    box-shadow: 5px 5px 5px #ccc;
+
 }
 
 #nav-container {
@@ -208,6 +212,7 @@ h2.library_name {
     -moz-box-shadow: 5px 5px 5px #ccc;
     -webkit-box-shadow: 5px 5px 5px #ccc;
     box-shadow: 5px 5px 5px #ccc;
+    text-shadow: #27211b 1px 1px 1px;
 
 }
 

src/calibre/library/server/opds.py

@@ -18,7 +18,7 @@
 from calibre.ebooks.metadata import fmt_sidx
 from calibre.library.comments import comments_to_html
 from calibre.library.server import custom_fields_to_display
-from calibre.library.server.utils import format_tag_string
+from calibre.library.server.utils import format_tag_string, Offsets
 from calibre import guess_type
 from calibre.utils.ordered_dict import OrderedDict
 
@@ -321,26 +321,6 @@ def __init__(self, items, which, id_, updated, version, offsets, page_url, up_ur
             self.root.append(CATALOG_GROUP_ENTRY(item, which, base_href, version, updated))
 
 
-class OPDSOffsets(object):
-
-    def __init__(self, offset, delta, total):
-        if offset < 0:
-            offset = 0
-        if offset >= total:
-            raise cherrypy.HTTPError(404, 'Invalid offset: %r'%offset)
-        last_allowed_index = total - 1
-        last_current_index = offset + delta - 1
-        self.offset = offset
-        self.next_offset = last_current_index + 1
-        if self.next_offset > last_allowed_index:
-            self.next_offset = -1
-        self.previous_offset = self.offset - delta
-        if self.previous_offset < 0:
-            self.previous_offset = 0
-        self.last_offset = last_allowed_index - delta
-        if self.last_offset < 0:
-            self.last_offset = 0
-
 
 class OPDSServer(object):
 
@@ -374,7 +354,7 @@ def get_opds_acquisition_feed(self, ids, offset, page_url, up_url, id_,
         items = [x for x in self.db.data.iterall() if x[idx] in ids]
         self.sort(items, sort_by, ascending)
         max_items = self.opts.max_opds_items
-        offsets = OPDSOffsets(offset, max_items, len(items))
+        offsets = Offsets(offset, max_items, len(items))
         items = items[offsets.offset:offsets.offset+max_items]
         updated = self.db.last_modified()
         cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
@@ -448,7 +428,7 @@ def belongs(x, which):
         id_ = 'calibre-category-group-feed:'+category+':'+which
 
         max_items = self.opts.max_opds_items
-        offsets = OPDSOffsets(offset, max_items, len(items))
+        offsets = Offsets(offset, max_items, len(items))
         items = list(items)[offsets.offset:offsets.offset+max_items]
 
         cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
@@ -495,7 +475,7 @@ def get_opds_navcatalog(self, which, page_url, up_url, version=0, offset=0):
 
         if len(items) <= MAX_ITEMS:
             max_items = self.opts.max_opds_items
-            offsets = OPDSOffsets(offset, max_items, len(items))
+            offsets = Offsets(offset, max_items, len(items))
             items = list(items)[offsets.offset:offsets.offset+max_items]
             ans = CategoryFeed(items, which, id_, updated, version, offsets,
                 page_url, up_url, self.db)
@@ -516,7 +496,7 @@ def __init__(self, text, count):
                     getattr(y, 'sort', y.name).startswith(x)])
             items = [Group(x, y) for x, y in category_groups.items()]
             max_items = self.opts.max_opds_items
-            offsets = OPDSOffsets(offset, max_items, len(items))
+            offsets = Offsets(offset, max_items, len(items))
             items = items[offsets.offset:offsets.offset+max_items]
             ans = CategoryGroupFeed(items, which, id_, updated, version, offsets,
                 page_url, up_url)

src/calibre/library/server/utils.py

@@ -13,6 +13,27 @@
 from calibre.utils.date import now as nowf
 from calibre.utils.config import tweaks
 
+class Offsets(object):
+    'Calculate offsets for a paginated view'
+
+    def __init__(self, offset, delta, total):
+        if offset < 0:
+            offset = 0
+        if offset >= total:
+            raise cherrypy.HTTPError(404, 'Invalid offset: %r'%offset)
+        last_allowed_index = total - 1
+        last_current_index = offset + delta - 1
+        self.offset = offset
+        self.next_offset = last_current_index + 1
+        if self.next_offset > last_allowed_index:
+            self.next_offset = -1
+        self.previous_offset = self.offset - delta
+        if self.previous_offset < 0:
+            self.previous_offset = 0
+        self.last_offset = last_allowed_index - delta
+        if self.last_offset < 0:
+            self.last_offset = 0
+
 
 def expose(func):