Bugfixes caliblur theme

cps/render_template.py

@@ -87,7 +87,7 @@ def get_sidebar_config(kwargs=None):
     sidebar.append({"glyph": "glyphicon-random", "text": _('Discover'), "link": 'web.books_list', "id": "rand",
                     "visibility": constants.SIDEBAR_RANDOM, 'public': True, "page": "discover",
                     "show_text": _('Show Random Books'), "config_show": True})
-    sidebar.append({"glyph": "glyphicon-inbox", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
+    sidebar.append({"glyph": "glyphicon-tags", "text": _('Categories'), "link": 'web.category_list', "id": "cat",
                     "visibility": constants.SIDEBAR_CATEGORY, 'public': True, "page": "category", "no_param":True,
                     "show_text": _('Show Category Section'), "config_show": True})
     sidebar.append({"glyph": "glyphicon-bookmark", "text": _('Series'), "link": 'web.series_list', "id": "serie",

cps/static/css/caliBlur.css

@@ -1321,9 +1321,9 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
     font-family: plex-icons-new, serif
 }
 
-#nav_cat .glyphicon-inbox::before, .glyphicon-tags::before {
-    content: "\E067";
-    font-family: Glyphicons Regular, serif;
+#nav_cat .glyphicon-tags::before, .glyphicon-tags::before {
+    //content: "\E067";
+    //font-family: Glyphicons Regular, serif;
     margin-left: 2px
 }
 
@@ -2975,7 +2975,6 @@ body.book .author {
     line-height: 30px;
     margin-top: -5px;
     max-width: calc(100% - 176px);
-    margin-left: 76px
 }
 
 .book-meta > p {
@@ -5080,16 +5079,24 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     right: 5px
 }
 
-body:not(.search) #shelf-actions > .btn-group.open, .downloadBtn.open, .profileDrop[aria-expanded=true] {
+body:not(.search) #shelf-actions > .btn-group.open, .profileDrop[aria-expanded=true] {
     pointer-events: none
 }
 
+.downloadBtn.open {
+    pointer-events: auto;
+}
+
+.downloadBtn > ul.dropdown-menu > li {
+    display: list-item !important;
+}
+
 #btnGroupDrop1[aria-expanded=true] > span, #shelf-actions > .btn-group.open > #add-to-shelf > span {
     color: #fff
 }
 
 .navigation li a span {
-    vertical-align: middle;
+    vertical-align: middle !important;
     margin-bottom: 1px
 }
 

cps/static/js/details.js

@@ -89,6 +89,37 @@ $("#archived_cb").on("change", function() {
     $(this).closest("form").submit();
 });
 
+$(document).on("click", ".downloadBtn > #btnGroupDrop1", function (e) {
+    var $button = $(this);
+    var $group = $button.closest(".downloadBtn");
+    var $menu = $group.children("ul.dropdown-menu");
+    var isOpen = $button.attr("aria-expanded") === "true";
+
+    e.preventDefault();
+    e.stopPropagation();
+
+    $(".downloadBtn.open").not($group).removeClass("open").children("ul.dropdown-menu").hide();
+    $(".downloadBtn > #btnGroupDrop1").not($button).attr("aria-expanded", "false");
+
+    if (isOpen) {
+        $group.removeClass("open");
+        $button.attr("aria-expanded", "false");
+        $menu.hide();
+    } else {
+        $group.addClass("open");
+        $button.attr("aria-expanded", "true");
+        $menu.removeClass("offscreen");
+        $menu.show();
+    }
+});
+
+$(document).on("click", function (e) {
+    if ($(e.target).closest(".downloadBtn").length === 0) {
+        $(".downloadBtn.open").removeClass("open").children("ul.dropdown-menu").hide();
+        $(".downloadBtn > #btnGroupDrop1").attr("aria-expanded", "false");
+    }
+});
+
 (function() {
     var templates = {
         add: _.template(

cps/themes/caliblur/templates/detail.html

@@ -49,29 +49,16 @@
                     {% if current_user.role_download() %}
                         {% if entry.data|length %}
                             <div class="btn-group downloadBtn" role="group">
-                                {% if entry.data|length < 2 %}
-                                    <button id="Download" type="button" class="btn btn-primary">
-                                        {{ _('Download') }} :
-                                    </button>
-                                    {% for format in entry.data %}
-                                        <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower|replace('kepub', 'kepub.epub')) }}"
-                                           id="btnGroupDrop1{{ format.format|lower }}" class="btn btn-primary"
-                                           role="button">
-                                            <span class="glyphicon glyphicon-download"></span>{{ format.format }}
-                                            ({{ format.uncompressed_size|filesizeformat }})
-                                        </a>
-                                    {% endfor %}
-                                {% else %}
-                                    <button id="btnGroupDrop1" type="button" class="btn btn-primary dropdown-toggle download-text"
-                                            data-toggle-two="tooltip" title="{{ _('Download') }}" data-placement="bottom" data-viewport=".btn-toolbar"
-                                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <span class="glyphicon glyphicon-download"></span> {{ _('Download') }}
-                                        <span class="caret"></span>
-                                    </button>
+                                {% if entry.data|length > 0 %}
+                                    <button id="btnGroupDrop1" type="button" class="btn btn-primary"
+                                            aria-haspopup="true" aria-expanded="false"
+                                            data-toggle-two="tooltip" title="" data-placement="bottom" data-viewport=".btn-toolbar"
+                                            data-original-title="Download :"><span class="glyphicon glyphicon-download"></span>Download :<span class="caret"></span></button>
                                     <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                                         {% for format in entry.data %}
                                             <li>
-                                                <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower|replace('kepub', 'kepub.epub')) }}">{{ format.format }}
+                                                <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower|replace('kepub', 'kepub.epub')) }}"
+                                                   id="btnGroupDrop1{{ format.format|lower }}">{{ format.format }}
                                                     ({{ format.uncompressed_size|filesizeformat }})</a></li>
                                         {% endfor %}
                                     </ul>
@@ -282,17 +269,15 @@
 
                 <div class="custom_columns">
                     {% if current_user.check_visibility(32768) %}
-                        <p>
                         <form id="archived_form" action="{{ url_for('web.toggle_archived', book_id=entry.id) }}"
                               method="POST">
                             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-                            <label class="block-label">
+                            <!--label class="block-label">
                                 <input id="archived_cb" class="readunread-btn-tooltip" type="checkbox" data-toggle="tooltip" data-placement="bottom" data-viewport=".btn-toolbar" title="{% if entry.is_archived %}{{ _('Restore from archive') }}{% else %}{{ _('Add to archive') }}{% endif %}"
                                        {% if entry.is_archived %}checked{% endif %}>
                                 <span data-toggle="tooltip" title="{{_('Mark Book as archived or not, to hide it in Calibre-Web and delete it from Kobo Reader')}}">{{ _('Archive') }}</span>
-                            </label>
+                            </label-->
                         </form>
-                        </p>
                     {% endif %}
                 </div>
             {% endif %}

cps/themes/caliblur/templates/list.html

@@ -5,7 +5,7 @@
     <span class="authorlist-icon glyphicon glyphicon-user" aria-hidden="true"></span>
   {% endif %}
   {% if page == 'catlist' %}
-    <span class="catlist-icon glyphicon glyphicon-inbox" aria-hidden="true"></span>
+    <span class="catlist-icon glyphicon glyphicon-tags" aria-hidden="true"></span>
   {% endif %}
   {% if page == 'downloadlist' %}
     <span class="downloadlist-icon glyphicon glyphicon-download" aria-hidden="true"></span>