Simplify layout, change header navbar.
--- a/src/iconolab/templates/iconolab/detail_image.html Fri Apr 14 18:09:19 2017 +0200
+++ b/src/iconolab/templates/iconolab/detail_image.html Mon Apr 17 12:39:55 2017 +0200
@@ -4,7 +4,7 @@
{% load thumbnail %}
{% load iconolab_tags %}
-{% block content_fluid %}
+{% block content %}
{% if messages %}
{% for message in messages %}
--- a/src/iconolab/templates/iconolab_base.html Fri Apr 14 18:09:19 2017 +0200
+++ b/src/iconolab/templates/iconolab_base.html Mon Apr 17 12:39:55 2017 +0200
@@ -21,15 +21,11 @@
{% endblock %}
<body>
- {% include "partials/header.html" %}
+ {% include "partials/header.html" %}
- <div class="container">
- {% block content %}{% endblock %}
- </div>
-
- <div class="container-fluid">
- {% block content_fluid %}{% endblock %}
- </div>
+ <div class="{% if request.resolver_match.url_name == 'image_detail' %}container-fluid{% else %}container{% endif %}">
+ {% block content %}{% endblock %}
+ </div>
<footer>
{% include "partials/footer.html" %}
--- a/src/iconolab/templates/partials/header.html Fri Apr 14 18:09:19 2017 +0200
+++ b/src/iconolab/templates/partials/header.html Mon Apr 17 12:39:55 2017 +0200
@@ -4,7 +4,7 @@
<header>
<section id="topnav">
<nav class="navbar navbar-default">
- <div class="container">
+ <div class="{% if request.resolver_match.url_name == 'image_detail' %}container-fluid{% else %}container{% endif %}">
<div class="navbar-header">
{# {% if not homepage %} #}
<a class="navbar-brand" href="{% url 'home' %}">
@@ -17,6 +17,7 @@
<li><a href="{% url 'iconolab_help' %}">Le projet</a></li>
{% if collection_name %}<li><a href="{% url 'collection_home' collection_name %}">Contribuer</a></li>{% endif %}
</ul>
+ {% include "partials/header_search_form.html"%}
<ul class="nav navbar-nav navbar-right">
{% if request.user.is_authenticated %}
{% notifications_unread as unread_count %}
@@ -34,13 +35,8 @@
</div><!--/.container-fluid -->
</nav>
</section>
- <section id="topsearch">
- <div class="container">
- {% include "partials/header_search_form.html"%}
- </div>
- </section>
</header>
-<div class="container">
+<div class="{% if request.resolver_match.url_name == 'image_detail' %}container-fluid{% else %}container{% endif %}">
{% include "partials/header_breadcrumbs.html" %}
</div>
--- a/src/iconolab/templates/partials/header_search_form.html Fri Apr 14 18:09:19 2017 +0200
+++ b/src/iconolab/templates/partials/header_search_form.html Mon Apr 17 12:39:55 2017 +0200
@@ -1,21 +1,15 @@
{% if collection_name %}
- <form method="GET" action="{% url 'search_indexes:collection_haystack_search' collection_name %}" role="search">
- {% else %}
- <form method="GET" action="{% url 'search_indexes:haystack_search' %}" role="search">
+<form class="navbar-form navbar-left" method="GET" action="{% url 'search_indexes:collection_haystack_search' collection_name %}" role="search">
+ {% else %}
+<form class="navbar-form navbar-left" method="GET" action="{% url 'search_indexes:haystack_search' %}" role="search">
{% endif %}
- <div class="row">
- <div class="col-sm-8">
- <input name="q" type="text" class="form-control" placeholder="Trouver ...">
- </div>
- <div class="col-sm-3">
- <select name="model_type" class="form-control">
- <option value="images">Images</option>
- <option value="annotations">Annotations</option>
- </select>
- </div>
- <div class="col-sm-1">
- <button type="submit" class="btn btn-default btn-block"><i class="fa fa-search" aria-hidden="true"></i></button>
- </div>
+ <div class="form-group">
+ <input name="q" type="text" class="form-control" placeholder="Trouver ...">
+ <select name="model_type" class="form-control">
+ <option value="images">Images</option>
+ <option value="annotations">Annotations</option>
+ </select>
+ <button type="submit" class="btn btn-default"><i class="fa fa-search" aria-hidden="true"></i></button>
</div>
</form>