From 0d237b52a8bfd2ff2eadd789d068d674150eb696 Mon Sep 17 00:00:00 2001
From: Klafyvel <klafyvel@gmail.com>
Date: Wed, 28 Feb 2018 18:38:40 +0100
Subject: [PATCH] =?UTF-8?q?Ic=C3=B4nes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings/templates/settings/settings.html | 29 +++++++++++++++--------
 templates/nav_bar.html                    |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/settings/templates/settings/settings.html b/settings/templates/settings/settings.html
index 6fbd4a2..3bffb27 100644
--- a/settings/templates/settings/settings.html
+++ b/settings/templates/settings/settings.html
@@ -3,9 +3,11 @@
 <h1>Page d'administration du site</h1>
 <h2>Liste des catégories</h2>
 <a class="btn btn-success btn-sm" role="button" href="{% url 'content:category-new' %}">
-    <i class="glyphicon glyphicon-plus"></i>
+    <i class="fas fa-plus"></i>
     Créer une nouvelle catégorie
 </a>
+<br />
+<br />
 <table class="table table-striped">
     <tr>
         <th>Nom de la catégorie</th>
@@ -17,11 +19,11 @@
         <td><a href="{{c.get_absolute_url}}">{{c.name}}</a></td>
         <td>{{c.content_set.count}}</td>
         <td><a class="btn  btn-outline-primary btn-sm" href="{% url "content:category-edit" c.pk %}">
-            <!--<i class="glyphicon glyphicon-edit"></i>-->
+            <i class="fas fa-edit"></i>
             Éditer
         </a>
         <a class="btn btn-outline-danger btn-sm" title="Supprimer" href="{% url "content:category-delete" c.pk %}">
-            <!--<i class="glyphicon glyphicon-trash"></i>-->
+            <i class="fas fa-trash-alt"></i>
             Supprimer
         </a>
         </td>
@@ -32,9 +34,11 @@
 
 <h2>Écoles</h2>
 <a class="btn btn-success btn-sm" role="button" href="{% url 'users:new-school' %}">
-    <i class="glyphicon glyphicon-plus"></i>
+    <i class="fas fa-plus"></i>
     Inscrire une nouvelle école
 </a>
+<br />
+<br/>
 <table class="table table-striped">
     <tr>
         <th>Nom</th>
@@ -44,12 +48,13 @@
     <tr>
         <th>{{school.group.name}}</th>
         <td>{{school.group.user_set.count}}</td>
-        <td><a class="btn btn-primary btn-sm" href="{% url "users:edit-school" pk=school.pk%}">
-            <i class="glyphicon glyphicon-edit"></i>
+        <td><a class="btn btn-outline-primary btn-sm" href="{% url "users:edit-school" pk=school.pk%}">
+            <i class="fas fa-edit"></i>
             Éditer
         </a>
-        <a class="btn btn-danger btn-sm" title="Supprimer" href="">
-            <i class="glyphicon glyphicon-trash"></i>
+        <a class="btn btn-outline-danger btn-sm" title="Supprimer" href="">
+            <i class="fas fa-trash-alt"></i>
+            Supprimer
         </a>
         </td>
     </tr>
@@ -58,9 +63,11 @@
 <h2>Réglages</h2>
 <h3>Réglages du site</h3>
 <a class="btn btn-primary btn-sm" href="{% url 'settings:site-settings' %}">
-    <i class="glyphicon glyphicon-edit"></i>
+    <i class="fas fa-edit"></i>
     Éditer
 </a>
+<br />
+<br />
 <table class="table table-striped">
     <tr>
         <th>Upload</th>
@@ -80,9 +87,11 @@
 
 <h3>Réglage du contenu</h3>
 <a class="btn btn-primary btn-sm" href="">
-    <i class="glyphicon glyphicon-edit"></i>
+    <i class="fas fa-edit"></i>
     Éditer
 </a>
+<br />
+<br />
 <table class="table table-striped">
     <tr>
         <th>URL du FTP</th>
diff --git a/templates/nav_bar.html b/templates/nav_bar.html
index 0cf3bac..e57d3e9 100644
--- a/templates/nav_bar.html
+++ b/templates/nav_bar.html
@@ -14,9 +14,9 @@
         </a></li>
         {% endfor %}
 
-        <li class="nav-item {% if settings %}active{% endif %}"><a class="nav-link" href="{% url 'settings:index' %}">Administration</a></li>
     </ul>
 	<ul class="navbar-nav ml-auto">
+        <li class="nav-item {% if settings %}active{% endif %}"><a class="nav-link" href="{% url 'settings:index' %}"><i class="fas fa-cogs"></i> Administration</a></li>
 	{% if request.user.is_authenticated %}
 		<li class="nav-item dropdown">
         	<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">