From af7598ff2f740499abcedf3954757e348b244457 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 20:43:08 -0600
Subject: [PATCH 1/6] Make the calibre logo clickable and have the header
 alyout preserved on font resizing in firefox

---
 resources/content_server/browse/browse.css  | 28 +++++++++++++++++----
 resources/content_server/browse/browse.html |  7 ++++--
 resources/content_server/browse/browse.js   |  1 +
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index 22eee3e05e..f417b15530 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -53,15 +53,22 @@ body {
   text-align: center;
 }
 
+#nav-container {
+    position: relative;
+    height: 130px;
+    top: -130px;
+    left: 0%;
+}
+
 ul#primary-nav {
   display: block;
   margin-right: 60px;
   text-align: right;
-  margin-top: 60px;
+  margin-top: 90px;
   line-height: 20px;
   cursor: default;
   position: relative;
-  top: -100px;
+  top: -2ex;
 }
 
 ul#primary-nav li {
@@ -74,8 +81,8 @@ ul#primary-nav li a {
   color: white;
   text-decoration: none;
   font-variant: small-caps;
-  /*text-transform: uppercase;*/
-  font-size: 80%;
+  /*text-transform: uppercase;
+  font-size: 80%;*/
   font-weight: bold;
   white-space: nowrap;
   text-shadow: #27211b 2px 2px 2px;
@@ -94,10 +101,20 @@ ul#primary-nav li a:hover {
   height: 38px;
   overflow: hidden;
   position: relative;
-  top: -230px;
+  top: -260px;
   left: 65%;
 }
 
+#calibre-home-link {
+    position: relative;
+    top: -298px;
+    left: 0%;
+    z-index: 2;
+    height: 130px;
+    width: 230px;
+    cursor: pointer;
+}
+
 h2.library_name {
     font-family: monospace;
     font-size: 50px;
@@ -121,6 +138,7 @@ h2.library_name {
 /* Sort select  {{{ */
 
 .sort_select { float: left; margin-left: 1em; margin-top: 2ex; font-size: small; }
+.sort_select label { font-size: medium; }
 
 /* }}} */
 
diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 3f8002e303..081cd5e30b 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -37,12 +37,14 @@
                       >&rarr;&nbsp;{library_name}&nbsp;&larr;</p>
               </div>
             </div>
+            <div id="nav-container">&nbsp;
             <ul id="primary-nav">
                 <li><a id="nav-mobile" href="/mobile" title="A version of this website suited for mobile browsers">Mobile</a></li>
 
                 <li><a id="nav-demo" href="/old" title="The old version of this webiste">Old</a></li>
                 <li><a id="nav-download" href="/opds" title="A feed based version of this website, used in special purpose applications">Feed</a></li>
             </ul>
+            </div>
 
             <form id="donate" action="https://www.paypal.com/cgi-bin/webscr"
                 method="post" title="Donate to support the development of calibre">
@@ -56,6 +58,7 @@
                         width="1" height="1"></img>
                 </div>
             </form>
+            <div id="calibre-home-link" title="Go to the calibre website"></div>
         </div>
         <!-- End header -->
 
@@ -68,8 +71,8 @@
             </div>
             <div id="search_box">
                 <form name="search_form"  action="/browse/search" method="get">
-                    Search:&nbsp;<input value="" type="text" title="Search"
-                                        class="search_input" />
+                    <input value="" type="text" title="Search"
+                                        class="search_input" />&nbsp;
                     <input type="submit" value="Search" title="Search" alt="Search" />
                 </form>
             </div>
diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index b917a1646d..5c660e2418 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -109,6 +109,7 @@ function init_sort_combobox() {
 function init() {
     $("#container").corner("30px");
     $("#header").corner("30px");
+    $("#calibre-home-link").click(function() { window.location = "http://calibre-ebook.com"; });
 
     init_sort_combobox();
 

From 1a8f2bd513b418cfed8ccfa0b6e5d365f57c5047 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 21:12:56 -0600
Subject: [PATCH 2/6] Add link to go to top level to header. Move library path
 to footer

---
 resources/content_server/browse/browse.css  | 56 +++++++++++++++------
 resources/content_server/browse/browse.html | 14 +++++-
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index f417b15530..4c36f36202 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -23,7 +23,18 @@ body {
     max-width: 1000px;
     min-width: 400px;
     min-height: 100px;
-    padding-bottom: 30px;
+}
+
+#main {
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+}
+
+#footer {
+    font-size: small;
+    color: #a6a399;
+    text-align: right;
+    margin-right: 30px;
 }
 
 /* Header {{{ */
@@ -36,6 +47,7 @@ body {
   font-size: xx-large;
   font-family: monospace;
   overflow: hidden;
+  z-index: 2;
 }
 
 #header .bubble {
@@ -53,6 +65,21 @@ body {
   text-align: center;
 }
 
+#header a {
+    text-decoration: none;
+    color: white;
+    cursor: pointer;
+    white-space: nowrap;
+    text-shadow: #27211b 2px 2px 2px;
+}
+
+#header a:hover {
+  background-color: #39a9cf;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  text-shadow: #27211b 1px 1px 1px;
+}
+
 #nav-container {
     position: relative;
     height: 130px;
