Merge branch 'master' of github.com:cedricbonhomme/Freshermeat

cedricbonhomme · Feb 15, 2018 · e59b933 · e59b933
2 parents a8b5d63 + 7614a8f
commit e59b933
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/web/static/js/templates.js b/src/web/static/js/templates.js
@@ -1,6 +1,5 @@
 var cardProjectTemplate = _.template(
     '<div class="card">' +
-      '<img class="card-img-top" src="<%= logo %>" alt="Card image cap">' +
       '<div class="card-body">' +
         '<h4 class="card-title"><%= project_name %></h4>' +
         '<p class="card-text"><%= project_description %></p>' +

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
@@ -100,9 +100,11 @@
 
 {% block content %}{% endblock %}
 
+<br />
 <footer class="footer">
     <div class="container-fluid">
         <span class="text-muted"><a href="https://github.com/cedricbonhomme/Freshermeat">Freshermeat</a></span>
+        &nbsp;
         <span class="text-muted">GNU Affero General Public License</span>
     </div>
 </footer>

diff --git a/src/web/templates/projects.html b/src/web/templates/projects.html
@@ -14,7 +14,7 @@ <h3>Projects
     </div>
     <div id="list-projects" class="list-group"></div>
     <br />
-    <nav id="navigation" aria-label="...">
+    <nav id="navigation" style="display: none;">
         <ul class="pagination">
             <li class="page-item">
                 <a class="page-link" href="#" id="paginationF">First</a>
@@ -91,6 +91,8 @@ <h3>Projects
                 });
 
                 if (projects.total_pages > 2) {
+                    $('#navigation').attr("style", "display: inline-block;");
+
                     if (projects.page == 1) {
                         $('#paginationF').parent().addClass("disabled");
 
@@ -143,6 +145,8 @@ <h3>Projects
                     }
                 }
                 else if (projects.total_pages == 2) {
+                    $('#navigation').attr("style", "display: inline-block;");
+
                     $('#paginationF').parent().addClass("disabled");
 
                     $('#pagination1').text(1);
@@ -156,9 +160,6 @@ <h3>Projects
 
                     $('#paginationL').parent().addClass("disabled");
                 }
-                else {
-                    $('#navigation').remove();
-                }
             }
     });
 }