Commit Graph

141 Commits

Author SHA1 Message Date
artus40
0be59a61a7 Navbar (#31)
* started workin on 'navbar' module

* changed bootstrap theme to bootswatch/Simplex

* big work on navbar logic

* starting creating menus using navbar

* converted app views to new Wepage decorator, updated navbar

* reimplemented DernieresMaraudes as a dropdown instead of ContextMixin

* reorganised static files, minor code cleanups

* turned Link.href into lazy-evaluated property

* collapsed 'navbar' module into 'website', dynamic building of ApplicationMenu subclasses

* minor cleanup

* blah blah blah

* added way to add admin/non-admin links

* minor style change : red border for active page instead of all dropdowns

* deleted file

* prepare adding removing menu templates files, being replaced by code

* essayé de généraliser le code pour les modaux bootstrap, non testé git status

* more preparation and thinking on navbar app_menus logic...

* added LinkManager and DropdownManager, getting closer...

* small fix in DropdownManager.__get__

* boosted up work: keep it simple so it can be merged fast, major layout changes

* added month filter on maraudes:liste

* added 'as_icon' filter to display boolean/null values as bootstrap icons

* remove inactive user from planning selection

* removed all unused 'menu' templates

* set up django_select2 to use static files

* small fix after review
2017-02-11 18:20:13 +01:00
artus40
288ca2cc20 corrected issue with Select2 2016-12-29 16:51:29 +01:00
artus40
7cc362668e resolved #20, modified layout on 'suivi:details' 2016-12-29 15:20:16 +01:00
artus40
5884125015 ajout de la liste des derniers sujets rencontrés dans 'suivi' 2016-12-29 14:53:58 +01:00
artus40
6c995a34db resolved #21, started new design (removing some panels :) 2016-12-29 13:52:29 +01:00
artus40
2acea0e625 cleaned up code in website, utilisateurs 2016-12-29 13:26:22 +01:00
artus40
ffe73585c6 Updated after global configuration on new git installation 2016-12-15 18:28:29 +01:00
Arthur Gerbaud
f4bb37ae63 cleaned Maraudeur model, created MaraudeurManager, created some tests 2016-12-02 12:43:07 +01:00
Arthur Gerbaud
363ca64cab Merge branch 'website'
tested branching, but best to keep it straight forward for now
2016-12-01 11:28:07 +01:00
Arthur Gerbaud
8e62392a01 adressed issues #22 #23 2016-12-01 11:21:28 +01:00
Arthur Gerbaud
6b659144c9 isolated NavBarMixin 2016-12-01 11:15:55 +01:00
Arthur Gerbaud
387fe36382 corrected issue #14 2016-11-24 11:30:35 +01:00
Arthur Gerbaud
891ef9ef63 modified website.decorators, webpage->app_config, created new configs 2016-11-19 21:46:40 +01:00
Arthur Gerbaud
f4f366f514 prepared to work on menu logic 2016-11-19 14:25:09 +01:00
Arthur Gerbaud
23d9da9a79 missing template @076780a 2016-11-19 13:36:04 +01:00
Arthur Gerbaud
076780a90f added 'table' template tags in maraudes:index 2016-11-19 13:34:54 +01:00
Arthur Gerbaud
7f08b1db23 added 'tables' template tags to display objects lists in 'maraudes' and 'sujets' 2016-11-19 13:28:36 +01:00
Arthur Gerbaud
673c620be0 updated login mechanism 2016-11-16 20:04:00 +01:00
Arthur Gerbaud
96f013041b working on #10 2016-11-15 16:47:44 +01:00
Arthur Gerbaud
b085d6295c clean up some messy code 2016-11-15 15:51:23 +01:00
Arthur Gerbaud
c5d171c2da removed confusing and useless code 2016-11-15 15:45:22 +01:00
Arthur Gerbaud
a95a2e83c5 corrected order of observations returned by CompteRendu.get_observations() 2016-11-15 15:43:19 +01:00
Arthur Gerbaud
23ca194bf7 Issue #12 2016-11-15 15:28:05 +01:00
Arthur Gerbaud
0ca1d0bf8f issue #11 2016-11-15 15:21:54 +01:00
Arthur Gerbaud
254ef97a85 made requirements.txt readable by pip 2016-11-04 10:09:09 +01:00
Arthur Gerbaud
dcb87dde49 added configuration files for easier installation 2016-11-04 10:01:01 +01:00
Arthur Gerbaud
de045e2ec6 Merge branch 'master' of github.com:artus40/maraudes_project 2016-10-06 13:29:53 +02:00
Arthur Gerbaud
14ecf5ce0f added default on 'premiere_rencontre' field for Sujet, work on #5 2016-10-06 13:29:29 +02:00
artus40
02d866ffdd Corrected comment 2016-09-19 13:21:50 +02:00
artus40
da195c33b9 copy wiki home page desc in readme 2016-09-17 10:19:13 +02:00
Arthur Gerbaud
96f3a9dd80 some template cleaning 2016-09-08 18:41:50 +02:00
Arthur Gerbaud
d37455bfeb better use of CompteRendu proxy model 2016-09-08 18:10:47 +02:00
Arthur Gerbaud
cfe0dc3f2f added missing_cr context variable on maraudes:index, small fixes 2016-09-08 17:38:00 +02:00
Arthur Gerbaud
d690ef4143 better base.html columns size 2016-09-08 11:34:38 +02:00
Arthur Gerbaud
ec7f085b8e fixed NoteMixin 2016-09-08 11:30:42 +02:00
Arthur Gerbaud
4ce0baffed small fix 2016-08-26 10:19:39 +02:00
Arthur Gerbaud
dd85cb320a added search on Sujet with django-watson 2016-08-26 10:17:59 +02:00
Arthur Gerbaud
6bdde54ed2 moved bootstrap_messages on base template 2016-08-25 10:44:56 +02:00
Arthur Gerbaud
06cf6c3d35 added messages on 'suivi:index' 2016-08-25 09:40:00 +02:00
Arthur Gerbaud
9c8fa6ca1d added Search form, not working yet 2016-08-24 19:26:07 +02:00
Arthur Gerbaud
6405baa945 changed premiere_rencontre field 2016-08-24 18:24:58 +02:00
Arthur Gerbaud
9ac005e181 added SignalementForm templates 2016-08-24 18:18:31 +02:00
Arthur Gerbaud
746c21e52b added SignalementForm, updated NoteFormMixin, various fixes 2016-08-24 18:17:59 +02:00
Arthur Gerbaud
6e9a76696e rerouted AuthBackend, changed bootstrap colors 2016-08-17 20:20:06 +02:00
Arthur Gerbaud
7694c4ea7a and the last one 2016-08-17 18:21:22 +02:00
Arthur Gerbaud
568550f76b files i forgot to add 2016-08-17 18:20:33 +02:00
Arthur Gerbaud
d0a74735f1 added initial when no last rencontre with compte-rendu forms 2016-08-17 17:42:52 +02:00
Arthur Gerbaud
9812aa858c improved NoteFormMixin, added Appel model and form in 'suivi' 2016-08-17 17:39:24 +02:00
Arthur Gerbaud
d940bc5b1c fixed list() conflict due to webpage decorator 2016-08-17 16:20:49 +02:00
Arthur Gerbaud
1681833e8b minor clean up 2016-08-17 16:11:27 +02:00