Visible book download buttons.

diff --git a/src/catalogue/templates/catalogue/book_short.html b/src/catalogue/templates/catalogue/book_short.html
index 1df91ca..cc27443 100644 (file)
--- a/src/catalogue/templates/catalogue/book_short.html
+++ b/src/catalogue/templates/catalogue/book_short.html
@@ -117,33 +117,28 @@
             {% endif %}
           </li>
           <li class="book-box-download">
             {% endif %}
           </li>
           <li class="book-box-download">

-            <a class="downarrow">{% trans "Download" %}:</a>

             <div class="book-box-formats">
               {% if book.pdf_file %}
             <div class="book-box-formats">
               {% if book.pdf_file %}

-                <span><a href="{{ book.pdf_url}}">PDF</a></span>
+                <a href="{{ book.pdf_url}}">PDF</a>

               {% endif %}
               {% if book.epub_file %}
               {% endif %}
               {% if book.epub_file %}

-                <span><a href="{{ book.epub_url}}">EPUB</a></span>
+                <a href="{{ book.epub_url}}">EPUB</a>

               {% endif %}
               {% if book.mobi_file %}
               {% endif %}
               {% if book.mobi_file %}

-                <span><a href="{{ book.mobi_url}}">MOBI</a></span>
+                <a href="{{ book.mobi_url}}">MOBI</a>

               {% endif %}
               {% endif %}

-              {% if book.has_audio %}
-                <span><a href="{% url 'download_zip_mp3' book.slug %}">MP3</a></span>
+              {% if  book.fb2_file %}
+                <a href="{{ book.fb2_url}}">FB2</a>

               {% endif %}
               {% endif %}

-              <a class="read-more-show hide" href="#">{% trans "more" %}</a>
-              <span class="read-more-content">
-                {% if  book.fb2_file %}
-                  <span><a href="{{ book.fb2_url}}">FB2</a></span>
-                {% endif %}
-                {% if  book.txt_file %}
-                  <span><a href="{{ book.txt_url}}">TXT</a></span>
-                {% endif %}
-                {% download_audio book mp3=False %}
-                <br>
+              {% if  book.txt_file %}
+                <a href="{{ book.txt_url}}">TXT</a>
+              {% endif %}
+            </div>
+            <div class="book-box-formats">
+              {% download_audio book %}
+            </div>
+            <div class="book-box-formats">

                 {% custom_pdf_link_li book %}
                 {% custom_pdf_link_li book %}

-                <a class="read-more-hide hide" href="#">{% trans "less" %}</a>
-              </span>

             </div>
           </li>
         </ul>
             </div>
           </li>
         </ul>

diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss
index fde8bb9..8e47bfe 100644 (file)
--- a/src/wolnelektury/static/scss/main/book_box.scss
+++ b/src/wolnelektury/static/scss/main/book_box.scss
@@ -459,14 +459,16 @@
     }
 
     .book-box-formats {
     }
 
     .book-box-formats {

-      display: inline-block;

       max-width: 300px;
       vertical-align: top;
       padding-top: 6px;
       max-width: 300px;
       vertical-align: top;
       padding-top: 6px;

+      border-collapse: collapse;

 
       a {
 
       a {

-        display: inline-block;
+        display: table-cell;

         @include size(padding, .2em 1em);
         @include size(padding, .2em 1em);

+        border:1px solid black;
+        line-height: 20px;

       }
     }
   }
       }
     }
   }