@@ -78,22 +105,11 @@ ul#primary-nav li {
 
 ul#primary-nav li a {
   padding: 6px;
-  color: white;
-  text-decoration: none;
   font-variant: small-caps;
-  /*text-transform: uppercase;
-  font-size: 80%;*/
   font-weight: bold;
   white-space: nowrap;
-  text-shadow: #27211b 2px 2px 2px;
 }
 
-ul#primary-nav li a:hover {
-  background-color: #39a9cf;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  text-shadow: #27211b 1px 1px 1px;
-}
 
 #donate {
   display: block;
@@ -137,8 +153,18 @@ h2.library_name {
 
 /* Sort select  {{{ */
 
-.sort_select { float: left; margin-left: 1em; margin-top: 2ex; font-size: small; }
-.sort_select label { font-size: medium; }
+.sort_select { 
+    float: left;
+    margin-left: 1em;
+    margin-top: 2ex;
+    font-size: small;
+    max-height: 2.75em;
+    overflow: hidden;
+}
+
+.sort_select label {
+    font-size: medium;
+}
 
 /* }}} */
 
@@ -149,6 +175,8 @@ h2.library_name {
     margin-right: 1em;
     margin-top: 2ex;
     font-size: small;
+    max-height: 2.75em;
+    overflow: hidden;
 }
 
 #search_box .search_input { padding: 0.35em }
diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 081cd5e30b..9507850b53 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -33,8 +33,8 @@
         <div id="header">
             <div class="area">
               <div class="bubble">
-                  <p title="Showing library: {library_path}"
-                      >&rarr;&nbsp;{library_name}&nbsp;&larr;</p>
+                  <p><a href="/browse" title="Return to top level"
+                      >&rarr;&nbsp;home&nbsp;&larr;</a></p>
               </div>
             </div>
             <div id="nav-container">&nbsp;
@@ -76,6 +76,16 @@
                     <input type="submit" value="Search" title="Search" alt="Search" />
                 </form>
             </div>
+            <div>&nbsp;</div>
+            <div>&nbsp;</div>
+            <div>&nbsp;</div>
+
+            <div id="main">
+                xxx
+            </div>
+            <div id="footer">
+                [{library_path}] Created by Kovid Goyal
+            </div>
         </div>
     </div>
 </body>

From 6124f2dbe1a3bdfec5aeac36197b316776300e83 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 21:22:44 -0600
Subject: [PATCH 3/6] Set completion mode on search boxes to popup completion

---
 src/calibre/gui2/search_box.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index d8f59b8db7..6e510cbfa5 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -73,6 +73,8 @@ class SearchBox2(QComboBox):
         self.normal_background = 'rgb(255, 255, 255, 0%)'
         self.line_edit = SearchLineEdit(self)
         self.setLineEdit(self.line_edit)
+        c = self.line_edit.completer()
+        c.setCompletionMode(c.PopupCompletion)
         self.line_edit.key_pressed.connect(self.key_pressed,
                 type=Qt.DirectConnection)
         self.line_edit.mouse_released.connect(self.mouse_released,

From 1737226363133f3d26e83a677de14614d4c77c22 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 21:41:50 -0600
Subject: [PATCH 4/6] ...

---
 resources/content_server/browse/browse.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index 5c660e2418..409dfa08ea 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -118,5 +118,6 @@ function init() {
 
 // Top-level feed {{{
 function toplevel() {
+    $(".sort_select").hide();
 }
 // }}}

From 2457241f119141e5cabb2a62db33fe06710df315 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 23:00:46 -0600
Subject: [PATCH 5/6] Top level feed done

---
 resources/content_server/browse/browse.css  | 25 +++++++++++++++++
 resources/content_server/browse/browse.html |  2 +-
 resources/content_server/browse/browse.js   |  7 +++++
 src/calibre/library/server/browse.py        | 30 ++++++++++++++++++---
 src/calibre/library/server/cache.py         |  5 +++-
 5 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index 4c36f36202..acf031d956 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -183,3 +183,28 @@ h2.library_name {
 
 /* }}} */
 
+
+/* Top level {{{ */
+.toplevel ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+.toplevel li {
+    margin: 0.75em;
+    padding: 0.75em;
+    text-align: center;
+    cursor: pointer;
+}
+
+.toplevel li:hover {
+    background-color: #d6d3c9;
+    font-weight: bold;
+}
+
+.toplevel li span { display: none }
+
+/* }}} */
+
+
diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 9507850b53..6a81504474 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -81,7 +81,7 @@
             <div>&nbsp;</div>
 
             <div id="main">
-                xxx
+                {main}
             </div>
             <div id="footer">
                 [{library_path}] Created by Kovid Goyal
diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index 409dfa08ea..20b85df915 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -119,5 +119,12 @@ function init() {
 // Top-level feed {{{
 function toplevel() {
     $(".sort_select").hide();
+
+    $(".toplevel li").corner("15px");
+
+    $(".toplevel li").click(function() {
+        var href = $(this).children("span").html();
+        window.location = href;
+    });
 }
 // }}}
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 028ef16b27..e058ccd4f3 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -63,13 +63,37 @@ class BrowseServer(object):
     # Catalogs {{{
     def browse_catalog(self, category=None):
         if category == None:
-            #categories = self.categories_cache()
+            categories = self.categories_cache()
+            category_meta = self.db.field_metadata
+            cats = [
+                    (_('Newest'), 'newest'),
+                    ]
+            def getter(x):
+                return category_meta[x]['name'].lower()
+            for category in sorted(categories,
+                                cmp=lambda x,y: cmp(getter(x), getter(y))):
+                if len(categories[category]) == 0:
+                    continue
+                if category == 'formats':
+                    continue
+                meta = category_meta.get(category, None)
+                if meta is None:
+                    continue
+                cats.append((meta['name'], category))
+            cats = ['<li title="{2} {0}">{0}<span>/browse/category/{1}</span></li>'.format(xml(x, True),
+                            xml(y), xml(_('Browse books by'))) for x, y in cats]
+
+            main = '<div class="toplevel"><h3>{0}</h3><ul>{1}</ul></div>'\
+                    .format(_('Choose a category to browse by:'), '\n\n'.join(cats))
             ans = self.browse_template().format(title='',
-                    script='toplevel();')
+                        script='toplevel();', main=main)
         else:
             raise cherrypy.HTTPError(404, 'Not found')
+
         cherrypy.response.headers['Content-Type'] = 'text/html'
-        cherrypy.response.headers['Last-Modified'] = self.last_modified(self.build_time)
+        updated = self.db.last_modified()
+        cherrypy.response.headers['Last-Modified'] = \
+            self.last_modified(max(updated, self.build_time))
         return ans
 
     # }}}
diff --git a/src/calibre/library/server/cache.py b/src/calibre/library/server/cache.py
index 87bd9ed0c5..29602a114c 100644
--- a/src/calibre/library/server/cache.py
+++ b/src/calibre/library/server/cache.py
@@ -30,7 +30,10 @@ class Cache(object):
 
     def categories_cache(self, restrict_to=frozenset([])):
         base_restriction = self.search_cache('')
-        restrict_to = frozenset(restrict_to).intersection(base_restriction)
+        if restrict_to:
+            restrict_to = frozenset(restrict_to).intersection(base_restriction)
+        else:
+            restrict_to = base_restriction
         old = self._category_cache.pop(frozenset(restrict_to), None)
         if old is None or old[0] <= self.db.last_modified():
             categories = self.db.get_categories(ids=restrict_to)

From 58cd822a8c9b31ea57934784da149f2f854dfe96 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Oct 2010 23:13:17 -0600
Subject: [PATCH 6/6] Shadows

---
 resources/content_server/browse/browse.css  | 8 ++++++++
 resources/content_server/browse/browse.html | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index acf031d956..0f954a8647 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -12,6 +12,9 @@ body {
     background-color: #F6F3E9;
     margin-left: auto;
     margin-right: auto;
+    -moz-box-shadow: 5px 5px 5px #ccc;
+    -webkit-box-shadow: 5px 5px 5px #ccc;
+    box-shadow: 5px 5px 5px #ccc;
 }
 
 #header {
@@ -28,6 +31,7 @@ body {
 #main {
     padding-left: 0.5em;
     padding-right: 0.5em;
+
 }
 
 #footer {
@@ -201,6 +205,10 @@ h2.library_name {
 .toplevel li:hover {
     background-color: #d6d3c9;
     font-weight: bold;
+    -moz-box-shadow: 5px 5px 5px #ccc;
+    -webkit-box-shadow: 5px 5px 5px #ccc;
+    box-shadow: 5px 5px 5px #ccc;
+
 }
 
 .toplevel li span { display: none }
diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
index 6a81504474..9ae37e5c43 100644
--- a/resources/content_server/browse/browse.html
+++ b/resources/content_server/browse/browse.html
@@ -42,7 +42,7 @@
                 <li><a id="nav-mobile" href="/mobile" title="A version of this website suited for mobile browsers">Mobile</a></li>
 
                 <li><a id="nav-demo" href="/old" title="The old version of this webiste">Old</a></li>
-                <li><a id="nav-download" href="/opds" title="A feed based version of this website, used in special purpose applications">Feed</a></li>
+                <li><a id="nav-download" href="/opds" title="An OPDS feed based version of this website, used in special purpose applications">Feed</a></li>
             </ul>
             </div>