* 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
This commit is contained in:
artus40
2017-02-11 18:20:13 +01:00
committed by GitHub
parent 288ca2cc20
commit 0be59a61a7
61 changed files with 665 additions and 525 deletions

View File

@@ -6,49 +6,31 @@ from .forms import SujetCreateForm
### Webpage config
from utilisateurs.models import Maraudeur
from website import decorators as website
sujets = website.app_config(
name="suivi",
groups=[Maraudeur],
menu=["suivi/menu/sujets.html"],
admin_menu=["sujets/menu/admin_sujet.html"],
ajax=True,
)
from website.decorators import Webpage
sujets = Webpage( "suivi", menu=False, defaults={
'restricted': [Maraudeur],
'ajax': True,
}
)
### Views
@sujets
@sujets.using(title=('{{object}}', 'details'))
class SujetDetailsView(generic.DetailView):
class PageInfo:
title = "Sujet - {{ sujet }}"
header = "{{ sujet }}"
header_small = "informations"
#DetailView
template_name = "sujets/sujet_details.html"
model = Sujet
@sujets
class SujetUpdateView(generic.edit.UpdateView):
class PageInfo:
title = "Mise à jour - {{sujet}}"
header = "{{sujet}}"
header_small = "mise à jour"
#UpdateView
template_name = "sujets/sujet_update.html"
model = Sujet
fields = '__all__'
@sujets
class SujetCreateView(generic.edit.CreateView):
class PageInfo:
title = "Nouveau sujet"
header = "Nouveau sujet"
#CreateView
template_name = "sujets/sujet_create.html"
form_class = SujetCreateForm