From a02a5817493c05fb763ffd7615ed3b729a3bb9d8 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 2 Jun 2015 11:14:30 +0200
Subject: [PATCH] authentic2/templates: add a block around the navigation menu
 and hide it on the login page

---
 authentic2/static/{cdg59 => pratic2}/admon-tip.png  | Bin
 authentic2/static/{cdg59 => pratic2}/authentic.css  |   0
 authentic2/static/{cdg59 => pratic2}/deg.png        | Bin
 authentic2/static/{cdg59 => pratic2}/desc.xml       |   0
 authentic2/static/{cdg59 => pratic2}/lock.svg       |   0
 .../static/{cdg59 => pratic2}/lockscreen-bg.png     | Bin
 authentic2/static/{cdg59 => pratic2}/lockscreen.png | Bin
 authentic2/static/{cdg59 => pratic2}/path18223.png  | Bin
 authentic2/static/{cdg59 => pratic2}/path18223.xcf  | Bin
 authentic2/templates/authentic2/base.html           |   2 ++
 authentic2/templates/authentic2/login.html          |   4 +++-
 11 files changed, 5 insertions(+), 1 deletion(-)
 rename authentic2/static/{cdg59 => pratic2}/admon-tip.png (100%)
 rename authentic2/static/{cdg59 => pratic2}/authentic.css (100%)
 rename authentic2/static/{cdg59 => pratic2}/deg.png (100%)
 rename authentic2/static/{cdg59 => pratic2}/desc.xml (100%)
 rename authentic2/static/{cdg59 => pratic2}/lock.svg (100%)
 rename authentic2/static/{cdg59 => pratic2}/lockscreen-bg.png (100%)
 rename authentic2/static/{cdg59 => pratic2}/lockscreen.png (100%)
 rename authentic2/static/{cdg59 => pratic2}/path18223.png (100%)
 rename authentic2/static/{cdg59 => pratic2}/path18223.xcf (100%)

diff --git a/authentic2/static/cdg59/admon-tip.png b/authentic2/static/pratic2/admon-tip.png
similarity index 100%
rename from authentic2/static/cdg59/admon-tip.png
rename to authentic2/static/pratic2/admon-tip.png
diff --git a/authentic2/static/cdg59/authentic.css b/authentic2/static/pratic2/authentic.css
similarity index 100%
rename from authentic2/static/cdg59/authentic.css
rename to authentic2/static/pratic2/authentic.css
diff --git a/authentic2/static/cdg59/deg.png b/authentic2/static/pratic2/deg.png
similarity index 100%
rename from authentic2/static/cdg59/deg.png
rename to authentic2/static/pratic2/deg.png
diff --git a/authentic2/static/cdg59/desc.xml b/authentic2/static/pratic2/desc.xml
similarity index 100%
rename from authentic2/static/cdg59/desc.xml
rename to authentic2/static/pratic2/desc.xml
diff --git a/authentic2/static/cdg59/lock.svg b/authentic2/static/pratic2/lock.svg
similarity index 100%
rename from authentic2/static/cdg59/lock.svg
rename to authentic2/static/pratic2/lock.svg
diff --git a/authentic2/static/cdg59/lockscreen-bg.png b/authentic2/static/pratic2/lockscreen-bg.png
similarity index 100%
rename from authentic2/static/cdg59/lockscreen-bg.png
rename to authentic2/static/pratic2/lockscreen-bg.png
diff --git a/authentic2/static/cdg59/lockscreen.png b/authentic2/static/pratic2/lockscreen.png
similarity index 100%
rename from authentic2/static/cdg59/lockscreen.png
rename to authentic2/static/pratic2/lockscreen.png
diff --git a/authentic2/static/cdg59/path18223.png b/authentic2/static/pratic2/path18223.png
similarity index 100%
rename from authentic2/static/cdg59/path18223.png
rename to authentic2/static/pratic2/path18223.png
diff --git a/authentic2/static/cdg59/path18223.xcf b/authentic2/static/pratic2/path18223.xcf
similarity index 100%
rename from authentic2/static/cdg59/path18223.xcf
rename to authentic2/static/pratic2/path18223.xcf
diff --git a/authentic2/templates/authentic2/base.html b/authentic2/templates/authentic2/base.html
index dbaf9ae..474e925 100644
--- a/authentic2/templates/authentic2/base.html
+++ b/authentic2/templates/authentic2/base.html
@@ -33,6 +33,7 @@
           </ul>
           {% endif %}
         {% endblock %}
+	{% block nav %}
         {% if user.is_authenticated %}
         <div id="nav">
           <p>Bonjour {{ user.get_full_name }}</p>
@@ -59,6 +60,7 @@
           </ul>
         </div>
         {% endif %}
+	{% endblock %}
         <div id="main-content">
           {% block content %}{% endblock %}
         </div> <!-- main-content -->
diff --git a/authentic2/templates/authentic2/login.html b/authentic2/templates/authentic2/login.html
index 9194f8d..e7f713a 100644
--- a/authentic2/templates/authentic2/login.html
+++ b/authentic2/templates/authentic2/login.html
@@ -15,8 +15,10 @@
 <script type="text/javascript" src="{{ STATIC_URL }}jquery/js/jquery.simplemodal.js"></script>
 {% endblock %}
 
-{% block content %}
+{% block nav %}
+{% endblock %}
 
+{% block content %}
 <div id="info-box">
   <h1>Connexion</h1>
 </div>