Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master

cps/templates/discover.html

@@ -15,7 +15,7 @@
       </div>
       <div class="meta">
         <p class="title">{{entry.title|shortentitle}}</p>
-        <p class="author"><a href="{{url_for('author', name=entry.authors[0].name | urlencode) }}">{{entry.authors[0].name}}</a></p>
+        <p class="author"><a href="{{url_for('author', id=entry.authors[0].id) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
           {% for number in range((entry.ratings[0].rating/2)|int(2)) %}

cps/templates/search.html

@@ -24,7 +24,7 @@
         <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
           {% for author in entry.authors %}
-            <a href="{{url_for('author', name=author.name | urlencode) }}">{{author.name}}</a>
+            <a href="{{url_for('author', id=author.id ) }}">{{author.name}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}