Remaster (#38)

* setup new 'statistiques' module

* added 'graphos' package and created first test graph

* put graphos in requirements, deleted local folder

* added "load_csv" management command !

* added update of premiere_rencontre field in 'load_csv' management command

* added missing urls.py file

* added 'merge' action and view

* added 'info_completed' ratio

* linked sujets:merge views inside suivi:details

* added link to maraudes:details in notes table headers, if any

* Major reorganisation, moved 'suivi' and 'sujets' to 'notes', cleanup in 'maraudes', dropping 'website' mixins (mostly useless)

* small cleanup

* worked on Maraude and Sujet lists

* corrected missing line in notes.__init__

* restored 'details' view for maraudes and sujets insie 'notes' module

* worked on 'notes': added navigation between maraude's compte-rendu, right content in details, header to list tables

* changed queryset for CompteRenduDetailsView to all notes of same date, minor layout changes

* added right content to 'details-sujet', created 'statistiques' view and update templates

* restored 'statistiques' ajax view in 'details-sujet', fixed 'merge_two' util function

* added auto-creation of FicheStatistique (plus some tests), pagination for notes in 'details-sujet'

* added error-prone cases in paginator

* fixed non-working modals, added titles

* added UpdateStatistiques capacity in CompteRenduCreate view

* fixed missing AjaxTemplateMixin for CreateSujetView, worked on compte-rendu creation scripts

* fixed MaraudeManager.all_of() for common Maraudeurs, added color hints in planning

* re-instated statistiques module link and first test page

* added FinalizeView to send a mail before finalizing compte-rendu

* Added PieChart view for FicheStatistique fields

* small style updates, added 'age' and 'genre' fields from sujets in statistiques.PieChartView

* worked on statistiques, fixed small issues in 'notes' list views

* small theme change

* removed some dead code

* fixed notes.tests, fixed statistiques.info_completed display, added filter in SujetLisView

* added some tests

* added customised admin templates

* added authenticate in CustomAuthenticatationBackend, more verbose login thanks to messages

* added django-nose for test coverage

* Corrected raising exception on first migration

On first migration, qs.exists() would previously be called and raising an Exception, sot he migrations would fail.

* Better try block

* cleaned up custom settings.py, added some overrides of django base_settings

* corrected bad dictionnary key

website/static/css/base.css

@@ -1,32 +1,127 @@
-
-.navbar-fixed-side .navbar-nav>li>a {
-  border-bottom: none;
-  font-variant: small-caps;
-  color: #fff;
+body {
+  padding: 0px 0 10px 0;
 }
 
-#menu {
-  border: none;
-  border-right: 4px solid #980300;
-  background-color: #121212;
+#page-header {
+  font-size:1.1em;
+  font-weight: bold;
 }
 
-@media (max-width:768px){
-  #menu { border: none; }
+.navbar-text.breadcrumb {
+  padding: 0px;
+  margin-bottom: 0px;
 }
 
-.app-menu {
-  background-color: #121212;
-  border: none;
+.navbar-text.breadcrumb > li {
+  font-size: 1.2em;
+}
+
+.navbar-text.breadcrumb > li > a {
+  color: #e2f2f2;
+}
+
+.navbar-text.breadcrumb > li > a:hover {
+  color: #d9230f;
+}
+
+/* Admin overrides */
+
+#content-related {
+  margin-right: 0px !important;
 }
 
 
-.active{
-  border-right: 2px solid #980300 !important;
+/* Bootstrap Navbar custom */
+
+.navbar-default {
+  background-color: #2e2f2f;
+  border-color: #a91b0c;
+}
+.navbar-default .navbar-brand {
+  color: #f6f6f6;
+}
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
+  color: #ffffff;
+}
+.navbar-default .navbar-text {
+  color: #f6f6f6;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #f6f6f6;
+  font-weight: bold;
+  font-size: 1.1em;
+  min-height: 45px;
+}
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #2e2f2f;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #f6f6f6;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ffffff;
+  background-color: #d2220f;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #d2220f;
+}
+.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+.navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+.navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  background-color: #d2220f;
+}
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #ffffff;
+  background-color: #d2220f;
+}
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
+.navbar-default .navbar-nav > .open > a:focus {
+  color: #ffffff;
+  background-color: #d2220f;
+}
+.navbar-default .navbar-toggle {
+  border-color: #d2220f;
+}
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+  background-color: #d2220f;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #f6f6f6;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #f6f6f6;
+}
+.navbar-default .navbar-link {
+  color: #f6f6f6;
+}
+.navbar-default .navbar-link:hover {
+  color: #ffffff;
 }
 
-.dropdown-menu {
-  border-bottom: none !important;
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #f6f6f6;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ffffff;
+    background-color: #d2220f;
+  }
 }
-
-

website/static/css/bootstrap/config.json

@@ -432,4 +432,4 @@
     "transition.js"
   ],
   "customizerUrl": "http://getbootstrap.com/customize/?id=7f853f3d936c9ba68499a06009229bc9"
-}
+}