Merge remote-tracking branch 'kennyl/travis'

# Conflicts:
#	cps/web.py

cps/templates/book_edit.html

@@ -150,9 +150,7 @@
 </script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-<<<<<<< HEAD
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
-=======
 <script src="{{ url_for('static', filename='js/get_meta.js') }}"></script>
 {% endblock %}
 {% block header %}

cps/templates/detail.html

@@ -126,7 +126,7 @@
               </button>
               <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                 {% for format in entry.data %}
-                <li><a href="{{ url_for('get_download_link', book_id=entry.id, format=format.format|lower) }}">{{format.format}}</a></li>
+                <li><a href="{{ url_for('get_download_link_ext', book_id=entry.id, format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}">{{format.format}}</a></li>
                 {%endfor%}
               </ul>
             </div>

cps/web.py

@@ -1308,7 +1308,6 @@ def read_book(book_id, format):
         flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
         return redirect(url_for("index"))
 
-
 @app.route("/download/<int:book_id>/<format>")
 @login_required_if_no_ano
 @download_required
@@ -1335,6 +1334,11 @@ def get_download_link(book_id, format):
     else:
         abort(404)
 
+@app.route("/download/<int:book_id>/<format>/<anyname>")
+@login_required_if_no_ano
+@download_required
+def get_download_link_ext(book_id, format, anyname):
+    return get_download_link(book_id, format)
 
 @app.route('/register', methods=['GET', 'POST'])
 def register():