Make user page covers shelf clickable

fedireads/static/js/feed.js

@@ -1,11 +0,0 @@
-function show_compose(element) {
-    var visible_compose_boxes = document.getElementsByClassName('visible');
-    for (var i = 0; i < visible_compose_boxes.length; i++) {
-        visible_compose_boxes[i].className = 'compose-suggestion';
-    }
-
-    var target_id = 'compose-' + element.id;
-    var target = document.getElementById(target_id);
-    target.className += ' visible';
-}
-

fedireads/static/js/shared.js

@@ -1,3 +1,14 @@
+function show_compose(element) {
+    var visible_compose_boxes = document.getElementsByClassName('visible');
+    for (var i = 0; i < visible_compose_boxes.length; i++) {
+        visible_compose_boxes[i].className = 'compose-suggestion';
+    }
+
+    var target_id = 'compose-' + element.id;
+    var target = document.getElementById(target_id);
+    target.className += ' visible';
+}
+
 function hide_element(element) {
     var classes = element.parentElement.className;
     element.parentElement.className = classes.replace('visible', '');

fedireads/templates/feed.html

@@ -2,22 +2,8 @@
 {% load fr_display %}
 {% block content %}
 
-<div class="all-shelves content-container">
+{% include 'snippets/covers_shelf.html' with shelves=shelves user=request.user %}
-    {% include 'snippets/covers_shelf.html' with shelves=shelves user=request.user %}
-</div>
 
-{% for shelf in shelves %}
-    {% for book in shelf.books %}
-<div class="compose-suggestion" id="compose-book-{{ book.id }}">
-    <span class="close icon icon-close" onclick="hide_element(this)">
-        <span class="hidden-text">Close</span>
-    </span>
-    <div class="content-container">
-        {% include 'snippets/create_status.html' with book=book user=request.user %}
-    </div>
-</div>
-    {% endfor %}
-{% endfor %}
 
 <div id="feed">
     <div class="content-container tabs">
@@ -31,5 +17,4 @@
     {% endfor %}
 </div>
 
-<script src="/static/js/feed.js"></script>
 {% endblock %}

fedireads/templates/snippets/covers_shelf.html

@@ -1,7 +1,9 @@
 {% load fr_display %}
-{% for shelf in shelves %}
+
-{% if shelf.books %}
+<div class="all-shelves content-container">
-<div>
+    {% for shelf in shelves %}
+    {% if shelf.books %}
+    <div>
         <h2>{{ shelf.name }}
             {% if shelf.size > shelf.books|length %}
             <small>(<a href="/shelf/{{ user | username }}/{{ shelf.identifier }}">See all {{ shelf.size }}</a>)</small>
@@ -15,6 +17,20 @@
             </div>
             {% endfor %}
         </div>
+    </div>
+    {% endif %}
+    {% endfor %}
 </div>
-{% endif %}
+
+{% for shelf in shelves %}
+    {% for book in shelf.books %}
+<div class="compose-suggestion" id="compose-book-{{ book.id }}">
+    <span class="close icon icon-close" onclick="hide_element(this)">
+        <span class="hidden-text">Close</span>
+    </span>
+    <div class="content-container">
+        {% include 'snippets/create_status.html' with book=book user=request.user %}
+    </div>
+</div>
+    {% endfor %}
 {% endfor %}

fedireads/templates/user.html

@@ -2,9 +2,7 @@
 {% block content %}
 
 {% include 'user_header.html' with user=user %}
-<div class="all-shelves content-container">
+{% include 'snippets/covers_shelf.html' with shelves=shelves user=user %}
-    {% include 'snippets/covers_shelf.html' with shelves=shelves user=user %}
-</div>
 
 <div>
     <div class="content-container"><h2>User Activity</h2></div>