Merge from trunk

resources/content_server/browse/browse.js

@@ -108,8 +108,10 @@ function init() {
 function toplevel_layout() {
     var last = $(".toplevel li").last();
     var title = $('.toplevel h3').first();
+    if (title && title.position()) {
         var bottom = last.position().top + last.height() - title.position().top;
         $("#main").height(Math.max(200, bottom+75));
+    }
 }
 
 function toplevel() {

src/calibre/devices/android/driver.py

@@ -62,6 +62,7 @@ class ANDROID(USBMS):
             # Archos
             0x0e79 : {
                 0x1400 : [0x0222, 0x0216],
+                0x1408 : [0x0222, 0x0216],
                 0x1419 : [0x0216],
                 0x1420 : [0x0216],
                 0x1422 : [0x0216]

src/calibre/gui2/tag_view.py

@@ -22,7 +22,7 @@ from calibre.ebooks.metadata import title_sort
 from calibre.gui2 import config, NONE, gprefs
 from calibre.library.field_metadata import TagsIcons, category_icon_map
 from calibre.utils.config import tweaks
-from calibre.utils.icu import sort_key, upper, lower, strcmp
+from calibre.utils.icu import sort_key, lower, strcmp
 from calibre.utils.search_query_parser import saved_searches
 from calibre.utils.formatter import eval_formatter
 from calibre.gui2 import error_dialog, question_dialog
@@ -538,6 +538,7 @@ class TagTreeItem(object): # {{{
         self.parent = parent
         self.children = []
         self.id_set = set()
+        self.is_gst = False
         self.boxed = False
         if self.parent is not None:
             self.parent.append(self)

src/calibre/manual/gui.rst

@@ -27,6 +27,7 @@ Actions
 
 .. image:: images/actions.png
     :alt: The Actions Toolbar
+    :align: center
 
 The actions toolbar provides convenient shortcuts to commonly used actions. Most of the action buttons have little arrows next to them. By clicking the arrows, you can perform variations on the default action. Please note that the actions toolbar will look slightly different depending on whether you have an ebook reader attached to your computer.
 
@@ -39,6 +40,7 @@ The actions toolbar provides convenient shortcuts to commonly used actions. Most
 Add books
 ~~~~~~~~~~~~~~~~~~
 .. |adbi| image:: images/add_books.png
+    :class: float-left-img
 
 |adbi| The :guilabel:`Add books` action has five variations, accessed by the clicking the down arrow on the right side of the button.
 
@@ -63,6 +65,7 @@ To add an additional format for an existing book, use the :ref:`edit_meta_inform
 Edit metadata
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. |emii| image:: images/edit_meta_information.png
+    :class: float-left-img
 
 |emii| The :guilabel:`Edit metadata` action has six variations, which can be accessed by clicking the down arrow on the right side of the button.
 
@@ -80,6 +83,7 @@ Edit metadata
 Convert e-books
 ~~~~~~~~~~~~~~~~~~~~~~
 .. |cei| image:: images/convert_ebooks.png
+    :class: float-left-img
 
 |cei| Ebooks can be converted from a number of formats into whatever format your e-book reader prefers.
 Note that ebooks you purchase will typically have `Digital Rights Management <http://bugs.calibre-ebook.com/wiki/DRM>`_ *(DRM)*.
@@ -106,6 +110,7 @@ The :guilabel:`Convert E-books` action has three variations, accessed by the arr
 View
 ~~~~~~~~~~~
 .. |vi| image:: images/view.png
+    :class: float-left-img
 
 |vi| The :guilabel:`View` action displays the book in an ebook viewer program. |app| has a builtin viewer for the most e-book formats.
 For other formats it uses the default operating system application. You can configure which formats should open with the internal viewer via
@@ -118,6 +123,7 @@ on the right of the :guilabel:`View` button.
 Send to device
 ~~~~~~~~~~~~~~~~~~~~~~~~
 .. |stdi| image:: images/send_to_device.png
+    :class: float-left-img
 
 |stdi| The :guilabel:`Send to device` action has eight variations, accessed by clicking the down arrow on the right of the button.
 
@@ -138,6 +144,7 @@ You can control the file name and folder structure of files sent to the device b
 Fetch news
 ~~~~~~~~~~~~~~~~~
 .. |fni| image:: images/fetch_news.png
+    :class: float-left-img
 
 |fni| The :guilabel:`Fetch news` action downloads news from various websites and converts it into an ebook that can be read on your ebook reader. Normally, the newly created ebook is added to your ebook library, but if an ebook reader is connected at the time the download finishes, the news is also uploaded to the reader automatically.
             
@@ -155,6 +162,7 @@ The :guilabel:`Fetch news` action has three variations, accessed by clicking the
 Library
 ~~~~~~~~~~~~~~~~~
 .. |lii| image:: images/library.png
+    :class: float-left-img
 
 |lii| The :guilabel: `Library` action allows you to create, switch between, rename or delete a Library.  |app| allows you to create as many libraries as you wish. You coudl for instance create a fiction library, a non fiction library, a foreign language library a project library, basically any structure that suits your needs. Libraries are the highest organizational structure within |app|, each library has its own set of books, tags, categories and base storage location.
 
@@ -169,6 +177,7 @@ Library
 Device
 ~~~~~~~~~~~~~~~~~
 .. |dvi| image:: images/device.png
+    :class: float-left-img
 
 |dvi| The :guilabel:`Device` action allows you to view the books in the main memory or storage cards of your device, or to eject the device (detach it from |app|).
 This icon shows up automatically on the main |app| toolbar when you connect a supported device. You can click on it to see the books on your device. You can also drag  and drop books from your |app| library onto the icon to transfer them to your device. Conversely, you can drag and drop books from your device onto the |app| icon on the toolbar to transfer books from your device to the |app| library. 
@@ -179,6 +188,7 @@ This icon shows up automatically on the main |app| toolbar when you connect a su
 Save to disk
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 .. |svdi| image:: images/save_to_disk.png
+    :class: float-left-img
 
 |svdi| The :guilabel:`Save to disk` action has five variations, accessed by the arrow next to the button.
 
@@ -212,6 +222,7 @@ Save to disk
 Connect/Share
 ~~~~~~~~~~~~~~~~~
 .. |csi| image:: images/connect_share.png
+    :class: float-left-img
 
 |csi| The :guilabel:`Connect/Share` action allows you to manually connect to a device or folder on your computer, it also allows you to set up you |app| library for access via a web browser, or email.
 
@@ -230,6 +241,7 @@ Connect/Share
 Remove books
 ~~~~~~~~~~~~~~~~~~~~~
 .. |rbi| image:: images/remove_books.png
+    :class: float-left-img
 
 |rbi| The :guilabel:`Remove books` action **deletes books permanently**, so use it with care. It is *context sensitive*, i.e. it depends on which :ref:`catalog <catalogs>` you have selected. If you have selected the :guilabel:`Library`, books will be removed from the library. If you have selected the ebook reader device, the books will be removed from the device. To remove only a particular format for a given book use the :ref:`edit_meta_information` action.  Remove books also has five variations which can be accessed by clicking the down arrow on the right side of the button.
 
@@ -259,6 +271,7 @@ The Preferences Action allows you to change the way various aspects of |app| wor
 Catalogs
 ----------
 .. image:: images/catalogs.png
+    :align: center
 
 A *catalog* is a collection of books. |app| can manage two types of different catalogs:
                 
@@ -274,6 +287,7 @@ Many operations, like Adding books, deleting, viewing, etc. are context sensitiv
 Search & Sort
 ---------------
 .. image:: images/search_sort.png
+    :align: center
 
 The Search & Sort section allows you to perform several powerful actions on your book collections.
 
@@ -375,6 +389,7 @@ Searching for ``no`` or ``unchecked`` will find all books with ``No`` in the col
     :align: middle
 
 .. figure:: images/search.png
+    :align: center
     
     :guilabel:`Advanced Search Dialog`
 
@@ -408,6 +423,7 @@ will be interpreted to have the title: Foundation and Earth and author: Isaac As
 Book Details
 -------------
 .. image:: images/book_details.png
+    :align: center
 
 The Book Details display shows you extra information and the cover for the currently selected book.
 
@@ -418,6 +434,7 @@ The Book Details display shows you extra information and the cover for the curre
 Tag Browser
 -------------
 .. image:: images/tag_browser.png
+   :class: float-left-img
 
 The Tag Browser allows you to easily browse your collection by Author/Tags/Series/etc. If you click on any Item in the Tag Browser, for example, the Author name, Isaac Asimov, then the list of books to the right is restricted to books by that author. Clicking once again on Isaac Asimov will restrict the list of books to books not by Isaac Asimov. A third click will remove the restriction. If you hold down the Ctrl or Shift keys and click on multiple items, then restrictions based on multiple items are created. For example you could Hold Ctrl and click on the tags History and Europe for find books on European history. The Tag Browser works by constructing search expressions that are automatically entered into the Search bar. It is a good way to learn how to construct basic search expressions. 
 
@@ -437,6 +454,7 @@ You can drag and drop items in the Tag browser onto user categories to add them
 Jobs
 -----
 .. image:: images/jobs.png
+    :class: float-left-img
 
 The Jobs panel shows you the number of currently running jobs. Jobs are tasks that run in a separate process, they include converting ebooks and talking to your reader device. You can click on the jobs panel to access the list of jobs. Once a job has completed, by double-clicking it in the list, you can see a detailed log from that job. This is useful to debug jobs that may not have completed successfully.
 

src/calibre/manual/templates/layout.html

@@ -1,4 +1,29 @@
 {% extends "!layout.html" %}
+
+{% block extrahead %}
+    {% if not embedded %}
+    <script type="text/javascript">
+
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', 'UA-20736318-1']);
+        _gaq.push(['_setDomainName', '.calibre-ebook.com']);
+        _gaq.push(['_trackPageview']);
+
+        (function() {
+            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+
+    </script>
+    {% endif %}
+
+    <style type="text/css">
+        .float-left-img { float: left; margin-right: 1em; margin-bottom: 1em }
+    </style>
+
+{% endblock %}
+
 {% block sidebarlogo %}
         <p class="logo">
             <a href="http://calibre-ebook.com"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
@@ -12,3 +37,4 @@
            <hr/>
 {% endblock %}
 
+