Resolve merge conflicts

2021-09-16 22:58:54 -05:00
parent 10731696df 8dc1e9bfa4
commit 04a5db5c1d
753 changed files with 106429 additions and 94299 deletions
@@ -11,6 +11,7 @@
          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
            <span class="img">
              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
+              <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
            </span>
          </a>
@@ -18,7 +19,7 @@
      </div>
      <div class="meta">
        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-          <p class="title">{{entry.title|shortentitle}}</p>
+          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
        </a>
        <p class="author">
          {% for author in entry.authors %}