Merge remote-tracking branch 'upstream/master'

cps/templates/detail.html

@@ -9,7 +9,7 @@
         {% endif %}
       </div>
     </div>
-    <div class="col-lg-7 book-meta">
+    <div class="col-sm-9 col-lg-9 book-meta">
       <h2>{{entry.title}}</h2>
       <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a>
       </p>

cps/templates/discover.html

@@ -14,7 +14,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title}}</p>
+        <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">

cps/templates/index.html

@@ -15,7 +15,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title}}</p>
+        <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">
@@ -50,7 +50,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title}}</p>
+        <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">

cps/templates/search.html

@@ -21,7 +21,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title}}</p>
+        <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">

cps/templates/shelf.html

@@ -14,7 +14,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <p class="title">{{entry.title}}</p>
+        <p class="title">{{entry.title|shortentitle}}</p>
         <p class="author"><a href="{{url_for('author', name=entry.authors[0].name) }}">{{entry.authors[0].name}}</a></p>
         {% if entry.ratings.__len__() > 0 %}
         <div class="rating">