- Page d'accueil
+ {# TODO: Since Django 1.9, we can store result with "as", allowing proper value management (if None) #}
+ Page d'accueil
Calendrier
{% if perms.kfet.is_team %}
K-Psul
diff --git a/gestioncof/views.py b/gestioncof/views.py
index f98c51df..fffd5751 100644
--- a/gestioncof/views.py
+++ b/gestioncof/views.py
@@ -7,14 +7,19 @@ from custommail.shortcuts import send_custom_mail
from django.shortcuts import redirect, get_object_or_404, render
from django.http import Http404, HttpResponse, HttpResponseForbidden
from django.contrib.auth.decorators import login_required
-from django.contrib.auth.views import login as django_login_view
+from django.contrib.auth.views import (
+ login as django_login_view, logout as django_logout_view,
+)
from django.contrib.auth.models import User
from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse_lazy
from django.views.generic import FormView
from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
from django.contrib import messages
+from django_cas_ng.views import logout as cas_logout_view
+
from gestioncof.models import Survey, SurveyAnswer, SurveyQuestion, \
SurveyQuestionAnswer
from gestioncof.models import Event, EventRegistration, EventOption, \
@@ -81,15 +86,21 @@ def login_ext(request):
@login_required
-def logout(request):
- try:
- profile = request.user.profile
- except CofProfile.DoesNotExist:
- profile, created = CofProfile.objects.get_or_create(user=request.user)
- if profile.login_clipper:
- return redirect("django_cas_ng.views.logout")
+def logout(request, next_page=None):
+ if next_page is None:
+ next_page = request.GET.get('next', None)
+
+ profile = getattr(request.user, 'profile', None)
+
+ if profile and profile.login_clipper:
+ msg = _('Déconnexion de GestioCOF et CAS réussie. À bientôt {}.')
+ logout_view = cas_logout_view
else:
- return redirect("django.contrib.auth.views.logout")
+ msg = _('Déconnexion de GestioCOF réussie. À bientôt {}.')
+ logout_view = django_logout_view
+
+ messages.success(request, msg.format(request.user.get_short_name()))
+ return logout_view(request, next_page=next_page)
@login_required
diff --git a/kfet/cms/__init__.py b/kfet/cms/__init__.py
new file mode 100644
index 00000000..0f6cab45
--- /dev/null
+++ b/kfet/cms/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'kfet.cms.apps.KFetCMSAppConfig'
diff --git a/kfet/cms/apps.py b/kfet/cms/apps.py
new file mode 100644
index 00000000..1db0e043
--- /dev/null
+++ b/kfet/cms/apps.py
@@ -0,0 +1,10 @@
+from django.apps import AppConfig
+
+
+class KFetCMSAppConfig(AppConfig):
+ name = 'kfet.cms'
+ label = 'kfetcms'
+ verbose_name = 'CMS K-Fêt'
+
+ def ready(self):
+ from . import hooks
diff --git a/kfet/cms/context_processors.py b/kfet/cms/context_processors.py
new file mode 100644
index 00000000..34f175d1
--- /dev/null
+++ b/kfet/cms/context_processors.py
@@ -0,0 +1,20 @@
+from kfet.models import Article
+
+
+def get_articles(request=None):
+ articles = (
+ Article.objects
+ .filter(is_sold=True, hidden=False)
+ .select_related('category')
+ .order_by('category__name', 'name')
+ )
+ pressions, others = [], []
+ for article in articles:
+ if article.category.name == 'Pression':
+ pressions.append(article)
+ else:
+ others.append(article)
+ return {
+ 'pressions': pressions,
+ 'articles': others,
+ }
diff --git a/kfet/cms/fixtures/kfet_wagtail_17_05.json b/kfet/cms/fixtures/kfet_wagtail_17_05.json
new file mode 100644
index 00000000..f6a46c30
--- /dev/null
+++ b/kfet/cms/fixtures/kfet_wagtail_17_05.json
@@ -0,0 +1,1456 @@
+[
+{
+ "fields": {
+ "root_page": 9,
+ "port": 8000,
+ "site_name": "Global",
+ "hostname": "localhost",
+ "is_default_site": true
+ },
+ "pk": 2,
+ "model": "wagtailcore.site"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": false,
+ "numchild": 1,
+ "title": "Root",
+ "slug": "root",
+ "depth": 1,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "wagtailcore",
+ "page"
+ ],
+ "owner": null,
+ "expired": false,
+ "first_published_at": null,
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001",
+ "latest_revision_created_at": null,
+ "url_path": "/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 1,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 5,
+ "title": "Bienvenue en K-Fêt",
+ "slug": "k-fet",
+ "depth": 3,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "000100010001",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/",
+ "locked": false,
+ "seo_title": "Accueil"
+ },
+ "pk": 3,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 0,
+ "title": "Mode d'emploi",
+ "slug": "mode-demploi",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010001",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/mode-demploi/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 4,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 0,
+ "title": "L'\u00e9quipe",
+ "slug": "equipe",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010002",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/equipe/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 5,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 0,
+ "title": "La carte",
+ "slug": "carte",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010003",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/carte/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 6,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 0,
+ "title": "Les soir\u00e9es",
+ "slug": "soirees",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010004",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/soirees/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 7,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 0,
+ "title": "Le flipper",
+ "slug": "flipper",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010005",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/flipper/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 8,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": true,
+ "numchild": 1,
+ "title": "Global",
+ "slug": "global",
+ "depth": 2,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "wagtailcore",
+ "page"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "00010001",
+ "latest_revision_created_at": null,
+ "url_path": "/global/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 9,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "live": true,
+ "show_in_menus": false,
+ "numchild": 0,
+ "title": "Mentions l\u00e9gales",
+ "slug": "mentions-legales",
+ "depth": 4,
+ "expire_at": null,
+ "search_description": "",
+ "content_type": [
+ "kfetcms",
+ "kfetpage"
+ ],
+ "owner": [
+ "root"
+ ],
+ "expired": false,
+ "first_published_at": "2017-05-28T04:20:00.000Z",
+ "has_unpublished_changes": false,
+ "go_live_at": null,
+ "path": "0001000100010006",
+ "latest_revision_created_at": null,
+ "url_path": "/global/k-fet/mentions-legales/",
+ "locked": false,
+ "seo_title": ""
+ },
+ "pk": 10,
+ "model": "wagtailcore.page"
+},
+{
+ "fields": {
+ "name": "Root",
+ "numchild": 1,
+ "path": "0001",
+ "depth": 1
+ },
+ "pk": 1,
+ "model": "wagtailcore.collection"
+},
+{
+ "fields": {
+ "name": "K-F\u00eat",
+ "numchild": 0,
+ "path": "00010001",
+ "depth": 2
+ },
+ "pk": 2,
+ "model": "wagtailcore.collection"
+},
+{
+ "pk": 1,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Hugo",
+ "nick_name": "",
+ "photo": 3,
+ "last_name": "Manet"
+ }
+},
+{
+ "pk": 2,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Lisa",
+ "nick_name": "",
+ "photo": 4,
+ "last_name": "Gourdon"
+ }
+},
+{
+ "pk": 3,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Pierre",
+ "nick_name": "",
+ "photo": 5,
+ "last_name": "Quesselaire"
+ }
+},
+{
+ "pk": 4,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Thibault",
+ "nick_name": "",
+ "photo": 6,
+ "last_name": "Scoquard"
+ }
+},
+{
+ "pk": 5,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Arnaud",
+ "nick_name": "",
+ "photo": 7,
+ "last_name": "Fanthomme"
+ }
+},
+{
+ "pk": 6,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Vincent",
+ "nick_name": "",
+ "photo": 8,
+ "last_name": "Balerdi"
+ }
+},
+{
+ "pk": 7,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Nathana\u00ebl",
+ "nick_name": "",
+ "photo": 9,
+ "last_name": "Willaime"
+ }
+},
+{
+ "pk": 8,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "\u00c9lisabeth",
+ "nick_name": "",
+ "photo": 10,
+ "last_name": "Miller"
+ }
+},
+{
+ "pk": 9,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Arthur",
+ "nick_name": "B2O",
+ "photo": 11,
+ "last_name": "Lesage"
+ }
+},
+{
+ "pk": 10,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Sarah",
+ "nick_name": "",
+ "photo": 12,
+ "last_name": "Asset"
+ }
+},
+{
+ "pk": 11,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Alexandre",
+ "nick_name": "",
+ "photo": 13,
+ "last_name": "Legrand"
+ }
+},
+{
+ "pk": 12,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "\u00c9tienne",
+ "nick_name": "",
+ "photo": 14,
+ "last_name": "Baudel"
+ }
+},
+{
+ "pk": 13,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Marine",
+ "nick_name": "",
+ "photo": 15,
+ "last_name": "Snape"
+ }
+},
+{
+ "pk": 14,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Anatole",
+ "nick_name": "",
+ "photo": 16,
+ "last_name": "Gosset"
+ }
+},
+{
+ "pk": 15,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Jacko",
+ "nick_name": "",
+ "photo": 17,
+ "last_name": "Rastikian"
+ }
+},
+{
+ "pk": 16,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Alexandre",
+ "nick_name": "",
+ "photo": 18,
+ "last_name": "Jannaud"
+ }
+},
+{
+ "pk": 17,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Aur\u00e9lien",
+ "nick_name": "",
+ "photo": 19,
+ "last_name": "Delobelle"
+ }
+},
+{
+ "pk": 18,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Sylvain",
+ "nick_name": "",
+ "photo": 20,
+ "last_name": "Douteau"
+ }
+},
+{
+ "pk": 19,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Rapha\u00ebl",
+ "nick_name": "",
+ "photo": 21,
+ "last_name": "Lescanne"
+ }
+},
+{
+ "pk": 20,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Romain",
+ "nick_name": "",
+ "photo": 22,
+ "last_name": "Gourvil"
+ }
+},
+{
+ "pk": 21,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Marie",
+ "nick_name": "",
+ "photo": 23,
+ "last_name": "Labeye"
+ }
+},
+{
+ "pk": 22,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Oscar",
+ "nick_name": "",
+ "photo": 24,
+ "last_name": "Blumberg"
+ }
+},
+{
+ "pk": 23,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Za\u00efd",
+ "nick_name": "",
+ "photo": 25,
+ "last_name": "Allybokus"
+ }
+},
+{
+ "pk": 24,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Damien",
+ "nick_name": "",
+ "photo": 26,
+ "last_name": "Garreau"
+ }
+},
+{
+ "pk": 25,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Andr\u00e9a",
+ "nick_name": "",
+ "photo": 27,
+ "last_name": "Londonez-Lopez"
+ }
+},
+{
+ "pk": 26,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Tristan",
+ "nick_name": "",
+ "photo": 28,
+ "last_name": "Roussel"
+ }
+},
+{
+ "pk": 27,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Guillaume",
+ "nick_name": "",
+ "photo": 29,
+ "last_name": "Vernade"
+ }
+},
+{
+ "pk": 28,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Lucas",
+ "nick_name": "",
+ "photo": 30,
+ "last_name": "Mercier"
+ }
+},
+{
+ "pk": 29,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Fran\u00e7ois",
+ "nick_name": "M\u00e9talleux",
+ "photo": 31,
+ "last_name": "Maillot"
+ }
+},
+{
+ "pk": 30,
+ "model": "kfetcms.memberteam",
+ "fields": {
+ "first_name": "Fabrice",
+ "nick_name": "",
+ "photo": 32,
+ "last_name": "Catoire"
+ }
+},
+{
+ "pk": 3,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"La K-F\\u00eat, c'est quoi ? \\n\\n\\n Eh bien la K-F\\u00eat, c'est le bar des \\u00e9l\\u00e8ves de l'\\u00c9cole normale\\n sup\\u00e9rieure. Elle est situ\\u00e9e dans les locaux de l'\\u00c9cole, au pied de\\n l'escalier C (plan ). On y trouve \\u00e0 boire , bien s\\u00fbr,\\n des bi\\u00e8res en nombre pl\\u00e9thorique mais aussi caf\\u00e9s, th\\u00e9s, softs et de quoi\\n grignoter. Ah oui un point important, on ne va pas \\u00e0 la K-F\\u00eat, on va EN K-F\\u00eat.\\n
\", \"type\": \"rich\"}, {\"value\": \"Mais on n'y fait que boire et manger ? \\n\\n\\n Que nenni, \\u00f4 jeune et innocent conscrit-e ! La K-F\\u00eat n'est pas un bouge\\n sordide o\\u00f9 des piliers de bar passent leurs journ\\u00e9es \\u00e0 picoler. Enfin pas\\n uniquement. C'est aussi un lieu de divertissement avec\\n son flipper (la mythique, la seule, l'unique,\\n la g\\u00e9niale Amazon Hunt), son baby-foot et le lieu d'\\u00e9lection des \\nbridgeur-se-s, du club jeux, des joueur-se-s de poker voire des quelques\\n irr\\u00e9ductibles du boulot qui y viennent bosser en profitant du point \\nd'acc\\u00e8s wifi. \\n
\", \"type\": \"rich\"}, {\"value\": \"Ah \\u00e7a a l'air bien mais... qui s'en occupe ? C'est ouvert quand ? \\n\\n\\n L'\\u00e9quipe d'\\u00e9l\\u00e8ves motiv\\u00e9-e-s qui s'occupent de la K-F\\u00eat s'appelle, en toute logique, l'\\u00e9quipe K-F\\u00eat .\\n Elle est men\\u00e9e par un-e leader charismatique et bien-aim\\u00e9-e, \\naccompagn\\u00e9-e de ses troupes de fid\\u00e8les, les K-F\\u00eat wo-men, boys et girls.\\n Le local de la K-F\\u00eat n'est ouvert que si un-e K-F\\u00eat wo-man est \\npr\\u00e9sente. \\u00c0 savoir la plupart du temps entre 12h et 3h du matin.\\n
\", \"type\": \"rich\"}, {\"value\": \"Et je peux y faire ce que je veux ? \\n\\n\\n Oui et non. Nous ne sommes pas ta grand-m\\u00e8re et nous n'allons\\n certainement pas t'emp\\u00eacher de faire la f\\u00eate, ni de d\\u00e9guster des pintes\\n jusqu'au petit p\\u00f4t. Par contre nous attendons de toi que tu ne sois pas\\n un-e gros-se con-ne. A priori pas de raison de le croire, mais jette tout de m\\u00eame\\n un \\u0153il sur le mode d'emploi de la K-F\\u00eat, \\u00e7a\\n pourrait t'\\u00e9viter de perdre un genoux ou deux...\\n
\", \"type\": \"rich\"}, {\"value\": \"J'adore la K-F\\u00eat, j'aimerais y organiser une soir\\u00e9e, c'est possible ? \\n\\n\\n Bien s\\u00fbr\\u00a0! Pour cela commence par lire ce petit\\n guide histoire de savoir dans quoi tu t'engages puis contacte ton-ta chef-fe K-F\\u00eat ador\\u00e9-e pour v\\u00e9rifier que la date de ta\\n soir\\u00e9e n'est pas d\\u00e9j\\u00e0 prise par une autre f\\u00eate et obtenir son\\n accord.\\n
\", \"type\": \"rich\"}, {\"value\": \"J'ai une question \\u00e0 vous poser. O\\u00f9 puis-je vous contacter ? \\n\\n\\n Commence d\\u00e9j\\u00e0 par jeter un oeil sur le mode\\n d'emploi de la K-F\\u00eat. Si la r\\u00e9ponse \\u00e0 tes interrogations ne s'y\\n trouve pas, rien n'est perdu. En effet le service informatique de \\nl'\\u00c9cole, dans sa grande mansu\\u00e9tude, a mis \\u00e0 disposition de l'\\u00e9quipe \\nK-F\\u00eat une adresse e-mail, k-fet@ens.fr . Mais sinon, passe en K-F\\u00eat, il y aura sans doute un K-F\\u00eat wo-man qui saura r\\u00e9pondre \\u00e0 ta question.\\n
\", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "pk": 4,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"Article 0 : La K-F\\u00eat n'existe pas.
\", \"type\": \"rich\"}, {\"value\": \"La K-F\\u00eat, c'est magique, comment \\u00e7a marche ? La K-F\\u00eat n'a \\nrien de magique, il n'y a pas de petits d\\u00e9mons qui font le m\\u00e9nage, pas \\nplus que d'arbustes g\\u00e9n\\u00e9tiquement modifi\\u00e9s aux OGM sur lesquels poussent\\n les bouteilles de bi\\u00e8res. La K-F\\u00eat c'est avant tout une \\u00e9quipe qui sacrifie une partie de son temps libre pour que tout se passe pour le mieux.
\", \"type\": \"rich\"}, {\"value\": \"Que puis-je faire pour vous aider un peu ? D\\u00e9j\\u00e0 ne pas poser \\nde probl\\u00e8mes, c'est \\u00e0 dire ne pas r\\u00e9veiller tout l'internat en sortant, \\nessayer de ne pas finir dans un \\u00e9tat trop avanc\\u00e9 d'alcoolisation, etc...\\n Mine de rien \\u00e7a nous \\u00e9viterait quelques probl\\u00e8mes.
Ensuite, comme\\n tu le sais s\\u00fbrement les bi\\u00e8res sont consign\\u00e9es, il est donc pr\\u00e9f\\u00e9rable \\npour nous que tu n'embarques pas les bouteilles en souvenir dans ta \\nthurne. Mieux, tu peux nous faire gagner du temps de rangement en les \\nramenant au bar en partant. Et encore mieux, tu peux jeter tes d\\u00e9chets \\n(gobelets, boite de pringles, etc...). Si tu fais d\\u00e9j\\u00e0 tout \\u00e7a tu nous \\nsimplifieras grandement la vie.
\", \"type\": \"rich\"}, {\"value\": \"Le syst\\u00e8me mon\\u00e9taire de la K-F\\u00eat En bon \\u00e9tat souverain et \\nind\\u00e9pendant, la K-F\\u00eat a sa propre monnaie : l'unit\\u00e9 K-F\\u00eat (UKF). Elle \\nvaut 10 centimes d'euro. La K-F\\u00eat ne battant pas monnaie, les UKF que tu\\n poss\\u00e8des sont not\\u00e9es sur ton compte, identifi\\u00e9 par un trigramme (une \\nsuite de trois caract\\u00e8res) et que tu peux recharger en liquide ou par \\nch\\u00e8que. Note que si tu y tiens vraiment, tu peux payer en liquide, mais \\nposs\\u00e9der un compte est bien plus pratique.
\", \"type\": \"rich\"}, {\"value\": \"Comment commander \\u00e0 boire ou \\u00e0 manger ? Pour commander \\u00e0 boire ou \\u00e0 manger, il suffit de demander \\u00e0 un membre de l'\\u00e9quipe K-F\\u00eat .\\n Et \\u00e7a marche encore mieux si la demande est effectu\\u00e9e avec le sourire \\nau d\\u00e9but et un merci \\u00e0 la fin : l'\\u00e9quipe est constitu\\u00e9e de volontaires \\nb\\u00e9n\\u00e9voles, et mieux vaut ne pas les prendre pour des chiens. EN AUCUN \\nCAS on ne passe derri\\u00e8re le bar si on n'est pas membre de l'\\u00e9quipe K-F\\u00eat .
\", \"type\": \"rich\"}, {\"value\": \"Puis-je fumer en K-F\\u00eat ? Non ! Imagine-toi les jours de \\nsoir\\u00e9es, la K-F\\u00eat remplie et tout le monde qui fume... On finirait tous \\navec des poumons aussi crades que le sol de la K-F\\u00eat. Ce serait quand \\nm\\u00eame dommage pour la recherche fran\\u00e7aise qu'on cr\\u00e8ve tous avant 30 ans, \\nnon ?
Par contre tu peux fumer dehors, il y a m\\u00eame des cendriers \\njuste pour toi, par contre tu remarqueras que les chambres de l'internat\\n se trouvent juste au dessus de toi. T\\u00e2che donc de ne pas faire trop de \\nbruit.
\", \"type\": \"rich\"}, {\"value\": \"Et amener ma propre bouteille ? D\\u00e9j\\u00e0 c'est apporter, enfin en\\n tout cas avant de la boire. Ensuite la K-F\\u00eat est un lieu de \\nconvivialit\\u00e9 o\\u00f9 les bi\\u00e8res te sont vendues au prix co\\u00fbtant,\\n franchement ce serait pas fair-play de te la jouer solo. Alors \\n\\u00e9videment il y a des exceptions, par exemple si tu reviens de Belgique \\net que tu veux faire go\\u00fbter de la Wesvleteren \\u00e0 tes amis de l'\\u00e9quipe K-F\\u00eat ,\\n ou si tu veux organiser une d\\u00e9gustation de vins avec la charcuterie qui\\n va bien. Tu comprendras qu'un pack de Kro c'est quand m\\u00eame pas la m\\u00eame \\nclasse...
\", \"type\": \"rich\"}, {\"value\": \"Je peux passer ma musique ? Bien s\\u00fbr, nous sommes tr\\u00e8s loin \\nde penser tout conna\\u00eetre en mati\\u00e8re de musique. Mais comme nous sommes \\nentre gens civilis\\u00e9s, et que je te rappelle que tu n'as pas le droit de \\npasser derri\\u00e8re le bar, il convient de demander \\u00e0 un-e membre de l'\\u00e9quipe K-F\\u00eat \\n afin qu'ille t'indique qui est \\u00e0 l'origine de ces chansons que tu \\nn'appr\\u00e9cies apparemment pas. Apr\\u00e8s avoir obtenu son accord tu peux \\ndemander \\u00e0 quelqu'un de mettre ta playlist, qui peut-\\u00eatre sur un lecteur\\n mp3, sur Deezer ou juste sur l'ordi, mais dans ce dernier cas ce sera plus dur puisque tu n'y aura pas acc\\u00e8s directement.
Le plus simple pour toi (et pour nous) est donc de pr\\u00e9voir des playlists sur Deezer \\n d'avance et de nous les proposer. Par contre, sois gentil-le, n'insiste\\n pas si nous ne voulons pas de ta musique traditionnelle hongroise. Par \\nailleurs, si un trop grand nombre de personnes nous demande de passer de\\n la musique, l'\\u00e9quipe K-F\\u00eat peut ne pas acc\\u00e9der \\u00e0 ta requ\\u00eate.
\", \"type\": \"rich\"}, {\"value\": \"Comment organiser une soir\\u00e9e en K-F\\u00eat ? Tout membre du COF \\npeut organiser une soir\\u00e9e en K-F\\u00eat \\u00e0 la condition qu'elle soit publique \\net annonc\\u00e9e une semaine \\u00e0 l'avance par des affiches dans l'\\u00e9cole et un \\nmot dans le BOcal. Il faut bien sur aussi l'accord du COF qui s'occupe \\nde voir si \\u00e7a ne pose pas de probl\\u00e8me \\u00e0 l'admin, celui de la K-F\\u00eat team \\npour qu'il y ait des K-F\\u00eat wo-men pour servir et s\\u00fbrement du BOUM pour \\nqu'il s'occupe de la musique. Nous t'avons tout r\\u00e9sum\\u00e9 ici \\n ; merci qui ? Une fois que tu as accompli ces formalit\\u00e9s, il ne te \\nreste plus qu'\\u00e0 imprimer et coller des affiches pour que ta soir\\u00e9e soit \\nun succ\\u00e8s !
\", \"type\": \"rich\"}, {\"value\": \"D'autres remarques ? Des tonnes, en voici quelques unes :
Ce n'est pas caf\\u00e8t, ni kfet, ni caf\\u00e9t\\u00e9ria, c'est K-F\\u00eat , avec les majuscules. On dit \\\"en K-F\\u00eat\\\". On ne passe pas derri\\u00e8re le bar ,\\n je sais je l'ai d\\u00e9j\\u00e0 dit, mais \\u00e7a a du mal \\u00e0 rentrer. S'il n'y a \\npersonne pour servir c'est que les K-F\\u00eat people sont soit occup\\u00e9-e-s \\nquelque chose d'important en arri\\u00e8re-K-F\\u00eat, soit sont pos\\u00e9-e-s dans le \\ncanap\\u00e9 \\u00e0 c\\u00f4t\\u00e9 du bar, soit sont en train de jouer \\u00e0 l'Amazon . Demande-leur, ou prends ton mal en patience.La K-F\\u00eat n'est pas une porcherie, tu n'es pas oblig\\u00e9-e de laisser tout ton bordel quand tu pars. Merci d'avoir lu jusque l\\u00e0. \", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "pk": 5,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": [{\"value\": \"Les ancien-ne-s Chef-fe-s K-F\\u00eat Les ancien-ne-s Chef-fe-s K-F\\u00eat doivent bien \\u00eatre pr\\u00e9sent\\u00e9-e-s avant \\nl'\\u00e9quipe actuelle. C'est gr\\u00e2ce \\u00e0 elleux qu'elle tourne encore, gr\\u00e2ce \\u00e0 \\nelleux qu'elle a bien tourn\\u00e9, et puis, de pr\\u00e8s comme de loin, illes \\nveillent encore sur nous. Ce sont les diff\\u00e9rentes facettes de la K-F\\u00eat \\nhistorique, bien que d'un certain point de vue, illes se ressemblent \\ntou-te-s : les Chef-fe-s K-F\\u00eat sont une dynastie, ils n'ont pas \\u00e9t\\u00e9 \\nChef-fe-s apr\\u00e8s avoir prouv\\u00e9 quoi que ce soit, illes l'ont \\u00e9t\\u00e9 parce que\\n ce r\\u00f4le leur revenait de droit. On na\\u00eet Chef-fe K-F\\u00eat, on ne le devient\\n pas. Et on le reste toujours, dans l'\\u00e2me.
\", \"type\": \"rich\"}, {\"value\": {\"members\": [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30], \"show_only\": 12}, \"type\": \"group_team\"}], \"type\": \"group\"}, {\"value\": [{\"value\": \"Le chef Le-la chef-fe K-F\\u00eat, celui-celle qui a le droit de vie et de mort sur les \\u00e2mes \\u00e9gar\\u00e9es qui fr\\u00e9quentent la K-F\\u00eat.
\", \"type\": \"rich\"}, {\"value\": {\"members\": [1, 2], \"show_only\": null}, \"type\": \"group_team\"}], \"type\": \"group\"}, {\"value\": [{\"value\": \"Les K-F\\u00eat Wo-Men Les K-F\\u00eat wo-men poss\\u00e8dent les cl\\u00e9s de la K-F\\u00eat. Ce sont elleux qui peuvent d\\u00e9cider ou non d'ouvrir la K-F\\u00eat.
\", \"type\": \"rich\"}, {\"value\": {\"members\": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12], \"show_only\": null}, \"type\": \"group_team\"}], \"type\": \"group\"}, {\"value\": [{\"value\": \"Les Vieux-illes Les vieux-illes sont d'ancien-ne-s K-F\\u00eat wo-men qui ne viennent plus \\naussi souvent qu'avant, illes servent toujours, mais n'ont en g\\u00e9n\\u00e9ral \\nplus les cl\\u00e9s. Illes existent n\\u00e9anmoins, et on les garde (pour \\ncertain-e-s) parce qu'au fond, on les aime quand m\\u00eame, et qu'en plus, \\nilles en savent plus que n'importe qui sur la K-F\\u00eat.
\", \"type\": \"rich\"}], \"type\": \"group\"}, {\"value\": \"Les K-F\\u00eat boys et girls \\n\\nLes K-F\\u00eat boys and girls font de main d'\\u0153uvre bon march\\u00e9 pour la \\nK-F\\u00eat, illes peuvent passer derri\\u00e8re le bar, prendre vos commandes et \\nrecharger votre compte si par malheur il est \\u00e0 sec. La liste de \\ncelleux-ci est trop longue pour tou-te-s les citer, pour les reconna\\u00eetre\\n regarde les gens qui passent derri\\u00e8re le bar tout en conservant leur \\nint\\u00e9grit\\u00e9 physique.
\", \"type\": \"rich\"}, {\"value\": \"Comment devient-on K-F\\u00eat people ? Grande question que tout le monde se pose un jour ou l'autre. Pour \\nacc\\u00e9der au titre prestigieux de K-F\\u00eat boy-girl, il est n\\u00e9cessaire mais \\npas suffisant d'\\u00eatre assid\\u00fbment pr\\u00e9sent-e en K-F\\u00eat, et d'\\u00eatre pr\\u00eat-e \\u00e0 \\ntrimer pour elle. Si tu es souvent en K-F\\u00eat, que tu es sympathique et \\nmotiv\\u00e9-e, et surtout en fin de compte si le-la chef-fe le veut bien, tu \\npourras devenir K-F\\u00eat boy-girl et passer derri\\u00e8re le bar pour servir. \\nEnsuite, si tu es motiv\\u00e9-e et efficace, ou simplement si t'es un-e pote \\ndu-de la chef-fe et qu'ille n'a aucun scrupule, tu pourras devenir K-F\\u00eat\\n wo-man et avoir la cl\\u00e9.
Et comme la K-F\\u00eat c'est avant tout beaucoup d'emmerdes on a pas envie\\n de te forcer la main, on veut que cela vienne de toi. Donc si tu te \\nsens pr\\u00eat-e \\u00e0 participer \\u00e0 la vie mouvement\\u00e9e de la K-F\\u00eat fais-en part \\nau-\\u00e0 la chef-fe. Ille ne va pas te manger.
\", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "pk": 6,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"Le service de la bi\\u00e8re est, historiquement, la mission et le sacerdoce \\ndu K-F\\u00eat people. Ille y est d\\u00e9vou\\u00e9-e corps et \\u00e2me, et accomplit sa t\\u00e2che\\n avec ardeur et passion. Voyons comment se d\\u00e9clinent les occasions \\nd'approcher du nirvana brassicole. Les prix donn\\u00e9s sont en UKF. Si tu \\nn'as pas compris, va voir par ici .
\", \"type\": \"rich\"}, {\"value\": null, \"type\": \"carte\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": "column-md-2 column-lg-3"
+ }
+},
+{
+ "pk": 7,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"Tu veux organiser une soir\\u00e9e en K-F\\u00eat ? Pas de probl\\u00e8me !
\", \"type\": \"rich\"}, {\"value\": \"Quand puis-je organiser une soir\\u00e9e ? \\n\\n\\n Tu peux organiser une soir\\u00e9e le jour que tu souhaites, \\u00e0 condition que la\\n date ne soit pas d\\u00e9j\\u00e0 prise par quelqu'un d'autre. Sache par contre que la\\n K-F\\u00eat ne te sera pas enti\\u00e8rement d\\u00e9di\\u00e9e et que les utilisateur-rice-s habituel-le-s\\n continueront de la fr\\u00e9quenter (et risquent fortement de squatter ta\\n soir\\u00e9e). Donc si tu veux un peu d'intimit\\u00e9 les soir\\u00e9es du week-end sont plus\\n conseill\\u00e9es (mais l'\\u00e9quipe risque de ne pas \\u00eatre pr\\u00e9sente), mais aussi\\n plus pris\\u00e9es, d\\u00e9p\\u00eache-toi de r\\u00e9server la tienne.\\n
\", \"type\": \"rich\"}, {\"value\": \"Quelles d\\u00e9marches dois-je effectuer ? \\n\\n D\\u00e9j\\u00e0 pr\\u00e9venir poliment l'\\u00e9quipe K-F\\u00eat , et\\n surtout le-la chef-fe pour v\\u00e9rifier que la date est encore libre, et qu'il y\\n aura au moins quelqu'un pour t'ouvrir la K-F\\u00eat. Ensuite, si ta soir\\u00e9e\\n n'est pas une simple bouffe qui finit avant minuit il faut pr\\u00e9venir les\\n vigiles via l'administration au moyen d'une demande d'autorisation de\\n soir\\u00e9e qui se trouve sur la section du p\\u00f4le Pr\\u00e9vention et S\\u00e9curit\\u00e9 sur l'intranet : demande d'autorisation de soir\\u00e9e .\\n \\u00c0 faire au moins une semaine avant ta soir\\u00e9e.\\n
\\n\\n Si en plus tu as besoin que le BOUM s'occupe de la musique et/ou PLS des\\n lumi\\u00e8res c'est elleux qu'il faut contacter. Histoire de t'\\u00e9viter\\n d'avoir \\u00e0 chercher voici leur adresse\\u00a0: boum (at) ens (point) fr \\n et pls (at) ens (point) fr .\\n
\", \"type\": \"rich\"}, {\"value\": \"C'est enfin le grand jour, je fais quoi ? \\n\\n D\\u00e9j\\u00e0 le m\\u00e9nage, oui je sais c'est chiant mais c'est le prix \\u00e0 payer pour\\n profiter du local. Demande \\u00e0 ce qu'un-e K-F\\u00eat wo-man t'ouvre et tu devrais avoir\\n \\u00e0 ta disposition tout ce qu'il faut pour faire briller la K-F\\u00eat (ou au moins on essaiera de\\n trouver ce qu'il faut). Fais par\\n contre attention aux bouteilles de bi\\u00e8re qui sont consign\\u00e9es, s'il n'y a\\n personne pour les ranger contente-toi de les mettre sur le bar, quelqu'un\\n s'en chargera plus tard. Les meubles peuvent \\u00eatre d\\u00e9plac\\u00e9s dans une salle\\n voisine si tu le souhaites, il faudra juste penser \\u00e0 les remettre en place.\\n
\\n\\n Ensuite dans l'id\\u00e9al tu connais tous tes potes, donc en donner une liste \\u00e0\\n la loge permet d'\\u00e9viter quelques probl\\u00e8mes et quelques aller-retours.\\n Au-del\\u00e0 de 21h, les ext\\u00e9rieur-e-s ne peuvent rentrer qu'avec un-e Ulmien-ne ayant sa carte\\n sur lui-elle.\\n
\", \"type\": \"rich\"}, {\"value\": \"Je pourrai passer ma musique ? \\n\\n\\n Si le BOUM est pr\\u00e9sent, faut voir avec elleux : boum (at) ens (point) fr \\n Sinon, pr\\u00e9pare ta musique sur un lecteur mp3 ou une playlist\\n Deezer . Lors de la soir\\u00e9e,\\n demande \\u00e0 un-e K-F\\u00eat wo-man de passer ce que tu as pr\\u00e9par\\u00e9.\\n
\", \"type\": \"rich\"}, {\"value\": \"Et pour ce qui est de la nourriture, des boissons ? \\n\\n Tu peux apporter toute la nourriture que tu souhaites\\u00a0; pr\\u00e9vois assez\\n large, il y a beaucoup de K-F\\u00eat people \\u00e0 nourrir. Pour ce qui est de la\\n boisson, il faut te limiter aux boissons de cat\\u00e9gorie 2, c'est \\u00e0 dire\\n bi\\u00e8res, vins et boissons \\u00e0 base de vin, champagne et bien s\\u00fbr les boissons sans alcool.\\n
\", \"type\": \"rich\"}, {\"value\": \"Et pendant la soir\\u00e9e ? \\n\\n Ce soir c'est ton soir, il est donc bien s\\u00fbr \\u00e9vident que tu dois\\n rester pr\\u00e9sent-e et joignable du d\\u00e9but \\u00e0 la fin de la soir\\u00e9e. Id\\u00e9alement ce\\n doit aussi \\u00eatre le cas de tes \\\"Responsables ordre et discipline\\\". Vous ne serez pas\\n trop de deux ou trois pour r\\u00e9gler les probl\\u00e8mes qui pourraient survenir,\\n tes potes bourr\\u00e9-e-s, tes potes qui fument, tes potes qui font du bordel dans la cage d'escalier,\\n etc... Tous les probl\\u00e8mes qui pourraient survenir te seront imput\\u00e9s donc\\n pr\\u00e9viens-les, c'est tes potes apr\\u00e8s tout, non ?\\n
\", \"type\": \"rich\"}, {\"value\": \"Apr\\u00e8s c'est bon ? \\n\\n Eh non, pas encore, apr\\u00e8s (ou le lendemain de) ta soir\\u00e9e il te faudra encore ranger,\\n faire le m\\u00e9nage et passer un coup de javel. Oui encore, mais bon, pense \\u00e0 toutes les fois o\\u00f9\\n c'est nous qui le faisons pour le bien de tou-te-s. Une fois n'est pas\\n coutume demande \\u00e0 un-e K-F\\u00eat wo-man de t'ouvrir et de te fournir tout le\\n mat\\u00e9riel dont tu pourrais avoir besoin, et l\\u00e0 o\\u00f9 c'est vraiment classe\\n c'est que tu peux m\\u00eame faire \\u00e7a en musique si tu le souhaites. N'oublie\\n pas non plus de rapporter les meubles que tu pourrais avoir sortis et que\\n les poubelles ne disparaissent pas toutes seules.\\n
\", \"type\": \"rich\"}, {\"value\": \"Une derni\\u00e8re remarque ? \\n\\n\\n Ouais, la K-F\\u00eat c'est pas chez m\\u00e9m\\u00e9, alors c'est peut-\\u00eatre ta soir\\u00e9e mais\\n si un-e membre de l'\\u00e9quipe K-F\\u00eat te dit quelque\\n chose (de baisser le son, de virer telle ou telle personne...) tu acceptes avec le sourire.\\n En particulier tu ne passes pas derri\\u00e8re le bar .\\n
\", \"type\": \"rich\"}, {\"value\": \"Je ne parle pas bien fran\\u00e7ais, vous pourriez me faire un r\\u00e9sum\\u00e9 ? \\n\\n Organiser ta soir\\u00e9e c'est facile :\\n
\\n Envoie un mail \\u00e0 la K-F\\u00eat pour demander l'autorisation\\n : k-fet (at) ens (point) fr . Lorsque c'est bon, remplis\\n le papier de l'admin, et\\n donne-le au-\\u00e0 la chef-fe K-F\\u00eat. Pour la musique, l'alcool, contacte la K-F\\u00eat. Le jour de la soir\\u00e9e, viens faire le m\\u00e9nage et donne une liste des\\n ext\\u00e9rieur-e-s \\u00e0 la loge. Pendant la soir\\u00e9e, surveille tes invit\\u00e9s (pas trop de bruit \\u00e0\\n l'ext\\u00e9rieur de la K-F\\u00eat, pas de gens trop bourr\\u00e9s qui font des b\\u00eatises\\n avec les alarmes ou les sorties de secours...) Apr\\u00e8s la soir\\u00e9e (le lendemain si tu veux) reviens faire le m\\u00e9nage. \\n\\n Voila, facile, non ?\\n
\", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "pk": 8,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"Et le baby-foot
\", \"type\": \"rich\"}, {\"value\": \"LE flipper \\n\\n\\n\\n\\n\\tIl existe en K-F\\u00eat une machine unique, inimitable, tout droit venue des\\n ann\\u00e9es folles et b\\u00e9nies o\\u00f9 les concepteurs de flippers connaissaient \\nencore leur m\\u00e9tier, o\\u00f9 les tilts \\u00e9taient m\\u00e9rit\\u00e9s et le jeu un art de \\nvivre. L'esth\\u00e8te appr\\u00e9cie et reconna\\u00eet imm\\u00e9diatement la beaut\\u00e9 sobre et \\nsauvage de l'Amazon Hunt II. D'admirateur, il se m\\u00e9tamorphose \\nin\\u00e9luctablement en joueur-se, puis en amant-e. Car l'Amazon est une \\nfemme, fatale \\u00e0 bien des \\u00e9gards, tou-te-s les grand-e-s joueur-euse-s \\nvous le diront. Dans la pr\\u00e9histoire de la K-F\\u00eat, des demi-dieux-d\\u00e9esses \\ndu flipper d\\u00e9sormais pass\\u00e9-e-s dans la l\\u00e9gende ont r\\u00e9dig\\u00e9 un trait\\u00e9 \\n(certain-e-s diront une bible, voire la Bible).
\", \"type\": \"rich\"}, {\"value\": \"Le baby-foot \", \"type\": \"rich\"}, {\"value\": \"La d\\u00e9funte fun machine \\n\\n\\n\\nCette machine n'est plus. Mais elle reste dans le coeur de ceux qui \\nl'ont connue. C'est pourquoi cette section n'a pas \\u00e9t\\u00e9 retir\\u00e9e.
Pour attaquer le cas \\u00e9trange de la machine bizarre qui tra\\u00eene \\u00e0 c\\u00f4t\\u00e9, \\ndisons simplement qu'elle s'appelle Monster Bash. On me souffle en r\\u00e9gie\\n que pour une fun machine, elle n'est pas si mal. De fait, elle t\\u00e9moigne\\n d'un humour d\\u00e9cal\\u00e9, absurde et parfois involontaire : ainsi, la \\ntraduction oscille entre le path\\u00e9tique et l'ignoble, en passant par le \\nburlesque. Le but est de r\\u00e9veiller et vaincre six monstres, parmi \\nlesquels Dracula et Frankenstein, pour les asservir et les rassembler \\ndans le plus grand groupe de rock de l'histoire : les \\u00abmonsters of rock\\u00bb\\n (traduction : \\u00abmonstres du rocher\\u00bb). Il n'y a pas pour le moment de \\ntrait\\u00e9 th\\u00e9orique de la Monster Bash, la jeu se r\\u00e9sumant de toute fa\\u00e7on \\u00e0\\n \\u00abmoi voir, moi actionner flip\\u00bb. Ce qui n'emp\\u00eache pas la machine en \\nquestion d'avoir son public d'habitu\\u00e9-e-s, bien au contraire. \\n
\", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "pk": 10,
+ "model": "kfetcms.kfetpage",
+ "fields": {
+ "main_size": "",
+ "content": "[{\"value\": \"Responsable de la publication Il s'agit de la pr\\u00e9sidence du COF : Association des \\u00c9l\\u00e8ves de l'\\u00c9cole Normale Sup\\u00e9rieure 45 rue d'Ulm 75005 Paris \", \"type\": \"rich\"}, {\"value\": \"Informations prestataires L'h\\u00e9bergement est fourni \\u00e0 titre gracieux par le CRI : \\u00c9cole Normale Sup\\u00e9rieure Centre de Ressources Informatiques 45 rue d'Ulm 75005 Paris Le d\\u00e9veloppement est assur\\u00e9 par COF-Geek . \", \"type\": \"rich\"}]",
+ "layout": "kfet/base_col_mult.html",
+ "no_header": false,
+ "col_count": ""
+ }
+},
+{
+ "model": "wagtaildocs.document",
+ "pk": 1,
+ "fields": {
+ "created_at": "2017-05-30T04:20:00.000Z",
+ "uploaded_by_user": [
+ "root"
+ ],
+ "collection": 2,
+ "title": "K-F\u00eat - Plan d'acc\u00e8s",
+ "file": "documents/kfet_acces.pdf"
+ }
+},
+{
+ "model": "wagtaildocs.document",
+ "pk": 2,
+ "fields": {
+ "created_at": "2017-05-30T04:20:00.000Z",
+ "uploaded_by_user": [
+ "root"
+ ],
+ "collection": 2,
+ "title": "K-F\u00eat - Demande d'autorisation",
+ "file": "documents/kfet_autorisation.pdf"
+ }
+},
+{
+ "model": "wagtaildocs.document",
+ "pk": 3,
+ "fields": {
+ "created_at": "2017-05-30T04:20:00.000Z",
+ "uploaded_by_user": [
+ "root"
+ ],
+ "collection": 2,
+ "title": "K-F\u00eat - Trait\u00e9 de Flipper Th\u00e9orique",
+ "file": "documents/kfet_flipper.pdf"
+ }
+},
+{
+ "model": "wagtailimages.image",
+ "pk": 1,
+ "fields": {
+ "created_at": "2017-05-30T04:20:00.000Z",
+ "focal_point_width": null,
+ "height": 300,
+ "file": "original_images/kfet_amazon.jpg",
+ "collection": 2,
+ "focal_point_x": null,
+ "file_size": null,
+ "focal_point_height": null,
+ "focal_point_y": null,
+ "title": "K-F\u00eat - Amazon Hunt",
+ "width": 200,
+ "uploaded_by_user": [
+ "root"
+ ]
+ }
+},
+{
+ "model": "wagtailimages.image",
+ "pk": 2,
+ "fields": {
+ "created_at": "2017-05-30T04:20:00.000Z",
+ "focal_point_width": null,
+ "height": 300,
+ "file": "original_images/kfet_funmachine.jpg",
+ "collection": 2,
+ "focal_point_x": null,
+ "file_size": null,
+ "focal_point_height": null,
+ "focal_point_y": null,
+ "title": "K-F\u00eat - Fun Machine",
+ "width": 200,
+ "uploaded_by_user": [
+ "root"
+ ]
+ }
+},
+{
+ "fields": {
+ "width": 3020,
+ "file_size": null,
+ "file": "original_images/hugo_manet.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 3020,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Hugo Manet",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 3
+},
+{
+ "fields": {
+ "width": 1566,
+ "file_size": null,
+ "file": "original_images/lisa_gourdon.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 1634,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Lisa Gourdon",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 4
+},
+{
+ "fields": {
+ "width": 117,
+ "file_size": null,
+ "file": "original_images/pierre_quesselaire.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 153,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Pierre Quesselaire",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 5
+},
+{
+ "fields": {
+ "width": 606,
+ "file_size": null,
+ "file": "original_images/thibault_scoquart.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 487,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Thibault Scoquard",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 6
+},
+{
+ "fields": {
+ "width": 640,
+ "file_size": null,
+ "file": "original_images/arnaud_fanthomme.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 320,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Arnaud Fanthomme",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 7
+},
+{
+ "fields": {
+ "width": 125,
+ "file_size": null,
+ "file": "original_images/vincent_balerdi.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 163,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Vincent Balerdi",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 8
+},
+{
+ "fields": {
+ "width": 125,
+ "file_size": null,
+ "file": "original_images/nathanel_willaime.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 176,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Nathana\u00ebl Willaime",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 9
+},
+{
+ "fields": {
+ "width": 125,
+ "file_size": null,
+ "file": "original_images/elisabeth_miller.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 146,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "\u00c9lisabeth Miller",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 10
+},
+{
+ "fields": {
+ "width": 720,
+ "file_size": null,
+ "file": "original_images/arthur_lesage.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 720,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Arthur Lesage",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 11
+},
+{
+ "fields": {
+ "width": 445,
+ "file_size": null,
+ "file": "original_images/sarah_asset.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 436,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Sarah Asset",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 12
+},
+{
+ "fields": {
+ "width": 480,
+ "file_size": null,
+ "file": "original_images/alexandre_legrand.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 360,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Alexandre Legrand",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 13
+},
+{
+ "fields": {
+ "width": 4608,
+ "file_size": null,
+ "file": "original_images/etienne_baudel.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 3456,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "\u00c9tienne Baudel",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 14
+},
+{
+ "fields": {
+ "width": 358,
+ "file_size": null,
+ "file": "original_images/marine_snape.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 435,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Marine Snape",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 15
+},
+{
+ "fields": {
+ "width": 121,
+ "file_size": null,
+ "file": "original_images/anatole_gosset.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 200,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Anatole Gosset",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 16
+},
+{
+ "fields": {
+ "width": 253,
+ "file_size": null,
+ "file": "original_images/jacko_rastikian.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 338,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Jacko Rastikian",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 17
+},
+{
+ "fields": {
+ "width": 285,
+ "file_size": null,
+ "file": "original_images/alexandre_jannaud.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 380,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Alexandre Jannaud",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 18
+},
+{
+ "fields": {
+ "width": 283,
+ "file_size": null,
+ "file": "original_images/aurelien_delobelle.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 371,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Aur\u00e9lien Delobelle",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 19
+},
+{
+ "fields": {
+ "width": 125,
+ "file_size": null,
+ "file": "original_images/sylvain_douteau.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 161,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Sylvain Douteau",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 20
+},
+{
+ "fields": {
+ "width": 125,
+ "file_size": null,
+ "file": "original_images/raphael_lescanne.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 176,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Rapha\u00ebl Lescanne",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 21
+},
+{
+ "fields": {
+ "width": 124,
+ "file_size": null,
+ "file": "original_images/romain_gourvil.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 157,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Romain Gourvil",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 22
+},
+{
+ "fields": {
+ "width": 133,
+ "file_size": null,
+ "file": "original_images/marie_labeye.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 163,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Marie Labeye",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 23
+},
+{
+ "fields": {
+ "width": 127,
+ "file_size": null,
+ "file": "original_images/oscar_blumberg.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 159,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Oscar Blumberg",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 24
+},
+{
+ "fields": {
+ "width": 210,
+ "file_size": null,
+ "file": "original_images/zaid_allybokus.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 311,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Za\u00efd Allybokus",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 25
+},
+{
+ "fields": {
+ "width": 495,
+ "file_size": null,
+ "file": "original_images/damien_garreau.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 548,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Damien Garreau",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 26
+},
+{
+ "fields": {
+ "width": 323,
+ "file_size": null,
+ "file": "original_images/andrea_londono.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 458,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Andr\u00e9a Londono-Lopez",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 27
+},
+{
+ "fields": {
+ "width": 120,
+ "file_size": null,
+ "file": "original_images/tristan_roussel.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 155,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Tristan Roussel",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 28
+},
+{
+ "fields": {
+ "width": 427,
+ "file_size": null,
+ "file": "original_images/guillaume_vernade.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 640,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Guillaume Vernade",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 29
+},
+{
+ "fields": {
+ "width": 2304,
+ "file_size": null,
+ "file": "original_images/lucas_mercier.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 3020,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Lucas Mercier",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 30
+},
+{
+ "fields": {
+ "width": 199,
+ "file_size": null,
+ "file": "original_images/francois_maillot.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 240,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Fran\u00e7ois Maillot",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 31
+},
+{
+ "fields": {
+ "width": 965,
+ "file_size": null,
+ "file": "original_images/fabrice_catoire.jpg",
+ "focal_point_height": null,
+ "focal_point_x": null,
+ "height": 1255,
+ "focal_point_width": null,
+ "focal_point_y": null,
+ "title": "Fabrice Catoire",
+ "collection": 2,
+ "uploaded_by_user": [
+ "root"
+ ],
+ "created_at": "2017-05-30T04:20:00.000Z"
+ },
+ "model": "wagtailimages.image",
+ "pk": 32
+},
+{
+ "model": "wagtailmenus.flatmenu",
+ "fields": {
+ "max_levels": 1,
+ "handle": "kfet-nav",
+ "site": [
+ "localhost",
+ 8000
+ ],
+ "use_specific": 1,
+ "heading": "",
+ "title": "K-F\u00eat - Navigation"
+ },
+ "pk": 1
+},
+{
+ "pk": 1,
+ "fields": {
+ "link_page": 3,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "Accueil",
+ "link_url": "",
+ "sort_order": 0,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+},
+{
+ "pk": 2,
+ "fields": {
+ "link_page": 4,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "",
+ "link_url": "",
+ "sort_order": 1,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+},
+{
+ "pk": 3,
+ "fields": {
+ "link_page": 5,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "",
+ "link_url": "",
+ "sort_order": 2,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+},
+{
+ "pk": 4,
+ "fields": {
+ "link_page": 6,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "",
+ "link_url": "",
+ "sort_order": 3,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+},
+{
+ "pk": 5,
+ "fields": {
+ "link_page": 7,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "",
+ "link_url": "",
+ "sort_order": 4,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+},
+{
+ "pk": 6,
+ "fields": {
+ "link_page": 8,
+ "menu": 1,
+ "allow_subnav": true,
+ "handle": "",
+ "link_text": "",
+ "link_url": "",
+ "sort_order": 5,
+ "url_append": ""
+ },
+ "model": "wagtailmenus.flatmenuitem"
+}
+]
diff --git a/kfet/cms/hooks.py b/kfet/cms/hooks.py
new file mode 100644
index 00000000..e58aeef5
--- /dev/null
+++ b/kfet/cms/hooks.py
@@ -0,0 +1,12 @@
+from django.contrib.staticfiles.templatetags.staticfiles import static
+from django.utils.html import format_html
+
+from wagtail.wagtailcore import hooks
+
+
+@hooks.register('insert_editor_css')
+def editor_css():
+ return format_html(
+ ' ',
+ static('kfetcms/css/editor.css'),
+ )
diff --git a/kfet/cms/management/commands/kfet_loadwagtail.py b/kfet/cms/management/commands/kfet_loadwagtail.py
new file mode 100644
index 00000000..86b94d3e
--- /dev/null
+++ b/kfet/cms/management/commands/kfet_loadwagtail.py
@@ -0,0 +1,35 @@
+from django.contrib.auth.models import Group
+from django.core.management import call_command
+from django.core.management.base import BaseCommand
+
+from wagtail.wagtailcore.models import Page, Site
+
+
+class Command(BaseCommand):
+ help = "Importe des données pour Wagtail"
+
+ def add_arguments(self, parser):
+ parser.add_argument('--file', default='kfet_wagtail_17_05')
+
+ def handle(self, *args, **options):
+
+ self.stdout.write("Import des données wagtail")
+
+ # Nettoyage des données initiales posées par Wagtail dans la migration
+ # wagtailcore/0002
+
+ Group.objects.filter(name__in=('Moderators', 'Editors')).delete()
+
+ try:
+ homepage = Page.objects.get(
+ title="Welcome to your new Wagtail site!"
+ )
+ homepage.delete()
+ Site.objects.filter(root_page=homepage).delete()
+ except Page.DoesNotExist:
+ pass
+
+ # Import des données
+ # Par défaut, il s'agit d'une copie du site K-Fêt (17-05)
+
+ call_command('loaddata', options['file'])
diff --git a/kfet/cms/migrations/0001_initial.py b/kfet/cms/migrations/0001_initial.py
new file mode 100644
index 00000000..951637c7
--- /dev/null
+++ b/kfet/cms/migrations/0001_initial.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import wagtail.wagtailsnippets.blocks
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import django.db.models.deletion
+import kfet.cms.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wagtailcore', '0033_remove_golive_expiry_help_text'),
+ ('wagtailimages', '0019_delete_filter'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='KFetPage',
+ fields=[
+ ('page_ptr', models.OneToOneField(serialize=False, primary_key=True, parent_link=True, auto_created=True, to='wagtailcore.Page')),
+ ('no_header', models.BooleanField(verbose_name='Sans en-tête', help_text="Coché, l'en-tête (avec le titre) de la page n'est pas affiché.", default=False)),
+ ('content', wagtail.wagtailcore.fields.StreamField((('rich', wagtail.wagtailcore.blocks.RichTextBlock(label='Éditeur')), ('carte', kfet.cms.models.MenuBlock()), ('group_team', wagtail.wagtailcore.blocks.StructBlock((('show_only', wagtail.wagtailcore.blocks.IntegerBlock(help_text='Nombre initial de membres affichés. Laisser vide pour tou-te-s les afficher.', required=False, label='Montrer seulement')), ('members', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailsnippets.blocks.SnippetChooserBlock(kfet.cms.models.MemberTeam), classname='team-group', label='K-Fêt-eux-ses'))))), ('group', wagtail.wagtailcore.blocks.StreamBlock((('rich', wagtail.wagtailcore.blocks.RichTextBlock(label='Éditeur')), ('carte', kfet.cms.models.MenuBlock()), ('group_team', wagtail.wagtailcore.blocks.StructBlock((('show_only', wagtail.wagtailcore.blocks.IntegerBlock(help_text='Nombre initial de membres affichés. Laisser vide pour tou-te-s les afficher.', required=False, label='Montrer seulement')), ('members', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailsnippets.blocks.SnippetChooserBlock(kfet.cms.models.MemberTeam), classname='team-group', label='K-Fêt-eux-ses')))))), label='Contenu groupé'))), verbose_name='Contenu')),
+ ('layout', models.CharField(max_length=255, choices=[('kfet/base_col_1.html', 'Une colonne : centrée sur la page'), ('kfet/base_col_2.html', 'Deux colonnes : fixe à gauche, contenu à droite'), ('kfet/base_col_mult.html', 'Contenu scindé sur plusieurs colonnes')], help_text='Comment cette page devrait être affichée ?', verbose_name='Template', default='kfet/base_col_mult.html')),
+ ('main_size', models.CharField(max_length=255, blank=True, verbose_name='Taille de la colonne de contenu')),
+ ('col_count', models.CharField(max_length=255, blank=True, verbose_name='Nombre de colonnes', help_text="S'applique au page dont le contenu est scindé sur plusieurs colonnes")),
+ ],
+ options={
+ 'verbose_name': 'page K-Fêt',
+ 'verbose_name_plural': 'pages K-Fêt',
+ },
+ bases=('wagtailcore.page',),
+ ),
+ migrations.CreateModel(
+ name='MemberTeam',
+ fields=[
+ ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
+ ('first_name', models.CharField(blank=True, max_length=255, verbose_name='Prénom', default='')),
+ ('last_name', models.CharField(blank=True, max_length=255, verbose_name='Nom', default='')),
+ ('nick_name', models.CharField(verbose_name='Alias', blank=True, default='', max_length=255)),
+ ('photo', models.ForeignKey(null=True, related_name='+', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Photo', blank=True, to='wagtailimages.Image')),
+ ],
+ options={
+ 'verbose_name': 'K-Fêt-eux-se',
+ },
+ ),
+ ]
diff --git a/kfet/cms/migrations/__init__.py b/kfet/cms/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kfet/cms/models.py b/kfet/cms/models.py
new file mode 100644
index 00000000..0dff183f
--- /dev/null
+++ b/kfet/cms/models.py
@@ -0,0 +1,174 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from wagtail.wagtailadmin.edit_handlers import (
+ FieldPanel, FieldRowPanel, MultiFieldPanel, StreamFieldPanel
+)
+from wagtail.wagtailcore import blocks
+from wagtail.wagtailcore.fields import StreamField
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.wagtailsnippets.blocks import SnippetChooserBlock
+from wagtail.wagtailsnippets.models import register_snippet
+
+from kfet.cms.context_processors import get_articles
+
+
+@register_snippet
+class MemberTeam(models.Model):
+ first_name = models.CharField(
+ verbose_name=_('Prénom'),
+ blank=True, default='', max_length=255,
+ )
+ last_name = models.CharField(
+ verbose_name=_('Nom'),
+ blank=True, default='', max_length=255,
+ )
+ nick_name = models.CharField(
+ verbose_name=_('Alias'),
+ blank=True, default='', max_length=255,
+ )
+ photo = models.ForeignKey(
+ 'wagtailimages.Image',
+ verbose_name=_('Photo'),
+ on_delete=models.SET_NULL,
+ null=True, blank=True,
+ related_name='+',
+ )
+
+ class Meta:
+ verbose_name = _('K-Fêt-eux-se')
+
+ panels = [
+ FieldPanel('first_name'),
+ FieldPanel('last_name'),
+ FieldPanel('nick_name'),
+ ImageChooserPanel('photo'),
+ ]
+
+ def __str__(self):
+ return self.get_full_name()
+
+ def get_full_name(self):
+ return '{} {}'.format(self.first_name, self.last_name).strip()
+
+
+class MenuBlock(blocks.StaticBlock):
+ class Meta:
+ icon = 'list-ul'
+ label = _('Carte')
+ template = 'kfetcms/block_menu.html'
+
+ def get_context(self, *args, **kwargs):
+ context = super().get_context(*args, **kwargs)
+ context.update(get_articles())
+ return context
+
+
+class GroupTeamBlock(blocks.StructBlock):
+ show_only = blocks.IntegerBlock(
+ label=_('Montrer seulement'),
+ required=False,
+ help_text=_(
+ 'Nombre initial de membres affichés. Laisser vide pour tou-te-s '
+ 'les afficher.'
+ ),
+ )
+ members = blocks.ListBlock(
+ SnippetChooserBlock(MemberTeam),
+ label=_('K-Fêt-eux-ses'),
+ classname='team-group',
+ )
+
+ class Meta:
+ icon = 'group'
+ label = _('Groupe de K-Fêt-eux-ses')
+ template = 'kfetcms/block_teamgroup.html'
+
+
+class ChoicesStreamBlock(blocks.StreamBlock):
+ rich = blocks.RichTextBlock(label=_('Éditeur'))
+ carte = MenuBlock()
+ group_team = GroupTeamBlock()
+
+
+class KFetStreamBlock(ChoicesStreamBlock):
+ group = ChoicesStreamBlock(label=_('Contenu groupé'))
+
+
+class KFetPage(Page):
+
+ content = StreamField(KFetStreamBlock, verbose_name=_('Contenu'))
+
+ # Layout fields
+
+ TEMPLATE_COL_1 = 'kfet/base_col_1.html'
+ TEMPLATE_COL_2 = 'kfet/base_col_2.html'
+ TEMPLATE_COL_MULT = 'kfet/base_col_mult.html'
+
+ no_header = models.BooleanField(
+ verbose_name=_('Sans en-tête'),
+ default=False,
+ help_text=_(
+ "Coché, l'en-tête (avec le titre) de la page n'est pas affiché."
+ ),
+ )
+ layout = models.CharField(
+ verbose_name=_('Template'),
+ choices=[
+ (TEMPLATE_COL_1, _('Une colonne : centrée sur la page')),
+ (TEMPLATE_COL_2, _('Deux colonnes : fixe à gauche, contenu à droite')),
+ (TEMPLATE_COL_MULT, _('Contenu scindé sur plusieurs colonnes')),
+ ],
+ default=TEMPLATE_COL_MULT, max_length=255,
+ help_text=_(
+ "Comment cette page devrait être affichée ?"
+ ),
+ )
+ main_size = models.CharField(
+ verbose_name=_('Taille de la colonne de contenu'),
+ blank=True, max_length=255,
+ )
+ col_count = models.CharField(
+ verbose_name=_('Nombre de colonnes'),
+ blank=True, max_length=255,
+ help_text=_(
+ "S'applique au page dont le contenu est scindé sur plusieurs colonnes."
+ ),
+ )
+
+ # Panels
+
+ content_panels = Page.content_panels + [
+ StreamFieldPanel('content'),
+ ]
+
+ layout_panel = [
+ FieldPanel('no_header'),
+ FieldPanel('layout'),
+ FieldRowPanel([
+ FieldPanel('main_size'),
+ FieldPanel('col_count'),
+ ]),
+ ]
+
+ settings_panels = [
+ MultiFieldPanel(layout_panel, _('Affichage'))
+ ] + Page.settings_panels
+
+ # Base template
+ template = "kfetcms/base.html"
+
+ class Meta:
+ verbose_name = _('page K-Fêt')
+ verbose_name_plural = _('pages K-Fêt')
+
+ def get_context(self, request, *args, **kwargs):
+ context = super().get_context(request, *args, **kwargs)
+
+ page = context['page']
+
+ if not page.seo_title:
+ page.seo_title = page.title
+
+ return context
diff --git a/kfet/cms/static/kfetcms/css/base.css b/kfet/cms/static/kfetcms/css/base.css
new file mode 100644
index 00000000..b580ef94
--- /dev/null
+++ b/kfet/cms/static/kfetcms/css/base.css
@@ -0,0 +1,93 @@
+.main.cms {
+ padding: 20px 15px;
+}
+
+@media (min-width: 768px) {
+ .main.cms {
+ padding: 35px 30px;
+ }
+}
+
+.cms {
+ text-align: justify;
+ font-size: 1.1em;
+}
+
+@media (min-width:768px) {
+ .cms {
+ font-size: 1.2em;
+ line-height: 1.6em;
+ }
+}
+
+/* Titles */
+
+.cms h2, .cms h3 {
+ clear: both;
+ margin: 0 0 15px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #c8102e;
+ text-align: left;
+ font-weight: bold;
+}
+
+@media (min-width: 768px) {
+ .cms h2, .cms h3 {
+ padding-bottom: 15px;
+ }
+}
+
+/* Paragraphs */
+
+.cms p {
+ margin-bottom: 20px;
+ text-indent: 2em;
+}
+
+.cms p + :not(h2):not(h3):not(div) {
+ margin-top: -10px;
+}
+
+@media (min-width: 768px) {
+ .cms p {
+ padding-bottom: 15px;
+ }
+
+ .cms p + :not(h2):not(h3):not(div) {
+ margin-top: -30px;
+ }
+}
+
+
+/* Lists */
+
+.cms ol, .cms ul {
+ padding: 0 0 0 15px;
+ margin: 0 0 10px;
+}
+
+.cms ul {
+ list-style-type: square;
+}
+
+.cms ol > li, .cms ul > li {
+ padding-left: 5px;
+}
+
+
+/* Images */
+
+.cms .richtext-image {
+ max-height: 100%;
+ margin: 5px 0 15px;
+}
+
+.cms .richtext-image.left {
+ float: left;
+ margin-right: 30px;
+}
+
+.cms .richtext-image.right {
+ float: right;
+ margin-left: 30px;
+}
diff --git a/kfet/cms/static/kfetcms/css/editor.css b/kfet/cms/static/kfetcms/css/editor.css
new file mode 100644
index 00000000..f97e9895
--- /dev/null
+++ b/kfet/cms/static/kfetcms/css/editor.css
@@ -0,0 +1,18 @@
+.snippets.listing thead, .snippets.listing thead tr {
+ border: 0;
+}
+
+.snippets.listing tbody {
+ display: block;
+ column-count: 2;
+}
+
+.snippets.listing tbody tr {
+ display: block;
+}
+
+@media (min-width: 992px) {
+ .snippets.listing tbody {
+ column-count: 3;
+ }
+}
diff --git a/kfet/cms/static/kfetcms/css/index.css b/kfet/cms/static/kfetcms/css/index.css
new file mode 100644
index 00000000..647515e3
--- /dev/null
+++ b/kfet/cms/static/kfetcms/css/index.css
@@ -0,0 +1,3 @@
+@import url("base.css");
+@import url("menu.css");
+@import url("team.css");
diff --git a/kfet/cms/static/kfetcms/css/menu.css b/kfet/cms/static/kfetcms/css/menu.css
new file mode 100644
index 00000000..f1952c69
--- /dev/null
+++ b/kfet/cms/static/kfetcms/css/menu.css
@@ -0,0 +1,58 @@
+.carte {
+ margin-bottom: 15px;
+ font-family: "Roboto Slab";
+}
+
+.carte .carte-title {
+ padding-top: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+.carte .carte-list {
+ width: 100%;
+ padding: 15px;
+ list-style-type: none;
+}
+
+.carte .carte-item {
+ position: relative;
+ text-align: right;
+ white-space: nowrap;
+ padding: 0;
+}
+
+.carte .carte-item .filler {
+ position: absolute;
+ left: 0;
+ right: 0;
+ border-bottom: 2px dotted #333;
+ height: 75%;
+}
+
+.carte .carte-item > span {
+ position: relative;
+}
+
+.carte .carte-item .carte-label {
+ background: white;
+ float: left;
+ padding-right: 10px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+.carte .carte-item .carte-ukf {
+ padding: 0 10px;
+ background: #ffdbc7;
+}
+
+.carte-inverted .carte-list,
+.carte-inverted .carte-item .carte-label {
+ background: #ffdbc7;
+}
+
+.carte-inverted .carte-item .carte-ukf {
+ background: white;
+}
diff --git a/kfet/cms/static/kfetcms/css/team.css b/kfet/cms/static/kfetcms/css/team.css
new file mode 100644
index 00000000..e663fc66
--- /dev/null
+++ b/kfet/cms/static/kfetcms/css/team.css
@@ -0,0 +1,47 @@
+.team-group {
+ margin-bottom: 20px;
+}
+
+.team-group .col-btn {
+ margin-bottom: 20px;
+}
+
+.team-group .member-more {
+ display: none;
+}
+
+.team-member {
+ padding: 0;
+ margin-bottom: 20px;
+ min-height: 190px;
+ background-color: inherit;
+ border: 0;
+}
+
+.team-member img {
+ max-width: 100%;
+ max-height: 125px;
+ width: auto;
+ height: auto;
+ display: block;
+}
+
+.team-member .infos {
+ height: 50px;
+ margin-top: 15px;
+}
+
+@media (min-width: 768px) {
+ .team-group {
+ margin-left: 20px;
+ margin-right: 20px;
+ }
+
+ .team-member {
+ min-height: 215px;
+ }
+
+ .team-member img {
+ max-height: 150px;
+ }
+}
diff --git a/kfet/cms/templates/kfetcms/base.html b/kfet/cms/templates/kfetcms/base.html
new file mode 100644
index 00000000..3b9f40d6
--- /dev/null
+++ b/kfet/cms/templates/kfetcms/base.html
@@ -0,0 +1,41 @@
+{% extends page.layout %}
+{% load static wagtailcore_tags wagtailuserbar %}
+
+{# CSS/JS #}
+
+{% block extra_head %}
+{{ block.super }}
+
+{% endblock %}
+
+{# Titles #}
+
+{% block title %}{{ page.seo_title }}{% endblock %}
+{% block header-title %}{{ page.title }}{% endblock %}
+
+{# Layout #}
+
+{% block main-size %}{{ page.main_size|default:block.super }}{% endblock %}
+{% block mult-count %}{{ page.col_count|default:block.super }}{% endblock %}
+
+{% block main-class %}cms main-bg{% endblock %}
+
+{# Content #}
+
+{% block main %}
+
+{% for block in page.content %}
+
+ {% include_block block %}
+
+{% endfor %}
+
+{% wagtailuserbar %}
+
+{% endblock %}
+
+{# Footer #}
+
+{% block footer %}
+{% include "kfet/base_footer.html" %}
+{% endblock %}
diff --git a/kfet/cms/templates/kfetcms/block_menu.html b/kfet/cms/templates/kfetcms/block_menu.html
new file mode 100644
index 00000000..382a7770
--- /dev/null
+++ b/kfet/cms/templates/kfetcms/block_menu.html
@@ -0,0 +1,11 @@
+{% load static %}
+
+{% if pressions %}
+ {% include "kfetcms/block_menu_category.html" with title="Pressions du moment" articles=pressions class="carte-inverted" %}
+{% endif %}
+
+{% regroup articles by category as categories %}
+
+{% for category in categories %}
+ {% include "kfetcms/block_menu_category.html" with title=category.grouper.name articles=category.list %}
+{% endfor %}
diff --git a/kfet/cms/templates/kfetcms/block_menu_category.html b/kfet/cms/templates/kfetcms/block_menu_category.html
new file mode 100644
index 00000000..ef7d4ce0
--- /dev/null
+++ b/kfet/cms/templates/kfetcms/block_menu_category.html
@@ -0,0 +1,12 @@
+
+
{{ title }}
+
+ {% for article in articles %}
+
+
+ {{ article.name }}
+ {{ article.price_ukf }} UKF
+
+ {% endfor %}
+
+
diff --git a/kfet/cms/templates/kfetcms/block_teamgroup.html b/kfet/cms/templates/kfetcms/block_teamgroup.html
new file mode 100644
index 00000000..fab43d68
--- /dev/null
+++ b/kfet/cms/templates/kfetcms/block_teamgroup.html
@@ -0,0 +1,66 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+
+
+{% with groupteam=value len=value.members|length %}
+
+
+
+ {% if len == 2 %}
+
+ {% endif %}
+
+ {% for member in groupteam.members %}
+
+
+ {% image member.photo max-200x500 %}
+
+ {{ member.get_full_name }}
+
+ {% if member.nick_name %}
+ alias {{ member.nick_name }}
+ {% endif %}
+
+
+
+ {% endfor %}
+
+ {% if groupteam.show_only != None and len > groupteam.show_only %}
+
+
+ {% if groupteam.show_only %}
+ Y'en a plus !
+ {% else %}
+ Les voir
+ {% endif %}
+
+
+ {% endif %}
+
+
+
+{% endwith %}
+
+
diff --git a/kfet/forms.py b/kfet/forms.py
index 984932f2..5190689d 100644
--- a/kfet/forms.py
+++ b/kfet/forms.py
@@ -25,8 +25,8 @@ from gestioncof.models import CofProfile
# -----
class DateTimeWidget(forms.DateTimeInput):
- def __init__(self, attrs=None):
- super(DateTimeWidget, self).__init__(attrs)
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
self.attrs['format'] = '%Y-%m-%d %H:%M'
class Media:
@@ -458,8 +458,11 @@ class KFetConfigForm(ConfigForm):
class FilterHistoryForm(forms.Form):
- checkouts = forms.ModelMultipleChoiceField(queryset = Checkout.objects.all())
- accounts = forms.ModelMultipleChoiceField(queryset = Account.objects.all())
+ checkouts = forms.ModelMultipleChoiceField(queryset=Checkout.objects.all())
+ accounts = forms.ModelMultipleChoiceField(queryset=Account.objects.all())
+ from_date = forms.DateTimeField(widget=DateTimeWidget)
+ to_date = forms.DateTimeField(widget=DateTimeWidget)
+
# -----
# Transfer forms
diff --git a/kfet/management/commands/loadkfetdevdata.py b/kfet/management/commands/loadkfetdevdata.py
index 7f2ec9a3..6dd25f29 100644
--- a/kfet/management/commands/loadkfetdevdata.py
+++ b/kfet/management/commands/loadkfetdevdata.py
@@ -147,3 +147,9 @@ class Command(MyBaseCommand):
# ---
call_command('createopes', '100', '7', '--transfers=20')
+
+ # ---
+ # Wagtail CMS
+ # ---
+
+ call_command('kfet_loadwagtail')
diff --git a/kfet/models.py b/kfet/models.py
index d6b1cfbc..ec146ad9 100644
--- a/kfet/models.py
+++ b/kfet/models.py
@@ -14,7 +14,8 @@ from datetime import date
import re
import hashlib
-from kfet.config import kfet_config
+from .config import kfet_config
+from .utils import to_ukf
def choices_length(choices):
return reduce(lambda m, choice: max(m, len(choice[0])), choices, 0)
@@ -79,7 +80,7 @@ class Account(models.Model):
def __str__(self):
return '%s (%s)' % (self.trigramme, self.name)
- # Propriétés pour accéder aux attributs de user et cofprofile et user
+ # Propriétés pour accéder aux attributs de cofprofile et user
@property
def user(self):
return self.cofprofile.user
@@ -103,6 +104,10 @@ class Account(models.Model):
return self.cofprofile.is_cof
# Propriétés supplémentaires
+ @property
+ def balance_ukf(self):
+ return to_ukf(self.balance, is_cof=self.is_cof)
+
@property
def real_balance(self):
if hasattr(self, 'negative') and self.negative.balance_offset:
@@ -121,6 +126,14 @@ class Account(models.Model):
def need_comment(self):
return self.trigramme == '#13'
+ @property
+ def readable(self):
+ return self.trigramme != 'GNR'
+
+ @property
+ def is_team(self):
+ return self.has_perm('kfet.is_team')
+
@staticmethod
def is_validandfree(trigramme):
data = { 'is_valid' : False, 'is_free' : False }
@@ -302,6 +315,10 @@ class AccountNegative(models.Model):
('view_negs', 'Voir la liste des négatifs'),
)
+ @property
+ def until_default(self):
+ return self.start + kfet_config.overdraft_duration
+
class Checkout(models.Model):
created_by = models.ForeignKey(
@@ -454,6 +471,10 @@ class Article(models.Model):
def get_absolute_url(self):
return reverse('kfet.article.read', kwargs={'pk': self.pk})
+ def price_ukf(self):
+ return to_ukf(self.price)
+
+
class ArticleRule(models.Model):
article_on = models.OneToOneField(
Article, on_delete = models.PROTECT,
diff --git a/kfet/open/static/kfetopen/kfet-open.css b/kfet/open/static/kfetopen/kfet-open.css
index 6698c50b..d44318cd 100644
--- a/kfet/open/static/kfetopen/kfet-open.css
+++ b/kfet/open/static/kfetopen/kfet-open.css
@@ -23,6 +23,8 @@
.kfetopen .details {
margin: 0;
padding: 10px !important;
+ min-width: 200px;
+ font-family: "Roboto Slab";
font-size: 16px;
color: black;
}
diff --git a/kfet/signals.py b/kfet/signals.py
index 12a1cd5f..c677ac9c 100644
--- a/kfet/signals.py
+++ b/kfet/signals.py
@@ -4,6 +4,7 @@ from django.contrib import messages
from django.contrib.auth.signals import user_logged_in
from django.core.urlresolvers import reverse
from django.dispatch import receiver
+from django.utils.safestring import mark_safe
@receiver(user_logged_in)
@@ -12,8 +13,9 @@ def messages_on_login(sender, request, user, **kwargs):
user.has_perm('kfet.is_team') and
hasattr(request, 'GET') and
'k-fet' in request.GET.get('next', '')):
- messages.info(
- request,
- ('Connexion en utilisateur partagé ? '
- .format(reverse('kfet.login.genericteam'))),
- extra_tags='safe')
+ messages.info(request, mark_safe(
+ ''
+ ' Connexion en utilisateur partagé ?'
+ ' '
+ .format(reverse('kfet.login.genericteam'))
+ ))
diff --git a/kfet/static/kfet/css/base/buttons.css b/kfet/static/kfet/css/base/buttons.css
new file mode 100644
index 00000000..e7498022
--- /dev/null
+++ b/kfet/static/kfet/css/base/buttons.css
@@ -0,0 +1,88 @@
+/* General ------------------------- */
+
+.btn {
+ border: 0;
+ outline: none !important;
+
+ transition: background-color, border, color, opacity;
+ transition-duration: 0.15s;
+
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+
+ font-family: "Roboto Slab";
+}
+
+.btn, .btn-lg, .btn-group-lg>.btn {
+ border-radius:0;
+}
+
+
+/* Default ------------------------- */
+
+.btn-default {
+ background-color: transparent !important;
+ color: #555;
+}
+
+.btn-default:hover,
+.btn-default.focus, .btn-default:focus {
+ color: #c8102e;
+}
+
+.btn-default[disabled]:hover, .btn-default.disabled:hover {
+ color: inherit !important;
+}
+
+
+/* Primary ------------------------- */
+
+.btn-primary {
+ background-color:#c63b52;
+ color:#FFF;
+}
+
+.btn-primary:hover,
+.btn-primary.focus, .btn-primary:focus,
+.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
+.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover {
+ background-color:#c8102e;
+ color:#FFF;
+}
+
+
+/* Primary + White background ------ */
+
+.btn-primary-w {
+ background: white;
+ color: black;
+}
+
+.btn-primary-w:hover {
+ background: #c63b52;
+ color: white;
+}
+
+.btn-primary-w.focus, .btn-primary-w:focus,
+.btn-primary-w.active.focus, .btn-primary-w.active:focus, .btn-primary-w.active:hover,
+.btn-primary-w:active.focus, .btn-primary-w:active:focus, .btn-primary-w:active:hover {
+ background: #c8102e;
+ color: white;
+}
+
+
+/* Nav ----------------------------- */
+
+.btn-nav {
+ background-color: transparent !important;
+ color: inherit;
+ border-bottom: 1px solid #ddd;
+}
+
+.btn-nav:hover,
+.btn-nav.focus, .btn-nav:focus,
+.btn-nav.active.focus, .btn-nav.active:focus, .btn-nav.active:hover,
+.btn-nav:active.focus, .btn-nav:active:focus, .btn-nav:active:hover {
+ border-bottom: 1px solid #c8102e;
+}
diff --git a/kfet/static/kfet/css/base/fixed.css b/kfet/static/kfet/css/base/fixed.css
new file mode 100644
index 00000000..d198c50f
--- /dev/null
+++ b/kfet/static/kfet/css/base/fixed.css
@@ -0,0 +1,151 @@
+.fixed > * + * {
+ margin-top: 15px;
+}
+
+
+/* Aside --------------------------- */
+
+/* Aside - Block */
+
+aside {
+ background: white;
+ padding: 15px;
+}
+
+aside > * + * {
+ margin-top: 15px;
+}
+
+/* Aside - Misc */
+
+aside .glyphicon-question-sign {
+ font-size: 0.8;
+}
+
+aside h4 {
+ font-weight: bold;
+}
+
+/* Aside - Heading */
+
+aside .heading {
+ font-family: "Roboto Slab";
+ font-size: 25px;
+ font-weight: bold;
+ line-height: 1.1;
+ text-align: center;
+}
+
+aside .heading .big {
+ font-size: 2em;
+}
+
+aside .heading .sub {
+ font-size: 0.7em;
+ font-weight: normal;
+}
+
+@media (min-width: 992px) {
+ aside .heading {
+ font-size: 32px;
+ line-height: 1.3;
+ }
+}
+
+/* Aside - Buttons */
+
+aside .buttons {
+ margin-left: -15px;
+ margin-right: -15px;
+}
+
+aside .buttons > * {
+ flex: 0 1 auto !important;
+}
+
+
+/* Aside - Text */
+
+aside .text {
+ line-height: 1.3;
+ font-size: 14px;
+}
+
+@media (min-width: 992px) {
+ aside .text {
+ line-height: 1.6;
+ font-size: 16px;
+ }
+}
+
+aside .text ul {
+ margin-bottom: 0;
+}
+
+
+/* Buttons ------------------------- */
+
+.fixed .buttons {
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: center;
+
+ text-align: center;
+}
+
+.fixed .buttons > * {
+ flex: 0 1 auto;
+ overflow: hidden;
+}
+
+.fixed .buttons > .solo {
+ flex: 1 100%;
+}
+
+@media (min-width: 768px) {
+ .fixed .buttons > * {
+ flex: 1 auto;
+ }
+
+ .fixed .buttons > .full > * {
+ width: 100%;
+ }
+}
+
+.fixed .buttons .btn {
+ padding: 8px 12px;
+}
+
+@media (min-width: 992px) {
+ .fixed .buttons .btn {
+ font-size: 16px;
+ }
+}
+
+
+/* Tabs ---------------------------- */
+
+.fixed .tabs-buttons {
+ margin-bottom: -5px;
+}
+
+.fixed .tabs-buttons > * {
+ margin-bottom: 5px;
+}
+
+.fixed .tabs-buttons .glyphicon-chevron-right {
+ margin-left: 5px;
+ line-height: 1.4;
+ color: white;
+}
+
+@media (min-width: 768px) {
+ .fixed .tabs-buttons {
+ text-align: right;
+ justify-content: flex-end;
+ }
+
+ .fixed .tabs-buttons > * {
+ flex: 1 100%;
+ }
+}
diff --git a/kfet/static/kfet/css/base/footer.css b/kfet/static/kfet/css/base/footer.css
new file mode 100644
index 00000000..abdf98ed
--- /dev/null
+++ b/kfet/static/kfet/css/base/footer.css
@@ -0,0 +1,18 @@
+.footer {
+ line-height: 40px;
+
+ background: #c63b52;
+ color: white;
+
+ text-align: center;
+ font-size: 14px;
+ font-family: Roboto;
+}
+
+.footer a {
+ color: inherit !important;
+}
+
+.footer a:hover, .footer a:focus {
+ text-decoration: underline;
+}
diff --git a/kfet/static/kfet/css/base/main.css b/kfet/static/kfet/css/base/main.css
new file mode 100644
index 00000000..2ebc90d8
--- /dev/null
+++ b/kfet/static/kfet/css/base/main.css
@@ -0,0 +1,138 @@
+/* Global layout ------------------- */
+
+.main-col, .fixed-col {
+ padding: 0 0 15px;
+}
+
+@media (min-width: 768px) {
+ .fixed-col {
+ position: sticky;
+ top: 35px;
+ padding-top: 15px;
+ }
+
+ .fixed-col + .main-col {
+ padding: 15px 0 15px 15px;
+ }
+}
+
+@media (min-width: 992px) {
+ .main-col {
+ padding: 15px;
+ }
+}
+
+.main-col-mult {
+ column-gap: 45px;
+}
+
+.main-bg {
+ background: white;
+}
+
+.main-padding {
+ padding: 15px;
+}
+
+@media (min-width: 768px) {
+ .main-padding {
+ padding: 30px;
+ }
+}
+
+
+/* Section ------------------------- */
+
+section {
+ margin-bottom: 15px;
+ position:relative;
+}
+
+section:last-child {
+ margin-bottom: 0;
+}
+
+
+/* Section - Elements -------------- */
+
+section > * {
+ background: white;
+ padding: 15px;
+}
+
+section > .full,
+section > table,
+section > .table-responsive {
+ padding: 0 !important;
+ margin-left: 0 !important;
+ margin-right: 0 !important;
+}
+
+section .full {
+ margin-left: -15px;
+ margin-right: -15px;
+}
+
+@media (min-width: 992px) {
+ section > * {
+ padding: 30px;
+ }
+
+ section .full {
+ margin-left: -30px;
+ margin-right: -30px;
+ }
+}
+
+section .row > div:last-child {
+ margin-bottom: 0 !important;
+}
+
+@media (max-width: 768px) {
+ section .row > div {
+ margin-bottom: 10px;
+ }
+}
+
+@media (max-width: 1200px) {
+ section .row > div {
+ margin-bottom: 20px;
+ }
+}
+
+section ul ul {
+ padding-left: 30px;
+}
+
+/* Titles & Heading */
+
+section h2,
+section .heading {
+ background: transparent;
+ margin: 20px 15px 15px;
+ padding: 0;
+ border-bottom: 3px solid #c8102e;
+ font-family: "Roboto Slab";
+ font-size: 40px;
+ line-height: 1.1;
+}
+
+section h3 {
+ border-bottom: 2px solid #c8102e;
+ margin: 0 0 10px;
+ padding: 10px 0 10px;
+ font-size: 25px;
+ font-weight: bold;
+}
+
+section .heading .buttons {
+ opacity: 0.7;
+ top: 10px;
+ float: right;
+}
+
+section h2:first-child,
+section h3:first-child {
+ padding-top: 0;
+ margin-top: 0;
+}
diff --git a/kfet/static/kfet/css/base/messages.css b/kfet/static/kfet/css/base/messages.css
new file mode 100644
index 00000000..268f514d
--- /dev/null
+++ b/kfet/static/kfet/css/base/messages.css
@@ -0,0 +1,36 @@
+.messages .alert {
+ padding:10px 15px;
+ margin:0;
+ border:0;
+ border-radius:0;
+}
+
+.messages .alert:last-child {
+ margin-bottom: 15px;
+}
+
+.messages .alert .close {
+ top:0;
+ right:0;
+}
+
+.messages .alert-info {
+ color:inherit;
+ background-color:#ccc;
+}
+
+.messages .alert-error {
+ color: white;
+ background-color: #c63b52;
+}
+
+.messages .alert-success {
+ color: white;
+ background: #3d9947;
+}
+
+.messages a {
+ font-weight: bold;
+ text-decoration: none;
+}
+
diff --git a/kfet/static/kfet/css/base/misc.css b/kfet/static/kfet/css/base/misc.css
new file mode 100644
index 00000000..680fb1ee
--- /dev/null
+++ b/kfet/static/kfet/css/base/misc.css
@@ -0,0 +1,118 @@
+/* General ------------------------- */
+
+body {
+ margin-top:50px;
+ font-family:Roboto;
+ background:#ddd;
+}
+
+.glyphicon + span, span + .glyphicon {
+ margin-left: 10px;
+}
+
+/* Titles */
+
+h1,h2,h3,h4,h5,h6 {
+ font-family:"Roboto Slab";
+}
+
+/* Links */
+
+a {
+ color:#C8202E;
+}
+
+a:focus, a:hover {
+ color:#C8102E;
+}
+
+/* Inputs */
+
+:focus {
+ outline:none;
+}
+
+textarea {
+ font-family:'Roboto Mono';
+ border-radius:0 !important;
+}
+
+/* Lists */
+
+ul, ol {
+ padding-left: 30px;
+}
+
+ul {
+ list-style-type: square;
+}
+
+/* Tables */
+
+.table {
+ margin-bottom:0;
+ border-bottom:1px solid #ddd;
+ width:100%;
+ background-color: #FFF;
+}
+
+.table td {
+ vertical-align:middle !important;
+}
+
+.table td.no-padding {
+ padding:0;
+}
+
+.table thead {
+ background:#c8102e;
+ color:#fff;
+ font-weight:bold;
+ font-size:16px;
+}
+
+.table thead td {
+ padding:8px !important;
+}
+
+.table tr.section {
+ background: #c63b52 !important;
+ color:#fff;
+ font-weight:bold;
+}
+
+.table tr.section td {
+ border-top:0;
+ font-size:16px;
+ padding:8px 30px;
+}
+
+.table tr.more td {
+ padding: 0;
+}
+
+.table-responsive {
+ border: 0;
+ margin-bottom: 0;
+}
+
+/* Toggle on hover ----------------- */
+
+.toggle:not(:hover) .hover {
+ display: none;
+}
+
+.toggle:hover .base {
+ display: none;
+}
+
+/* Spinning animation -------------- */
+
+.glyphicon.spinning {
+ animation: spin 1s infinite linear;
+}
+
+@keyframes spin {
+ from { transform: scale(1) rotate(0deg); }
+ to { transform: scale(1) rotate(360deg); }
+}
diff --git a/kfet/static/kfet/css/base/nav.css b/kfet/static/kfet/css/base/nav.css
new file mode 100644
index 00000000..0efc2873
--- /dev/null
+++ b/kfet/static/kfet/css/base/nav.css
@@ -0,0 +1,151 @@
+.navbar {
+ background: #000;
+ color: #DDD;
+ border: 0;
+ font-family: Roboto;
+}
+
+.navbar .navbar-header {
+ float: left;
+ display: none;
+ margin-left: -15px;
+ margin-right: 0;
+}
+
+.navbar .navbar-brand {
+ padding: 3px 0;
+ margin: 0 15px !important;
+}
+
+.navbar .navbar-brand img {
+ height: 44px;
+}
+
+.navbar .navbar-toggle {
+ border: 0;
+ border-radius: 0;
+ padding: 18px 15px;
+ margin: 0;
+ min-width: auto;
+}
+
+.navbar .navbar-toggle .icon-bar {
+ background: #fff;
+}
+
+.navbar-nav {
+ font-size: 14px;
+ margin: 0 0 0 -15px;
+ float: left;
+}
+
+@media (min-width: 460px) {
+ .navbar .navbar-header {
+ display: block;
+ }
+
+ .navbar-nav {
+ margin-left: 0;
+ }
+
+ .navbar-nav .nav-pages.dropdown .dropdown-menu > li:first-child {
+ display: none;
+ }
+}
+
+.navbar-right {
+ float: right !important;
+ margin: 0 -15px 0 0;
+}
+
+.navbar-nav a {
+ transition: background-color, box-shadow, color;
+ transition-duration: 0.15s;
+}
+
+.navbar-nav > li {
+ float: left;
+ text-align: center;
+}
+
+.navbar-nav > li > a {
+ min-width: 50px;
+ padding: 15px 10px;
+ color: #FFF;
+}
+
+.navbar-nav > .divider {
+ height: 1px;
+ background: rgba(255, 255, 255, 0.1);
+}
+
+@media (min-width: 1200px) {
+ .navbar-nav > li > a {
+ padding-left: 15px;
+ padding-right: 15px;
+ }
+}
+
+.navbar-nav > li > a:hover, .navbar-nav > li > a:focus,
+.nav .open > a:hover, .nav .open > a:focus,
+.navbar-nav > li.active > a,
+.navbar-nav .dropdown:hover > a, .navbar-nav .dropdown:focus > a {
+ background-color: #C8102E;
+ color: #FFF;
+ box-shadow: inset 0 3px 3px -4px #000;
+}
+
+.navbar-nav .dropdown .dropdown-menu {
+ padding: 0;
+ border: 0;
+ border-radius: 0;
+ background-color: #FFF;
+ font-size: 14px;
+
+ /* override max-width: 767px of bs */
+ position: absolute;
+ float: left;
+ box-shadow: 0 6px 12px rgba(0,0,0,.175);
+}
+
+.navbar-nav .dropdown .dropdown-menu > li > a {
+ padding: 8px 10px;
+ line-height: inherit;
+ color: #000;
+}
+
+.navbar-nav .dropdown .dropdown-menu > li > a:hover,
+.navbar-nav .dropdown .dropdown-menu > li > a:focus {
+ color: #c8102e;
+ background-color: transparent;
+}
+
+.navbar-nav .dropdown .dropdown-menu .divider {
+ margin: 0;
+}
+
+.navbar-nav .dropdown .dropdown-menu {
+ display: block;
+ visibility: hidden;
+ opacity: 0;
+ transition: opacity 0.15s;
+}
+
+.navbar-nav .dropdown:hover > .dropdown-menu,
+.navbar-nav .dropdown:focus > .dropdown-menu,
+.navbar-nav .dropdown.open > .dropdown-menu {
+ visibility: visible;
+ opacity: 1;
+}
+
+@media (min-width: 992px) {
+ .navbar-nav .dropdown .dropdown-menu > li > a {
+ padding-left: 20px;
+ padding-right: 20px;
+ }
+}
+
+.nav-app .dropdown-menu {
+ right: 0;
+ left: auto;
+}
diff --git a/kfet/static/kfet/css/history.css b/kfet/static/kfet/css/history.css
index dff7a455..9cd4cd28 100644
--- a/kfet/static/kfet/css/history.css
+++ b/kfet/static/kfet/css/history.css
@@ -9,9 +9,10 @@
#history .day {
height:40px;
line-height:40px;
- background-color:rgba(200,16,46,0.9);
+ background-color:rgba(200,16,46,1);
color:#fff;
padding-left:20px;
+ font-family:"Roboto Slab";
font-size:16px;
font-weight:bold;
position:sticky;
@@ -22,7 +23,7 @@
#history .opegroup {
height:30px;
line-height:30px;
- background-color:rgba(200,16,46,0.75);
+ background-color: #c63b52;
color:#fff;
font-weight:bold;
padding-left:20px;
diff --git a/kfet/static/kfet/css/home.css b/kfet/static/kfet/css/home.css
deleted file mode 100644
index 718159c3..00000000
--- a/kfet/static/kfet/css/home.css
+++ /dev/null
@@ -1,54 +0,0 @@
-ul.carte {
- width: 100%;
- list-style-type: none;
- padding-left: 15px;
- padding-right: 15px;
- display: inline-block;
- *display: inline;
- zoom: 1;
- position: relative;
- clip: auto;
- overflow: hidden;
-}
-/*
-ul.carte > li {
- border-style: none none solid none;
- border-width: 1px;
- border-color: #DDD;
-}
-*/
-li.carte-line {
- position: relative;
- text-align: right;
- white-space: nowrap;
-}
-.filler {
- position: absolute;
- left: 0;
- right: 0;
- border-bottom: 3px dotted #333;
- height: 70%;
-}
-.carte-label {
- background: white;
- float: left;
- padding-right: 4px;
- position: relative;
- max-width: calc(100% - 40px);
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.carte-ukf {
- background: white;
- padding-left: 4px;
- position: relative;
-}
-
-
-.unbreakable.carte-inverted .carte-ukf,
-.unbreakable.carte-inverted .carte-label,
-.unbreakable.carte-inverted {
- background: #FFDBC7;
-}
diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 5aa74e6e..8e28cce0 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -1,275 +1,78 @@
-@import url("nav.css");
+/* Libs */
+@import url("libs/columns.css");
+
+/* Libs customizations */
+@import url("libs/jconfirm-kfet.css");
+@import url("libs/multiple-select-kfet.css");
+
+/* Base */
+@import url("base/misc.css");
+@import url("base/buttons.css");
+
+/* Blocks */
+@import url("base/main.css");
+@import url("base/nav.css");
+@import url("base/messages.css");
+@import url("base/fixed.css");
+@import url("base/footer.css");
+
+/* Components */
@import url("kpsul.css");
-@import url("jconfirm-kfet.css");
@import url("history.css");
-body {
- margin-top:50px;
- font-family:Roboto;
- background:#ddd;
+
+
+.header {
+ padding: 15px 20px;
+
+ background-color: rgba(200,16,46,1);
+ color: #FFF;
}
-h1,h2,h3,h4,h5,h6 {
- font-family:Oswald;
-}
-
-a {
- color:#333;
-}
-
-a:focus, a:hover {
- color:#C8102E;
-}
-
-:focus {
- outline:none;
-}
-
-textarea {
- font-family:'Roboto Mono';
- border-radius:0 !important;
-}
-
-.glyphicon.spinning {
- animation: spin 1s infinite linear;
-}
-
-@keyframes spin {
- from { transform: scale(1) rotate(0deg); }
- to { transform: scale(1) rotate(360deg); }
-}
-
-.table {
- margin-bottom:0;
- border-bottom:1px solid #ddd;
- width:100%;
- background-color: #FFF;
-}
-
-.table td {
- vertical-align:middle !important;
-}
-
-.table td.no-padding {
- padding:0;
-}
-
-.table thead {
- background:#c8102e;
- color:#fff;
- font-weight:bold;
- font-size:16px;
-}
-
-.table thead td {
- padding:8px !important;
-}
-
-.table tr.section {
- background:rgba(200,16,46,0.9);
- color:#fff;
- font-weight:bold;
-}
-
-.table tr.section td {
- border-top:0;
- font-size:16px;
- padding:8px 30px;
-}
-
-.table-responsive {
- border: 0;
- margin-bottom: 0;
-}
-
-.btn {
- transition: background-color, color;
- transition-duration: 0.15s;
-}
-
-.btn, .btn-lg, .btn-group-lg>.btn {
- border-radius:0;
-}
-
-.btn-primary {
- font-family:Oswald;
- background-color:rgba(200,16,46,0.9);
- color:#FFF;
- border:0;
-}
-
-.btn-primary:hover,
-.btn-primary.focus, .btn-primary:focus,
-.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
-.btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
-.nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
- outline: 0;
- background-color:rgba(200,16,46,1);
- color:#FFF;
-}
-
-.btn-primary[disabled]:hover,
-.btn-primary[disabled]:focus {
- background-color: #000;
- color: #666;
-}
-
-.nav-pills>li>a {
- border-radius:0;
-}
-
-.nav-pills>li>a:focus, .nav-pills>li>a:hover {
- outline: 0;
- background-color:rgba(200,16,46,1);
- color:#FFF;
-}
-
-.row-page-header {
- background-color:rgba(200,16,46,1);
- color:#FFF;
- border-bottom:3px solid #000;
-}
-
-.page-header {
- border:0;
- padding:0;
- margin:15px 20px;
- text-transform:uppercase;
- font-weight:bold;
+.header h1 {
+ padding: 0;
+ margin: 0;
+ font-weight: bold;
}
.nopadding {
padding: 0 !important;
}
-.col-content-left, .col-content-right {
- padding:0;
-}
-
-@media (min-width: 768px) {
- .col-content-left {
- position: sticky;
- top:50px;
- }
-}
-
-.content-left-top {
- background:#fff;
- padding:10px 30px;
-}
-
-.content-left .buttons {
- background:#fff;
-}
-
-.content-left .buttons .btn {
- display:block;
-}
-
-.content-left .buttons ul.nav-pills {
- margin-bottom:5px;
-}
-
-.content-left .buttons ul.nav-pills li {
- margin:0 0 -5px;
-}
-
-.content-left-top.frozen-account {
- background:#000FBA;
+.frozen-account {
+ background:#5072e0;
color:#fff;
}
-.content-left .block {
- padding-top:25px;
+
+.main .table a:not(.btn) {
+ color: inherit;
}
-.content-left .block .line {
- font-size:16px;
- line-height:30px;
+.main .table a:not(.btn):focus ,
+.main .table a:not(.btn):hover {
+ color: #C81022;
}
-.content-left .line.line-big {
- font-family:Oswald;
- font-size:60px;
- font-weight:bold;
- text-align:center;
-}
-
-.content-left .line.line-bigsub {
- font-size:25px;
- font-weight:bold;
- text-align:center;
-}
-
-.content-left .line.balance {
- font-size:45px;
- text-align:center;
-}
-
-@media (min-width: 768px) {
- .content-right {
- margin: 15px;
- }
-}
-
-.content-right-block {
- position:relative;
-}
-
-.content-right-block > *:not(.buttons-title) {
- background: #fff;
-}
-
-.content-right-block > h2 {
- background: transparent !important;
-}
-
-.content-right-block .buttons-title {
- position:absolute;
- top:8px;
- right:20px;
-}
-
-.content-right-block > div.row {
- margin:0;
-}
-
-.content-right-block h2 {
- margin:20px 20px 15px;
- padding-bottom:5px;
- border-bottom:3px solid #c8102e;
- font-size:40px;
-}
-
-.content-right-block h3 {
- border-bottom: 1px solid #c8102e;
- margin: 0px 15px 15px;
- padding: 20px 20px 10px;
- font-size:25px;
-}
/*
* Pages tableaux seuls
*/
-.content-center > *:not(.content-right-block) {
- background: #fff;
-}
-
-@media (min-width: 992px) {
- .content-center {
- margin: 15px 0;
- }
-}
-
-.content-center tbody tr:not(.section) td {
- padding:0px 5px;
-}
.table .form-control {
padding: 1px 12px ;
height:28px;
margin:3px 0px;
+ background: transparent;
+}
+
+.table .form-control[disabled], .table .form-control[readonly] {
+ background: #f5f5f5;
+}
+
+.table-condensed-input tbody tr:not(.section) td {
+ padding:0px 5px;
}
.table-condensed input.form-control {
@@ -279,19 +82,34 @@ textarea {
border-radius: 0;
}
-.content-center .auth-form {
- margin:15px;
+.auth-form {
+ padding: 15px 0;
+ background: #d86c7e;
+ color: white;
+}
+
+.auth-form.form-horizontal {
+ padding: 0;
+ margin: 0;
+}
+
+.auth-form .form-group {
+ margin-bottom: 0;
+}
+
+.auth-form input {
+ box-shadow: none !important;
+ background: transparent;
+ color: white;
+ border: 0 !important;
+ border-radius: 0;
+ border-bottom: 1px solid white !important;
}
/*
* Pages formulaires seuls
*/
-.content-form {
- background-color: #fff;
- padding: 15px;
-}
-
.account_create #id_trigramme {
display:block;
width:200px;
@@ -354,42 +172,48 @@ textarea {
padding:5px 20px;
}
-/*
- * Messages
+/* Account autocomplete window */
+
+#account_results ul {
+ list-style-type:none;
+ background:rgba(255,255,255,0.9);
+ padding:0;
+}
+
+#account_results li {
+ display:block;
+ padding:5px 20px;
+ height:100%;
+ width:100%;
+}
+
+#account_results .hilight {
+ background:rgba(200,16,46,0.9);
+ color:#fff;
+ text-decoration:none;
+}
+
+/**
+ * Stats (graphs)
*/
-.messages {
- margin: 0;
+.stat-nav {
+ margin-bottom: 10px;
+ font-family: Roboto;
}
-.messages .alert {
- padding:10px 15px;
- margin:0;
- border:0;
- border-radius:0;
+.stat-nav li {
+ float: left;
}
-.messages .alert-dismissible {
- padding-right:35px;
+.stat-nav a {
+ opacity: 0.6;
+ font-family: Roboto;
}
-.messages .alert .close {
- top:0;
- right:0;
-}
-
-.messages .alert-info {
- color:inherit;
- background-color:#ccc;
-}
-
-.messages .alert-error {
- color:inherit;
- background-color:rgba(200,16,46,0.2);
-}
-
-.messages .alert-success {
- color:#333;
+.stat-nav a:hover,
+.stat-nav a.focus, .stat-nav a:focus {
+ opacity: 1;
}
/*
@@ -412,7 +236,7 @@ textarea {
margin-top:30px;
padding-top:1px;
padding-bottom:15px;
- background:rgba(51,51,51,0.7);
+ background:rgba(51,51,51,0.9);
color:#fff;
}
@@ -449,159 +273,10 @@ thead .tooltip {
height: 100px;
}
-/*
- * Responsive Columns
- */
-
-.unbreakable {
- display:inline-block;
- width: 100%;
-}
-
-
-.column-row {
- padding: 15px 20px;
-}
-
-.column-xs-1,
-.column-sm-1,
-.column-md-1,
-.column-lg-1,
-.column-xs-2,
-.column-sm-2,
-.column-md-2,
-.column-lg-2,
-.column-xs-3,
-.column-sm-3,
-.column-md-3,
-.column-lg-3,
-.column-xs-4,
-.column-sm-4,
-.column-md-4,
-.column-lg-4,
-.column-xs-5,
-.column-sm-5,
-.column-md-5,
-.column-lg-5 {
- -webkit-column-count: 1; /* Chrome, Safari, Opera */
- -moz-column-count: 1; /* Firefox */
- column-count: 1;
-}
-
-
-.column-xs-1 {
- -webkit-column-count: 1; /* Chrome, Safari, Opera */
- -moz-column-count: 1; /* Firefox */
- column-count: 1;
-}
-.column-xs-2 {
- -webkit-column-count: 2; /* Chrome, Safari, Opera */
- -moz-column-count: 2; /* Firefox */
- column-count: 2;
-}
-.column-xs-3 {
- -webkit-column-count: 3; /* Chrome, Safari, Opera */
- -moz-column-count: 3; /* Firefox */
- column-count: 3;
-}
-.column-xs-4 {
- -webkit-column-count: 4; /* Chrome, Safari, Opera */
- -moz-column-count: 4; /* Firefox */
- column-count: 4;
-}
-.column-xs-5 {
- -webkit-column-count: 5; /* Chrome, Safari, Opera */
- -moz-column-count: 5; /* Firefox */
- column-count: 5;
-}
-
-@media (min-width: 576px) {
- .column-sm-1 {
- -webkit-column-count: 1; /* Chrome, Safari, Opera */
- -moz-column-count: 1; /* Firefox */
- column-count: 1;
- }
- .column-sm-2 {
- -webkit-column-count: 2; /* Chrome, Safari, Opera */
- -moz-column-count: 2; /* Firefox */
- column-count: 2;
- }
- .column-sm-3 {
- -webkit-column-count: 3; /* Chrome, Safari, Opera */
- -moz-column-count: 3; /* Firefox */
- column-count: 3;
- }
- .column-sm-4 {
- -webkit-column-count: 4; /* Chrome, Safari, Opera */
- -moz-column-count: 4; /* Firefox */
- column-count: 4;
- }
- .column-sm-5 {
- -webkit-column-count: 5; /* Chrome, Safari, Opera */
- -moz-column-count: 5; /* Firefox */
- column-count: 5;
- }
-}
-
-@media (min-width: 768px) {
- .column-md-1 {
- -webkit-column-count: 1; /* Chrome, Safari, Opera */
- -moz-column-count: 1; /* Firefox */
- column-count: 1;
- }
- .column-md-2 {
- -webkit-column-count: 2; /* Chrome, Safari, Opera */
- -moz-column-count: 2; /* Firefox */
- column-count: 2;
- }
- .column-md-3 {
- -webkit-column-count: 3; /* Chrome, Safari, Opera */
- -moz-column-count: 3; /* Firefox */
- column-count: 3;
- }
- .column-md-4 {
- -webkit-column-count: 4; /* Chrome, Safari, Opera */
- -moz-column-count: 4; /* Firefox */
- column-count: 4;
- }
- .column-md-5 {
- -webkit-column-count: 5; /* Chrome, Safari, Opera */
- -moz-column-count: 5; /* Firefox */
- column-count: 5;
- }
-}
-
-@media (min-width: 992px) {
- .column-lg-1 {
- -webkit-column-count: 1; /* Chrome, Safari, Opera */
- -moz-column-count: 1; /* Firefox */
- column-count: 1;
- }
- .column-lg-2 {
- -webkit-column-count: 2; /* Chrome, Safari, Opera */
- -moz-column-count: 2; /* Firefox */
- column-count: 2;
- }
- .column-lg-3 {
- -webkit-column-count: 3; /* Chrome, Safari, Opera */
- -moz-column-count: 3; /* Firefox */
- column-count: 3;
- }
- .column-lg-4 {
- -webkit-column-count: 4; /* Chrome, Safari, Opera */
- -moz-column-count: 4; /* Firefox */
- column-count: 4;
- }
- .column-lg-5 {
- -webkit-column-count: 5; /* Chrome, Safari, Opera */
- -moz-column-count: 5; /* Firefox */
- column-count: 5;
- }
-}
/* Inventaires */
-#inventoryform input[type=number] {
+.table-condensed-input input[type=number] {
text-align: center;
}
@@ -620,18 +295,6 @@ thead .tooltip {
margin: 0 auto;
}
-/* Multiple select customizations */
-
-.ms-choice {
- height: 34px !important;
- line-height: 34px !important;
- border: 1px solid #ccc !important;
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !important;
-}
-
-.ms-choice > div {
- top: 4px !important;
-}
/* Checkbox select multiple */
diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css
index 583cc627..6ae9ebc4 100644
--- a/kfet/static/kfet/css/kpsul.css
+++ b/kfet/static/kfet/css/kpsul.css
@@ -154,9 +154,10 @@ input[type=number]::-webkit-outer-spin-button {
height:50px;
padding:0 15px;
- background:rgba(200,16,46,0.9);
+ background:rgba(200,16,46,1);
color:#fff;
+ font-family:"Roboto Slab";
font-weight:bold;
font-size:18px;
}
@@ -237,16 +238,10 @@ input[type=number]::-webkit-outer-spin-button {
height:40px;
}
-#special_operations button {
- height:100%;
- width:25%;
+#special_operations .btn {
+ height:40px;
- float:left;
-
- background: rgba(200,16,46,0.9);
- color:#FFF;
-
- font-size:18px;
+ font-size:15px;
font-weight:bold;
text-overflow: ellipsis;
@@ -254,12 +249,6 @@ input[type=number]::-webkit-outer-spin-button {
overflow: hidden;
}
-#special_operations button:focus,
-#special_operations button:hover {
- outline:none;
- background: rgba(200,16,46,1);
- color:#fff;
-}
/* Article autocomplete */
@@ -328,16 +317,22 @@ input[type=number]::-webkit-outer-spin-button {
font-size:14px;
}
-#articles_data table tr.article>td:first-child {
+#articles_data table tr.article td:first-child {
padding-left:10px;
}
+#articles_data table tr.article td + td {
+ padding-right:10px;
+ text-align:right;
+}
+
#articles_data table tr.category {
height:35px;
- background-color:rgba(200,16,46,0.9);
+ background-color:#c8102e;
+ font-family:"Roboto Slab";
font-size:16px;
- color:#FFF;
font-weight:bold;
+ color:#FFF;
}
#articles_data table tr.category>td:first-child {
diff --git a/kfet/static/kfet/css/libs/columns.css b/kfet/static/kfet/css/libs/columns.css
new file mode 100644
index 00000000..34591061
--- /dev/null
+++ b/kfet/static/kfet/css/libs/columns.css
@@ -0,0 +1,43 @@
+.unbreakable {
+ display:inline-block;
+ width: 100%;
+}
+
+.column-xs-1, .column-sm-1, .column-md-1, .column-lg-1,
+.column-xs-2, .column-sm-2, .column-md-2, .column-lg-2,
+.column-xs-3, .column-sm-3, .column-md-3, .column-lg-3,
+.column-xs-4, .column-sm-4, .column-md-4, .column-lg-4,
+.column-xs-5, .column-sm-5, .column-md-5, .column-lg-5 {
+ column-count: 1;
+}
+
+.column-xs-1 { column-count: 1; }
+.column-xs-2 { column-count: 2; }
+.column-xs-3 { column-count: 3; }
+.column-xs-4 { column-count: 4; }
+.column-xs-5 { column-count: 5; }
+
+@media (min-width: 768px) {
+ .column-sm-1 { column-count: 1; }
+ .column-sm-2 { column-count: 2; }
+ .column-sm-3 { column-count: 3; }
+ .column-sm-4 { column-count: 4; }
+ .column-sm-5 { column-count: 5; }
+}
+
+@media (min-width: 992px) {
+ .column-md-1 { column-count: 1; }
+ .column-md-2 { column-count: 2; }
+ .column-md-3 { column-count: 3; }
+ .column-md-4 { column-count: 4; }
+ .column-md-5 { column-count: 5; }
+}
+
+@media (min-width: 1200px) {
+ .column-lg-1 { column-count: 1; }
+ .column-lg-2 { column-count: 2; }
+ .column-lg-3 { column-count: 3; }
+ .column-lg-4 { column-count: 4; }
+ .column-lg-5 { column-count: 5; }
+}
+
diff --git a/kfet/static/kfet/css/jconfirm-kfet.css b/kfet/static/kfet/css/libs/jconfirm-kfet.css
similarity index 80%
rename from kfet/static/kfet/css/jconfirm-kfet.css
rename to kfet/static/kfet/css/libs/jconfirm-kfet.css
index 1aee70f1..d2803434 100644
--- a/kfet/static/kfet/css/jconfirm-kfet.css
+++ b/kfet/static/kfet/css/libs/jconfirm-kfet.css
@@ -5,7 +5,7 @@
.jconfirm .jconfirm-box {
padding:0;
border-radius:0 !important;
- font-family:"Roboto Mono";
+ font-family:Roboto;
}
.jconfirm .jconfirm-box div.title-c .title {
@@ -28,7 +28,6 @@
.jconfirm .jconfirm-box .content {
border-bottom:1px solid #ddd;
- padding:5px 10px;
}
.jconfirm .jconfirm-box input {
@@ -37,6 +36,7 @@
border:0;
+ font-family:"Roboto Mono";
font-size:40px;
text-align:center;
@@ -49,6 +49,7 @@
}
.jconfirm .jconfirm-box .buttons button {
+ min-width:40px;
height:100%;
margin:0;
margin:0 !important;
@@ -84,24 +85,3 @@
padding-right: 50px;
padding-left: 50px;
}
-
-/* Account autocomplete window */
-
-#account_results ul {
- list-style-type:none;
- background:rgba(255,255,255,0.9);
- padding:0;
-}
-
-#account_results li {
- display:block;
- padding:5px 20px;
- height:100%;
- width:100%;
-}
-
-#account_results .hilight {
- background:rgba(200,16,46,0.9);
- color:#fff;
- text-decoration:none;
-}
diff --git a/kfet/static/kfet/css/libs/multiple-select-kfet.css b/kfet/static/kfet/css/libs/multiple-select-kfet.css
new file mode 100644
index 00000000..145968d3
--- /dev/null
+++ b/kfet/static/kfet/css/libs/multiple-select-kfet.css
@@ -0,0 +1,14 @@
+/**
+ * Multiple Select plugin customizations
+ */
+
+.ms-choice {
+ height: 34px !important;
+ line-height: 34px !important;
+ border: 1px solid #ccc !important;
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !important;
+}
+
+.ms-choice > div {
+ top: 4px !important;
+}
diff --git a/kfet/static/kfet/img/favicon.png b/kfet/static/kfet/img/favicon.png
new file mode 100644
index 00000000..56fb4299
Binary files /dev/null and b/kfet/static/kfet/img/favicon.png differ
diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index b07bb0b1..b34f2005 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -189,3 +189,13 @@ function requestAuth(data, callback, focus_next = null) {
});
}
+
+
+/**
+ * Setup jquery-confirm
+ */
+
+jconfirm.defaults = {
+ confirmButton: ' ',
+ cancelButton: ' '
+};
diff --git a/kfet/static/kfet/js/statistic.js b/kfet/static/kfet/js/statistic.js
index db31e0e8..9baa08c4 100644
--- a/kfet/static/kfet/js/statistic.js
+++ b/kfet/static/kfet/js/statistic.js
@@ -7,7 +7,7 @@
var self = this;
var element = $(target);
- var content = $("");
+ var content = $("
");
var buttons;
function dictToArray (dict, start) {
@@ -67,7 +67,6 @@
{
label: chart.label,
borderColor: chart.color,
- backgroundColor: chart.color,
fill: is_time_chart,
lineTension: 0,
data: chart_data,
@@ -154,9 +153,8 @@
// initialize the interface
function initialize (data) {
// creates the bar with the buttons
- buttons = $("