# HG changeset patch
# User durandn
# Date 1481294282 -3600
# Node ID ad4e1e9bc75df5607a157917223f8457cc383903
# Parent  e91d36cbdfcfe0f0612ed06a884f1ed989f9b02f
reworked home (temporary)

diff -r e91d36cbdfcf -r ad4e1e9bc75d src/iconolab/static/iconolab/css/iconolab.css
--- a/src/iconolab/static/iconolab/css/iconolab.css	Fri Dec 09 14:41:46 2016 +0100
+++ b/src/iconolab/static/iconolab/css/iconolab.css	Fri Dec 09 15:38:02 2016 +0100
@@ -1,5 +1,18 @@
 body {padding-top: 20px; padding-bottom: 20px}
 
+.navbar-container{
+	vertical-align:middle;
+}
+.navbar-homepage {
+    width: calc(100% - 320px);
+    display: inline-block;
+    margin-top: 12px;
+    vertical-align:middle;
+}
+.homepage-logo{
+	display:inline-block;
+}
+
 .drawingModeBtn {border: 1px solid orange; cursor: pointer; height: 25px; margin-bottom: 10px}
 
 .form-drawing {border-bottom: 1px solid #C3C3C3; }
diff -r e91d36cbdfcf -r ad4e1e9bc75d src/iconolab/static/iconolab/img/iconolab.png
Binary file src/iconolab/static/iconolab/img/iconolab.png has changed
diff -r e91d36cbdfcf -r ad4e1e9bc75d src/iconolab/templates/iconolab/home.html
--- a/src/iconolab/templates/iconolab/home.html	Fri Dec 09 14:41:46 2016 +0100
+++ b/src/iconolab/templates/iconolab/home.html	Fri Dec 09 15:38:02 2016 +0100
@@ -7,7 +7,7 @@
 
 {% block content %}
 <div id="homepage-main" class="row">
-  <div id="main-panel" class="container" style="padding-top: 15px; padding-bottom: 15px;">
+  <div id="main-panel" class="container" style="padding-top: 15px;">
     {% for collection in collections_primary %}
       {% if not forloop.counter|divisibleby:2 %}
         <div class="row" style="margin-bottom:25px;">
@@ -45,7 +45,7 @@
         <ul class="list-inline list-unstyled pull-right">
           <li><div id="show-main-collections" class="btn btn-default btn-xs btn-collection" @click="showMainPanel()">Retour page principale</div></li>
         </ul>
-        <h1 class="collection-title"><small>Fonds Iconolab</small> {{ collection.verbose_name }}</h1>
+        <h1 class="collection-title"><small>Fonds</small> {{ collection.verbose_name }}</h1>
         <p id="collection-description-short-{{collection.name}}" class="text-justify collection-description"> 
           {{collection.description | safe}} 
           {% if collection.complete_description %}<a id="show-complete-{{collection.name}}" class="show-complete-link" @click="showCompleteDescription('{{collection.name}}')"> Voir plus</a></p>{% endif %}
diff -r e91d36cbdfcf -r ad4e1e9bc75d src/iconolab/templates/partials/footer.html
--- a/src/iconolab/templates/partials/footer.html	Fri Dec 09 14:41:46 2016 +0100
+++ b/src/iconolab/templates/partials/footer.html	Fri Dec 09 15:38:02 2016 +0100
@@ -2,7 +2,7 @@
 {% load iconolab_tags %}
 
 <div class="container">
-<hr>
+<hr style="margin-top: 5px;">
   <div class="pull-left footer-info">
     <h4><small>Version {% version %}</small></h4>
   </div>
diff -r e91d36cbdfcf -r ad4e1e9bc75d src/iconolab/templates/partials/header.html
--- a/src/iconolab/templates/partials/header.html	Fri Dec 09 14:41:46 2016 +0100
+++ b/src/iconolab/templates/partials/header.html	Fri Dec 09 15:38:02 2016 +0100
@@ -1,37 +1,44 @@
 {% load notifications_tags %}
-<nav class="navbar navbar-default" {% if collection %} style="margin-bottom: 5px;" {% endif %}>
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">{{ greeting }}</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="{% url 'home' %}">Iconolab</a>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <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 %}
-          <li><a href="{% url 'user_home' request.user.id %}">
-            {{request.user.username}} : Mon espace <span class="badge {% if unread_count %}badge-warning{% endif %}">
-            {{ unread_count }} <i class="fa fa-envelope-o" aria-hidden="true"></i> </span>
-          </a></li>
-          <li><a href="{% url 'account:logout' %}">Se déconnecter</a></li>
-        {% else %}
-          <li><a href="{% url 'account:register' %}">Créer un compte</a></li>
-          <li><a href="{% url 'account:login' %}?next={{ request.path | urlencode }}">Se Connecter</a></li>
-        {% endif %}
-      </ul>
-    </div><!--/.nav-collapse -->
-  </div><!--/.container-fluid -->
-</nav>
+{% load staticfiles %}
+
+<div class="navbar-container">
+  {% if homepage %}
+    <a class="homepage-logo" href="{% url 'home' %}">
+      <img src="{% static 'iconolab/img/iconolab.png' %}" width="306" height="67"> 
+    </a>
+  {% endif %}
+  <nav class="navbar navbar-default {% if homepage %}navbar-homepage{% endif %}" {% if collection %} style="margin-bottom: 5px;" {% endif %}>
+    <div class="container-fluid">
+      <div class="navbar-header">
+          {% if not homepage %}
+            <a class="navbar-brand" href="{% url 'home' %}">
+              Iconolab
+            </a>
+          {% endif %}
+      </div>
+      <div id="navbar" class="navbar-collapse collapse">
+        <ul class="nav navbar-nav">
+          <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 %}
+            <li><a href="{% url 'user_home' request.user.id %}">
+              {{request.user.username}} : Mon espace <span class="badge {% if unread_count %}badge-warning{% endif %}">
+              {{ unread_count }} <i class="fa fa-envelope-o" aria-hidden="true"></i> </span>
+            </a></li>
+            <li><a href="{% url 'account:logout' %}">Se déconnecter</a></li>
+          {% else %}
+            <li><a href="{% url 'account:register' %}">Créer un compte</a></li>
+            <li><a href="{% url 'account:login' %}?next={{ request.path | urlencode }}">Se Connecter</a></li>
+          {% endif %}
+        </ul>
+      </div><!--/.nav-collapse -->
+    </div><!--/.container-fluid -->
+  </nav>
+</div>
 {% include "partials/header_breadcrumbs.html" %}