From 5891cc2c43834b10556a2d46b8f39748d1300e7c Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 19 Feb 2018 09:37:13 +0100
Subject: [PATCH] Add fields layout for TeacherAdmin

---
 stages/admin.py                | 8 ++++++--
 stages/static/css/stages.css   | 5 +++++
 templates/admin/base_site.html | 4 +++-
 templates/admin/index.html     | 6 +-----
 templates/attribution.html     | 2 +-
 templates/classes.html         | 2 +-
 templates/corporation.html     | 2 +-
 7 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 stages/static/css/stages.css

diff --git a/stages/admin.py b/stages/admin.py
index 58d6bbb..ef231cc 100644
--- a/stages/admin.py
+++ b/stages/admin.py
@@ -85,8 +85,12 @@ class KlassAdmin(admin.ModelAdmin):
 
 
 class TeacherAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'abrev', 'email', 'archived')
-    list_filter = (('archived', ArchivedListFilter),)
+    list_display = ('__str__', 'abrev', 'email', 'contract', 'rate', 'archived')
+    list_filter = (('archived', ArchivedListFilter), 'contract')
+    fields = (('civility', 'last_name', 'first_name', 'abrev'),
+              ('birth_date', 'email', 'ext_id'),
+              ('contract', 'rate', 'archived'),
+              ('previous_report', 'next_report'))
     actions = [print_charge_sheet]
 
 
diff --git a/stages/static/css/stages.css b/stages/static/css/stages.css
new file mode 100644
index 0000000..9d54b63
--- /dev/null
+++ b/stages/static/css/stages.css
@@ -0,0 +1,5 @@
+/* Menu above apps on index page */
+ul#main li { font-size: 14px; }
+
+form#teacher_form input#id_abrev { width: 3em; }
+form#teacher_form input#id_civility { width: 5em; }
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
index fa8c082..ccb4abc 100644
--- a/templates/admin/base_site.html
+++ b/templates/admin/base_site.html
@@ -1,8 +1,10 @@
 {% extends "admin/base.html" %}
-{% load i18n %}
+{% load i18n static %}
 
 {% block title %}{{ title }} | {% trans 'Gestion stages' %}{% endblock %}
 
+{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% static 'css/stages.css' %}">{% endblock %}
+
 {% block branding %}
 <h1 id="site-name">École Pierre-Coullery<br>Gestion des stages</h1>
 {% endblock %}
diff --git a/templates/admin/index.html b/templates/admin/index.html
index a85222f..078ef49 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -2,11 +2,7 @@
 {% load i18n admin_static %}
 
 {% block extrastyle %}{{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}">
-  <style>
-    ul#main { margin: 1em; }
-    ul#main li { font-size: 14px; }
-  </style>
+  <link rel="stylesheet" type="text/css" href="{% static 'admin/css/dashboard.css' %}">
 {% endblock %}
 
 {% block coltype %}colMS{% endblock %}
diff --git a/templates/attribution.html b/templates/attribution.html
index 386147d..0a54fea 100644
--- a/templates/attribution.html
+++ b/templates/attribution.html
@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_static %}
 
-{% block extrastyle %}
+{% block extrastyle %}{{ block.super }}
 <style>
   div#period_choice { margin: 0 auto; text-align: center; width: 60%; padding: 0.5em; margin-bottom: 1em; background-color: #EDF3FE;}
   select#section_select { width: 8em; margin-right: 2em; }
diff --git a/templates/classes.html b/templates/classes.html
index 09b70d9..b107dd8 100644
--- a/templates/classes.html
+++ b/templates/classes.html
@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 
-{% block extrastyle %}
+{% block extrastyle %}{{ block.super }}
 <style>
   div.section {border: 1px solid #ccc; float: left; margin-right: 5em;}
 </style>
diff --git a/templates/corporation.html b/templates/corporation.html
index a2b2539..6019b66 100644
--- a/templates/corporation.html
+++ b/templates/corporation.html
@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}
+{% block extrastyle %}{{ block.super }}
 <style>
   h3 {background-color: #eee; padding: 4px;}
   tr.totaux td {font-style: italic;}