From 979bcdffd43c92721fde6a17a2f729dfd5400d41 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Sun, 9 Jul 2017 12:41:09 +0200
Subject: [PATCH] Bugfix non working download links Bugfix missing divider in
 detail page

---
 cps/static/css/style.css  |  2 +-
 cps/templates/detail.html | 36 ++++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 8b299002..f0ea4cb1 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -44,7 +44,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
 .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;}
 
 .btn-toolbar .btn,.discover .btn { margin-bottom: 5px; }
-.button-link {color:#fff;}
+
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
 .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
 .btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left:0px; }
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 14389809..6d6ecdab 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -12,7 +12,6 @@
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
-            <div class="more-stuff">
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
           {% if g.user.role_download() %}
@@ -22,12 +21,9 @@
                 {{_('Download')}} :
               </button>
                 {% for format in entry.data %}
-                <button id="btnGroupDrop1{{format.format|lower}}" type="button" class="btn btn-primary">
-                  <a class="button-link" href="{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}">
-                  <span class="glyphicon glyphicon-download"></span>
-                    {{format.format}}
-                  </a>
-                </button>
+                <a href="{{ url_for('get_download_link_ext', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}" id="btnGroupDrop1{{format.format|lower}}" class="btn btn-primary" role="button">
+                  <span class="glyphicon glyphicon-download"></span>{{format.format}}
+                </a>
                 {% endfor %}
               {% else %}
                 <button id="btnGroupDrop1" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -63,6 +59,7 @@
           {% endif %}
         </div>
       </div>
+
       <h2>{{entry.title}}</h2>
       <p class="author">
           {% for author in entry.authors %}
@@ -106,20 +103,22 @@
         {% for identifier in entry.identifiers %}
           <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.formatType()}}</a>
         {%endfor%}
-      </div>
       </p>
+      </div>
       {% endif %}
 
       {% if entry.tags|length > 0 %}
-      <p>
+
       <div class="tags">
+      <p>
         <span class="glyphicon glyphicon-tags"></span>
 
         {% for tag in entry.tags %}
           <a href="{{ url_for('category', book_id=tag.id) }}" class="btn btn-xs btn-info" role="button">{{tag.name}}</a>
         {%endfor%}
-      </div>
       </p>
+
+      </div>
       {% endif %}
       {% if entry.publishers|length > 0 %}
       <div class="publishers">
@@ -132,8 +131,9 @@
         <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
       {% endif %}
       {% if cc|length > 0 %}
-        <p>
+
         <div class="custom_columns">
+        <p>
         {% for c in cc %}
           {% if entry['custom_column_' ~ c.id]|length > 0 %}
             {{ c.name }}:
@@ -155,20 +155,21 @@
             <br />
           {% endif %}
         {% endfor %}
-        </div>
         </p>
+        </div>
       {% endif %}
       {% if not g.user.is_anonymous() %}
-      <p>
+
         <div class="custom_columns">
+          <p>
           <form id="have_read_form" action="{{ url_for('toggle_read', book_id=entry.id)}}" method="POST">
             <label class="block-label">
               <input id="have_read_cb" type="checkbox" {% if have_read %}checked{% endif %} >
               <span>{{_('Read')}}</span>
             </label>
           </form>
+          </p>
         </div>
-      </p>
       {% endif %}
 
 
@@ -178,7 +179,8 @@
       {% endif %}
 
 
-      </br>
+      <div class="more-stuff">
+
       {% if g.user.is_authenticated %}
       {% if g.user.shelf.all() or g.public_shelfes %}
       <div class="btn-toolbar" role="toolbar">
@@ -220,18 +222,20 @@
         </div>
       </div>
       {% endif %}
+
       {% endif %}
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
           <a href="{{ url_for('edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit metadata')}}</a>
+        </div>
       </div>
       {% endif %}
+      </div>
 
 
     </div>
   </div>
-</div>
 {% endblock %}
 
 {% block js %}