Compare commits

..

No commits in common. "master" and "Qwann/refonte" have entirely different histories.

47 changed files with 782 additions and 4926 deletions

View file

@ -1,7 +1,7 @@
from django.contrib import admin
from django import forms
from .models import Equipment, EquipmentDefault, EquipmentRevision, EquipmentCategory, EquipmentLost, EquipmentAttributeValue, EquipmentAttribute, EquipmentStorage
from .models import Equipment, EquipmentDefault, EquipmentRevision, EquipmentCategory, EquipmentLost, EquipmentAttributeValue, EquipmentAttribute
from .fields import IdField, IdWidget
@ -69,11 +69,6 @@ class CategoryAdmin(admin.ModelAdmin):
search_fields = ['name',]
autocomplete_fields = ['parent', ]
class StorageAdmin(admin.ModelAdmin):
list_display = ['name']
ordering = ['name']
search_fields = ['name']
class EquipmentAttributeAdmin(admin.ModelAdmin):
list_display = ['name']
@ -84,7 +79,7 @@ class EquipmentAttributeAdmin(admin.ModelAdmin):
class EquipmentAdmin(admin.ModelAdmin):
save_as_continue = True
save_on_top = True
autocomplete_fields = ['category', 'storage', ]
autocomplete_fields = ['category', ]
readonly_fields = ['full_category_p',
'added_at',
'modified_at',
@ -93,7 +88,7 @@ class EquipmentAdmin(admin.ModelAdmin):
'stock_lost_p',
'ids_lost_p',
]
list_display = ['name', 'stock', 'owner', 'category', 'storage', 'modified_at']
list_display = ['name', 'stock', 'owner', 'category', 'modified_at']
fieldsets = (
('Général', {
'fields': ('name', 'owner', 'stock', )
@ -107,8 +102,8 @@ class EquipmentAdmin(admin.ModelAdmin):
'ids_lost_p',
),
}),
('Attributs', {
'fields': ('category', 'full_category_p', 'storage'),
('Catégorie', {
'fields': ('category', 'full_category_p'),
}),
('Description', {
'fields': ('description', 'added_at', 'modified_at',),
@ -124,10 +119,9 @@ class EquipmentAdmin(admin.ModelAdmin):
EquipmentLostExtraInline,
EquipmentRevisionExtraInline]
search_fields = ['name', 'description',]
list_filter = ['owner', 'category', 'storage', ]
list_filter = ['owner', 'category' ]
admin.site.register(Equipment, EquipmentAdmin)
admin.site.register(EquipmentCategory, CategoryAdmin)
admin.site.register(EquipmentStorage, StorageAdmin)
admin.site.register(EquipmentAttribute, EquipmentAttributeAdmin)

View file

@ -1,26 +0,0 @@
# Generated by Django 2.1.5 on 2019-03-18 11:45
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('equipment', '0014_auto_20180827_0005'),
]
operations = [
migrations.CreateModel(
name='EquipmentStorage',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200, verbose_name='nom')),
],
),
migrations.AddField(
model_name='equipment',
name='storage',
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='equipment.EquipmentStorage', verbose_name='stockage'),
),
]

View file

@ -1,17 +0,0 @@
# Generated by Django 2.1.5 on 2019-03-18 11:47
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('equipment', '0015_auto_20190318_1245'),
]
operations = [
migrations.AlterModelOptions(
name='equipmentstorage',
options={'verbose_name': 'stockage', 'verbose_name_plural': 'stockages'},
),
]

View file

@ -10,20 +10,6 @@ from .fields import IdField
from datetime import date
class EquipmentStorage(models.Model):
name = models.CharField(
_("nom"),
max_length=200,
)
class Meta:
verbose_name = _("stockage")
verbose_name_plural = _("stockages")
def __str__(self):
return self.name
class EquipmentCategory(models.Model):
name = models.CharField(
_("nom"),
@ -122,14 +108,6 @@ class Equipment(EventSpecificMixin, models.Model):
verbose_name=_("catégorie"),
on_delete=models.PROTECT,
)
storage = models.ForeignKey(
EquipmentStorage,
blank=True,
null=True,
default=None,
verbose_name=_("stockage"),
on_delete=models.PROTECT,
)
added_at = models.DateTimeField(
_("ajouté le"),

View file

@ -5,7 +5,6 @@ from equipment.models import EquipmentAttribution
class EquipmentAttributionExtraInline(admin.TabularInline):
autocomplete_fields = ['equipment', ]
model = EquipmentAttribution
extra = 0
classes = ['collapse']

View file

@ -1,373 +0,0 @@
/* Calendar */
#cal-container {
width: 100%;
height: 100%;
padding: 0;
min-height: 80vh;
display: block;
position: relative;
line-height: 100%;
}
#cal-container,
#cal-container * {
box-sizing: border-box;
}
/* Time slots */
#cal-container .cal-time-slot-container {
display: grid;
grid-template-rows: 30px auto;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: calc(100% + 30px + 10px);
padding: 0;
z-index: 10;
}
#cal-container .cal-time-slot {
border-right: 1px solid #EEE;
background-color: #FAFAFA;
}
#cal-container .cal-time-slot:nth-child(even) {
background-color: #F4F4F4;
}
#cal-container .cal-time-slot:last-child {
border-right: 0;
}
#cal-container .cal-time-slot-hour {
padding: 0 0 0 calc(100% - 1.4rem + 7px);
background-color: #F9F9F9;/* #3D3D3D; */
border-bottom: 1px solid #AAA;
color: #333;
font-size: 1.4rem;
line-height: 30px;
vertical-align: middle;
}
#cal-container .cal-time-slot-hour:nth-child(even) {
background-color: #FCFCFC;/* #464646; */
}
#cal-container .cal-time-slot-hour:first-child {
color: transparent;
border-right: 0;
}
#cal-container .cal-time-slot-hour.cal-last-hour {
padding: 0;
color: transparent;
}
#cal-container .cal-time-slot.cal-last-hour,
#cal-container .cal-time-slot-hour.cal-last-hour {
border-right: 1px solid #AAA;
}
#cal-container .cal-time-slot.cal-first-hour,
#cal-container .cal-time-slot-hour.cal-first-hour {
border-left: 1px solid #AAA;
}
/* Events */
#cal-container .cal-event-container {
display: grid;
/* grid-template-columns: repeat(24, 1fr); */
/* grid-template-rows: repeat(12, auto); */
position: absolute;
top: 40px;
left: 0;
width: 100%;
height: 100%;
padding: 0;
z-index: 100;
}
#cal-container .cal-event {
position: relative;
height: 80px;
margin: 2px 0;
/* padding: 5px; */
/* background-color: #EFEFEF; */
border-radius: 3px;
/* border: 1px solid #CCC; */
border-width: 1px;
border-style: solid;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
/* z-index: 500; */
transition: 50ms ease-in;
}
#cal-container .cal-event:hover {
/* background-color: #FEDDDD; */
}
#cal-container .cal-event > * {
display: none;
margin: 5px;
}
#cal-container .cal-event > .cal-event-name,
#cal-container .cal-event > .cal-event-location,
#cal-container .cal-event > .cal-event-perm-count {
display: block;
}
#cal-container .cal-event > .cal-event-name {
font-weight: bold;
}
#cal-container .cal-event > .cal-event-location {
font-style: italic;
}
#cal-container .cal-event > .cal-event-perm-count {
position: absolute;
bottom: 0;
right: 0;
}
#cal-container .cal-event:not(.cal-event-subscribed) > .cal-event-perm-count.cal-perms-missing {
width: calc(100% - 10px);
right: auto;
margin: 5px;
padding: 5px;
background-color: #FFF;
border: 2px solid #E44;
color: #E44;
font-weight: bold;
border-radius: 3px;
overflow: hidden;
}
#cal-container .cal-event.cal-event-subscribed {
border-width: 3px;
border-color: #000;
}
#cal-container .cal-event.cal-event-subscribed::after {
content: "✔";
position: absolute;
left: 0;
bottom: 0;
width: 16px;
height: 16px;
padding: 1px;
color: #fff;
background-color: #000;
border-top-right-radius: 3px;
}
/* Event details popup */
#cal-container .cal-event-details {
position: absolute;
min-height: 100px;
/* min-width: 40%; */
max-width: 80%;
padding: 20px;
background-color: #333;
color: #FFF;
border-radius: 4px;
box-shadow: 0 15px 50px rgba(0, 0, 0, 0.6);
z-index: 1000;
}
#cal-container .cal-event-details:after {
bottom: 100%;
left: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-bottom-color: #333;
border-width: 20px;
margin-left: -20px;
}
#cal-container .cal-event-details.above-event:after {
top: 100%;
left: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-top-color: #333;
border-width: 20px;
margin-left: -20px;
}
#cal-container .cal-event-details * {
z-index: 1000;
}
#cal-container .cal-event-details .cal-detail-close-button {
width: 35px;
height: 35px;
position: absolute;
top: 10px;
right: 10px;
margin: 0;
padding: 5px;
background: transparent;
border: none;
border-radius: 50%;
font-size: 1.6rem;
color: #BBB;
transition: 100ms ease-out;
}
#cal-container .cal-event-details .cal-detail-close-button:hover {
background-color: #484848;
color: #EFEFEF;
}
#cal-container .cal-event-details a,
#cal-container .cal-event-details a:hover {
color: #FFF;
text-decoration: none;
}
#cal-container .cal-event-details .cal-detail-name > h3 {
margin: 0 0 25px 26px;
padding: 10px;
border-radius: 4px;
color: #FFF;
font-size: 2.5rem;
text-transform: uppercase;
text-align: center;
}
#cal-container .cal-event-details .cal-detail-name > h3::after {
content: "";
display: inline-block;
width: 16px;
height: 16px;
margin: 0 0 0 10px;
vertical-align: middle;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAA90lEQVQoz2WRsS6DURiGn/yaaNqBySpGicFg6iJcAYuuNBaJpJEg6gLcADFIdWR0BZZKS4SBRTe3YFf/Y/j/c3LUe4Zz3vd78+U734uUJ7Ptg7k68NDpoIdyU9V3TzzwRdXt1HCq9pwR510W616oZ8Gwoe6KWFN1ScStogui3sRJ9uxYLd/n6hTuaCy3XHfNWuR6hM+OojBQdSXyJ0cZizwSsMo3kEc+ZCEjxZgxE8j4oBFZhRww8gaff4fEL3UuGfK4uG5L4VLVfvrNCrDJHfd0gSrXQB2AJvu0+Cm8HbXnbGw9seqwWH2z65Wv/8MKcfdVHaZx/wKtOg5kifzQhwAAAABJRU5ErkJggg==);
opacity: 0.6;
}
#cal-container .cal-event-details .cal-detail-name:hover > h3 {
margin-right: 26px;
margin-bottom: 10px;
background-color: #484848;
color: #FFF;
}
#cal-container .cal-event-details .cal-detail-name:hover > h3::after {
content: "Cliquez pour afficher les détails.";
display: block;
width: auto;
height: 15px;
padding: 2px 0 0 0;
font-size: 1.2rem;
background-image: none;
color: #DDD;
}
#cal-container .cal-event-details .cal-detail-name:hover + .cal-detail-close-button {
opacity: 0;
}
#cal-container .cal-event-details table {
margin: 0 auto;
font-size: 1.8rem;
}
#cal-container .cal-event-details td.cal-detail-label {
padding: 0 10px 10px 0;
font-weight: bold;
text-align: right;
}
#cal-container .cal-event-details td.cal-detail-value {
padding: 0 0 10px 10px;
text-align: left;
}
#cal-container .cal-event-details .cal-detail-perm-area {
margin: 10px 0;
padding: 10px;
background-color: #DFDFDF;
color: #333;
text-align: center;
border-radius: 4px;
}
#cal-container .cal-event-details .cal-detail-perm-title {
display: block;
margin: 0 0 10px 0;
}
#cal-container .cal-event-details .cal-detail-perm-area .cal-detail-perm-count {
margin: 0 10px 0 0;
font-size: 2.5rem;
vertical-align: middle;
}
#cal-container .cal-event-details .cal-detail-perm-area .cal-detail-perm-count.cal-perms-missing {
color: #E44;
}
#cal-container .cal-event-details .cal-detail-perm-area .cal-detail-perm-count.cal-perms-full {
color: #393;
}
#cal-container .cal-event-details .cal-detail-perm-area .cal-detail-perm-subscription-switch {
margin: 0 0 0 10px;
padding: 10px;
font-size: 1.8rem;
vertical-align: middle;
}
#cal-container .cal-event-details .cal-detail-perm-area .cal-detail-perm-nb-missing-perms {
margin: 20px 0 0 0;
padding: 5px;
background-color: #FFF;
border-radius: 4px;
text-align: center;
font-size: 1.5rem;
color: #E44;
font-weight: bold;
}
#cal-container .cal-event-details .cal-detail-description {
margin: 20px 0 20px 0;
color: #DDD;
font-size: 1.8rem;
font-style: italic;
text-align: justify;
line-height: 120%;
}
#cal-container .cal-event-details .cal-detail-tag {
display: inline-block;
margin: 5px;
padding: 5px;
border: 1px solid #DDD;
}

View file

@ -1,108 +0,0 @@
/* Tipso Bubble Styles */
.tipso_bubble, .tipso_bubble > .tipso_arrow{
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.tipso_bubble {
position: absolute;
text-align: center;
border-radius: 6px;
z-index: 9999;
}
.tipso_style{
/* cursor: help; */
border-bottom: 1px dotted;
}
.tipso_title {
padding: 3px 0;
border-radius: 6px 6px 0 0;
font-weight: 700;
}
.tipso_content {
word-wrap: break-word;
padding: 0.5em;
}
/* Tipso Bubble size classes - Similar to Foundation's syntax*/
.tipso_bubble.tiny {
font-size: 0.6rem;
}
.tipso_bubble.small {
font-size: 0.8rem;
}
.tipso_bubble.default {
font-size: 1rem;
}
.tipso_bubble.large {
font-size: 1.2rem;
width: 100%;
}
.tipso_bubble.cal_small {
font-size: 1.6rem;
}
/* Tipso Bubble Div */
.tipso_bubble > .tipso_arrow{
position: absolute;
width: 0; height: 0;
border: 8px solid;
pointer-events: none;
}
.tipso_bubble.top > .tipso_arrow {
border-top-color: #000;
border-right-color: transparent;
border-left-color: transparent;
border-bottom-color: transparent;
top: 100%;
left: 50%;
margin-left: -8px;
}
.tipso_bubble.bottom > .tipso_arrow {
border-bottom-color: #000;
border-right-color: transparent;
border-left-color: transparent;
border-top-color: transparent;
bottom: 100%;
left: 50%;
margin-left: -8px;
}
.tipso_bubble.left > .tipso_arrow {
border-left-color: #000;
border-top-color: transparent;
border-bottom-color: transparent;
border-right-color: transparent;
top: 50%;
left: 100%;
margin-top: -8px;
}
.tipso_bubble.right > .tipso_arrow {
border-right-color: #000;
border-top-color: transparent;
border-bottom-color: transparent;
border-left-color: transparent;
top: 50%;
right: 100%;
margin-top: -8px;
}
.tipso_bubble .top_right_corner,
.tipso_bubble.top_right_corner {
border-bottom-left-radius: 0;
}
.tipso_bubble .bottom_right_corner,
.tipso_bubble.bottom_right_corner {
border-top-left-radius: 0;
}
.tipso_bubble .top_left_corner,
.tipso_bubble.top_left_corner {
border-bottom-right-radius: 0;
}
.tipso_bubble .bottom_left_corner,
.tipso_bubble.bottom_left_corner {
border-top-right-radius: 0;
}

File diff suppressed because it is too large Load diff

View file

@ -1,84 +0,0 @@
// Interval graph coloring algorithm, by Twal
class IntervalColoration {
constructor (intervals) {
this.intervals = intervals;
this.n = this.intervals.length;
this.computeInterferenceGraph();
this.computePEO();
this.computeColoration();
}
computeInterferenceGraph() {
this.adj = new Array(this.n);
for (let i = 0; i < this.n; ++i) {
this.adj[i] = [];
}
for (let i = 0; i < this.n; ++i) {
for (let j = 0; j < i; ++j) {
let inti = this.intervals[i];
let intj = this.intervals[j];
if (inti[0] < intj[1] && intj[0] < inti[1]) {
this.adj[i].push(j);
this.adj[j].push(i);
}
}
}
}
//Perfect elimination order using Maximum Cardinality Search
//Runs in O(n^2), could be optimized in O(n log n)
computePEO() {
let marked = new Array(this.n);
let nbMarkedNeighbor = new Array(this.n);
this.perm = new Array(this.n);
for (let i = 0; i < this.n; ++i) {
marked[i] = false;
nbMarkedNeighbor[i] = 0;
}
for (let k = this.n-1; k >= 0; --k) {
let maxi = -1;
for (let i = 0; i < this.n; ++i) {
if (!marked[i] && (maxi == -1 || nbMarkedNeighbor[i] >= nbMarkedNeighbor[maxi])) {
maxi = i;
}
}
for (let i = 0; i < this.adj[maxi].length; ++i) {
nbMarkedNeighbor[this.adj[maxi][i]] += 1;
}
this.perm[maxi] = k;
marked[maxi] = true;
}
// console.log(this.perm);
}
computeColoration() {
this.colors = new Array(this.n);
let isColorUsed = new Array(this.n);
for (let i = 0; i < this.n; ++i) {
this.colors[i] = -1;
isColorUsed[i] = false;
}
for (let i = 0; i < this.n; ++i) {
let ind = this.perm[i];
for (let j = 0; j < this.adj[ind].length; ++j) {
let neigh = this.adj[ind][j];
if (this.colors[neigh] >= 0) {
isColorUsed[this.colors[neigh]] = true;
}
}
for (let j = 0; j < this.n; ++j) {
if (!isColorUsed[j]) {
this.colors[ind] = j;
break;
}
}
for (let j = 0; j < this.adj[ind].length; ++j) {
let neigh = this.adj[ind][j];
if (this.colors[neigh] >= 0) {
isColorUsed[this.colors[neigh]] = false;
}
}
}
}
}

File diff suppressed because one or more lines are too long

View file

@ -1,116 +0,0 @@
{% extends "shared/fluid.html" %}
{% load i18n staticfiles event_tags %}
{% block extra_css %}
{{ block.super }}
<link rel="stylesheet" href="{% static "css/tipso.css" %}">
<link rel="stylesheet" href="{% static "css/calendar.css" %}">
<style>
#cal-toggle-unsubscribed-events-display {
display: block;
position: fixed;
bottom: 30px;
left: 30px;
border-bottom: 2px solid rgb(150, 50, 50);
font-size: 1.6rem;
font-weight: bold;
box-shadow: 0 3px 8px rgba(0, 0, 0, 0.4),
0 1px 1px rgba(150, 50, 50, 0.7);
text-shadow: 0 0 7px rgb(150, 50, 50);
z-index: 5000;
}
</style>
{% endblock %}
{% block extra_js %}
{{ block.super }}
<script type="text/javascript" src="{% static "js/tipso.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/interval_coloration.js" %}"></script>
<script type="text/javascript" src="{% static "js/calendar.js" %}"></script>
<script type="text/javascript">
$(document).ready(() => {
let calendar = new Calendar({
startDate: new Date(2018, 10, 30, 8),
endDate: new Date(2018, 11, 2, 6),
eventDetailURLFormat: "https://cof.ens.fr/poulpe/event/activity/999999",
subscriptionURLFormat: "{% url "event:enrol_activity" 999999 %}?ajax=json",
csrfToken: $(".planning [name=csrfmiddlewaretoken]").val(),
groupEventsByLocation: true
});
// TODO: move this elsewhere
// Button to switch between:
// - displaying all events (default);
// - only displaying events for which the current user is enroled.
// Create the button
let toggleUnsubscribedEventDisplayButton = $("<button>")
.attr("type", "button")
.attr("id", "cal-toggle-unsubscribed-events-display")
.addClass("btn btn-primary")
.appendTo(calendar.containerNode);
// Set/update its label
function updateToggleButtonLabel () {
if (calendar.onlyDisplaySubscribedEvents) {
toggleUnsubscribedEventDisplayButton.html("Afficher toutes les activités");
}
else {
toggleUnsubscribedEventDisplayButton.html("Afficher seulement mes permanences");
}
}
updateToggleButtonLabel();
// Switch between display modes on click
toggleUnsubscribedEventDisplayButton.on("click", () => {
calendar.toggleEventsNotSubscribedByUser();
updateToggleButtonLabel();
});
// DEBUG: js console helpers, to be removed
console.log(calendar);
window["cal"] = calendar;
});
</script>
{% endblock %}
{% block content %}
<div class="planning">
{% csrf_token %}
{% regroup activities by beginning|date:"Y-m-d" as days_list %}
<div class="content fluid" id="cal-container">
{% for day in days_list %}
{% for activity in day.list %}
<div class="cal-event">
<span class="cal-event-id">{{ activity.id }}</span>
<span class="cal-event-name">{{ activity|get_herited:'title' }}</span>
<span class="cal-event-start-date">{{ activity.beginning | date:"j/m/Y H:i" }}</span>
<span class="cal-event-end-date">{{ activity.end | date:"j/m/Y H:i" }}</span>
{% with activity|get_herited:'places' as places %}
<span class="cal-event-location">{{ places.all | join:", " }}</span>
{% endwith %}
<span class="cal-event-description">{{ activity.description }}</span>
<span class="cal-event-url">{% url "event:activity" activity.id %}</span>
{% if activity|get_herited:'has_perm' %}
<span class="cal-event-has-perms">1</span>
<span class="cal-event-min-nb-perms">{{ activity|get_herited:'min_perm' }}</span>
<span class="cal-event-max-nb-perms">{{ activity|get_herited:'max_perm' }}</span>
<span class="cal-event-nb-perms">{{ activity.staff.count }}</span>
<span class="cal-event-subscribed">{% is_enrolled activity request.user %}</span>
{% endif %}
{% with activity|get_herited:'tags' as tags %}
{% for tag in tags.all %}
<span class="cal-event-tag">{{ tag.name }}</span>
{% endfor %}
{% endwith %}
</div>
{% endfor %}
{% endfor %}
</div>
{% endblock %}

View file

@ -29,24 +29,8 @@
<span class="glyphicon glyphicon-tree-deciduous"></span>
lieux spécifiques
</a>
<a href="{% url "event:calendar" event.slug %}" class="module">
Calendrier
</a>
{% if staffuser %}
<a href="{% url "event:event" event.slug %}" class="module">
Toutes les activités
</a>
{% else %}
<a href="{% url "event:event-staff" event.slug user.username %}" class="module">
Mes perms
</a>
{% endif %}
</div>
{% if staffuser %}
<h2>Perms de {{ staffuser.first_name }} {{ staffuser.last_name }}</h2>
{% else %}
<h2>Planning</h2>
{% endif %}
<div class="planning">
{% regroup activities by beginning|date:"Y-m-d" as days_list %}

View file

@ -14,8 +14,3 @@ def enrol_btn(activity, user):
"enrolled": activity.staff.filter(id=user.id).exists(),
"activity": activity,
}
@register.simple_tag
def is_enrolled(activity, user):
user_is_enrolled = activity.staff.filter(id=user.id).exists()
return "1" if user_is_enrolled else "0"

View file

@ -1,12 +1,10 @@
from django.conf.urls import url
from event.views import Index, EventView, EventViewStaff, ActivityView, EnrolActivityView, EventCalendar
from event.views import Index, EventView, ActivityView, EnrolActivityView
app_name = 'event'
urlpatterns = [
# url(r'^$', Index.as_view(), name='index'),
url(r'^(?P<slug>[-\w]+)/$', EventView.as_view(), name='event'),
url(r'^(?P<slug>[-\w]+)/s/(?P<username>[-\w]+)/$', EventViewStaff.as_view(), name='event-staff'),
url(r'^(?P<slug>[-\w]+)/calendar/$', EventCalendar.as_view(), name='calendar'),
url(r'^activity/(?P<pk>[0-9]+)/$', ActivityView.as_view(),
name='activity'),
url(r'^activity/(?P<pk>[0-9]+)/enrol/$',

View file

@ -1,6 +1,5 @@
from django.views.generic import TemplateView, DetailView, View
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth import get_user_model
from django.shortcuts import get_object_or_404, render
from django.http import JsonResponse, HttpResponseRedirect
from django.urls import reverse
@ -8,26 +7,11 @@ from django.urls import reverse
from .models import Event, Activity
from equipment.models import EquipmentAttribution
User = get_user_model()
class Index(TemplateView):
template_name = "event/index.html"
class EventCalendar(LoginRequiredMixin, DetailView):
model = Event
template_name = 'event/calendar.html'
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
event = self.object
context['activities'] = (Activity.objects.filter(event=event)
.order_by('beginning').prefetch_related(
'tags', 'places', 'staff', 'parent'))
return context
class EventView(LoginRequiredMixin, DetailView):
model = Event
template_name = 'event/event.html'
@ -41,24 +25,6 @@ class EventView(LoginRequiredMixin, DetailView):
return context
class EventViewStaff(LoginRequiredMixin, DetailView):
model = Event
template_name = 'event/event.html'
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
user = User.objects.get(username=self.kwargs['username'])
event = self.object
context['staffuser'] = user
context['activities'] = (user.in_perm_activities
.filter(event=event)
.order_by('beginning')
.prefetch_related(
'tags', 'places', 'staff', 'parent')
)
return context
class ActivityView(LoginRequiredMixin, DetailView):
model = Activity
template_name = 'event/activity.html'
@ -86,12 +52,6 @@ class EnrolActivityView(LoginRequiredMixin, View):
else:
success = False
if "ajax" in request.GET:
if request.GET["ajax"] == "json":
enrols = activity.staff
return JsonResponse({
"enrolled": enrols.filter(id=request.user.id).exists(),
"number": enrols.count(),
})
return render(request, "event/activity_summary.html",
{"activity": activity})
return HttpResponseRedirect(reverse("event:activity", kwargs={"pk":pk}))

View file

@ -186,12 +186,11 @@ SITE_ID = 1
CAS_SERVER_URL = "https://cas.eleves.ens.fr/" # SPI CAS
CAS_VERIFY_URL = "https://cas.eleves.ens.fr/"
CAS_VERSION = "2"
CAS_IGNORE_REFERER = True
CAS_LOGIN_MSG = None
CAS_REDIRECT_URL = reverse_lazy('shared:home')
CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
CAS_FORCE_CHANGE_USERNAME_CASE = "lower"
CAS_VERSION = 'CAS_2_SAML_1_0'
LOGIN_URL = reverse_lazy('account_login')
LOGOUT_URL = reverse_lazy('account_logout')
@ -215,6 +214,4 @@ SOCIALACCOUNT_PROVIDERS = {
ACCOUNT_ADAPTER = 'shared.allauth_adapter.AccountAdapter'
#SOCIALACCOUNT_ADAPTER='allauth_ens.adapter.LongTermClipperAccountAdapter'
SOCIALACCOUNT_ADAPTER= 'shared.allauth_adapter.SocialAccountAdapter'
SOCIALACCOUNT_ADAPTER = 'shared.allauth_adapter.SocialAccountAdapter'

View file

@ -3,12 +3,17 @@ asgiref==1.1.1
django-bootstrap3==10.0.1
channels==1.1.5
Django==2.1
django-allauth==0.36.0
django-allauth-cas==1.0.0b2
django-tables2==2.0.0a2
django-filter==2.0.0
git+https://git.eleves.ens.fr/klub-dev-ens/django-allauth-ens.git@1.1.3
#git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@6e77b31e0dfed7659776d
git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@30a072b7db1fc2d4652284227a3e7e876b14c915
django-bootstrap-form==3.4
drf-nested-routers==0.90.0
django-notifications==0.1.dev0
django-contrib-comments==1.8.0
django-taggit==0.22.2
Pillow==5.0.0
python-cas==1.2.0

View file

@ -1 +0,0 @@
global.min.css

View file

@ -0,0 +1,763 @@
@charset "UTF-8";
/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE
FICHIER .SCSS */
/* LEGACY COLORS*/
/* COLORS */
/* Header */
/* Général */
/* Le reste */
/* Titres */
/* FONTS */
/* line 2, ../sass/_messages.scss */
.message-info {
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
/* line 7, ../sass/_messages.scss */
.message-success {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
/* line 12, ../sass/_messages.scss */
.message-warning {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
/* line 17, ../sass/_messages.scss */
.message-error {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
/* line 22, ../sass/_messages.scss */
.alert {
margin-bottom: 0;
}
/* line 2, ../sass/_header.scss */
.strong-banner {
padding-top: 20px;
padding-bottom: 10px;
background-color: #375362;
color: white;
}
/* line 10, ../sass/_header.scss */
.navbar-inverse {
background-color: #375362;
background-color: transparent;
border-style: none;
}
/* line 15, ../sass/_header.scss */
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:focus, .navbar-inverse .navbar-nav > .open > a:hover {
color: #fff;
background-color: #5D8CA6;
}
/* line 24, ../sass/_header.scss */
.navbar-collapse {
border-top: 0px solid transparent;
padding: 0px;
/* only < 768px*/
background-color: #5D8CA6;
padding-left: 25px;
margin-left: -15px;
margin-right: -15px;
}
@media (min-width: 768px) {
/* line 24, ../sass/_header.scss */
.navbar-collapse {
background-color: transparent;
padding-left: 0px;
margin-left: 0px;
margin-right: 0px;
}
}
/* line 43, ../sass/_header.scss */
.navbar-nav {
width: 100%;
}
@media (min-width: 768px) {
/* line 43, ../sass/_header.scss */
.navbar-nav {
float: right;
width: auto;
}
}
/* line 51, ../sass/_header.scss */
.navbar-inverse {
/* BRAND */
/* ICONE */
/* LINKS */
}
/* line 54, ../sass/_header.scss */
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
color: white;
font-family: "Lily Script One", cursive;
font-size: xx-large;
border-bottom: 5px solid #FF5C79;
}
/* line 65, ../sass/_header.scss */
.navbar-inverse .navbar-toggle, .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: #FFB363;
border-color: #FFB363;
}
/* line 71, ../sass/_header.scss */
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF5EB;
}
/* line 78, ../sass/_header.scss */
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
font-family: "Work Sans", cursive;
font-size: large;
color: #FFB363;
background: transparent;
}
@media (min-width: 768px) {
/* line 78, ../sass/_header.scss */
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
color: #FFF5EB;
}
}
/* line 108, ../sass/_forms.scss */
.btn-primary {
/**
* This mixins allows defining color-related properties of buttons.
*
* It sets the following properties:
* color: $color, except for disabled-like buttons.
* border-color: $border.
* background-color: Depending on button state:
* - Default, disabled:
* $background-base
* - Hovered, focused, actived, responsible of an opened dropdown:
* (one is sufficent)
* $background-special
*
* ## Bootstrap compatibility
*
* This mixin can be used to replace colors behaviors of Bootstrap buttons.
* Indeed, this mixin aims to replace each definition done by the
* 'button-variant' Bootstrap mixin.
*
*/
color: white;
background-color: #FF6969;
border-color: #FF6969;
/**
* This mixin applies content if the button is in at least one of the
* following states:
*
* - hovered,
* - focused,
* - actived,
* - is responsible of an opened dropdown.
*
* Where possible, state is checked from class attribute and
* :pseudo-classes.
*
* ## Bootstrap compatibility
*
* If content defines 'color', 'background-color' and 'border', it is safe
* to use this mixin with Bootstrap buttons as it will overrides all
* Bootstrap color defaults of the previous cases.
* To be precise, this covers all special important-like cases of the
* Bootstrap mixin 'button-variant' (except the 'disabled' case).
*
*/
}
/* line 10, ../sass/_forms.scss */
.btn-primary:focus, .btn-primary.focus, .btn-primary:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 3, ../sass/_forms.scss */
.btn-primary:active, .btn-primary.active {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.btn-primary:active:focus, .btn-primary:active.focus, .btn-primary:active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 26, ../sass/_forms.scss */
.open > .btn-primary.dropdown-toggle {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:hover {
background-color: #FF6969;
border-color: #FF6969;
}
/* line 102, ../sass/_forms.scss */
.btn-primary .badge {
color: #FF6969;
background-color: white;
}
/* line 113, ../sass/_forms.scss */
form#filter_form .form-group {
padding-right: 20px;
}
/* line 117, ../sass/_forms.scss */
form#filter_form ul.form-control {
background-color: transparent;
border: none;
box-shadow: none;
}
/* line 2, ../sass/_tree.scss */
.tree {
font-size: large;
}
/* line 4, ../sass/_tree.scss */
.tree ul, .tree li {
position: relative;
}
/* line 8, ../sass/_tree.scss */
.tree ul {
list-style: none;
padding-left: 32px;
}
/* line 13, ../sass/_tree.scss */
.tree li::before,
.tree li::after {
content: "";
position: absolute;
left: -12px;
}
/* line 19, ../sass/_tree.scss */
.tree li::before {
border-top: 3px solid #FFC282;
top: 9px;
width: 8px;
height: 0;
}
/* line 25, ../sass/_tree.scss */
.tree li::after {
border-left: 3px solid #FFC282;
height: 100%;
width: 0px;
top: 2px;
}
/* line 31, ../sass/_tree.scss */
.tree ul > li:last-child::after {
height: 8px;
}
/* line 4, ../sass/_filters.scss */
#filter_form .form-group .col-md-3, #filter_form .form-group .col-md-9 {
float: none;
}
/* line 7, ../sass/_filters.scss */
#filter_form .form-group ul.form-control {
padding-left: 15px;
list-style: none;
height: auto;
}
/* line 12, ../sass/_filters.scss */
#filter_form .form-group ul.form-control a.selected {
text-decoration: underline;
color: #c40000;
}
/* line 18, ../sass/_dashed-shadows.scss */
.dashed-shadow {
position: relative;
top: 8px;
left: 8px;
display: inline-block;
color: #ba9186;
}
/* line 25, ../sass/_dashed-shadows.scss */
.dashed-shadow:before {
content: " ";
display: block;
position: absolute;
top: -8px;
left: -8px;
bottom: -2px;
right: -2px;
z-index: 1;
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjEuMCIgeDI9IjEuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxMi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iMTIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIzNy41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjM3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PHN0b3Agb2Zmc2V0PSI2Mi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iNjIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI4Ny41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9Ijg3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
background-size: 100%;
background-image: -moz-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-image: -webkit-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-image: linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-size: 6px 6px;
}
/* line 54, ../sass/_dashed-shadows.scss */
.dashed-shadow:hover:before {
animation: dash-animation 30s infinite linear;
}
/* line 58, ../sass/_dashed-shadows.scss */
.dashed-shadow:after {
z-index: 2;
content: attr(data-text);
position: absolute;
left: -8px;
top: -8px;
color: #b85b3f;
text-shadow: 3px 3px #e8e3c7;
}
/* MISE EN FORME GÉNÉRALE */
/* line 12, ../sass/global.scss */
html {
height: 100%;
background-color: #FFFBEF;
}
/* line 17, ../sass/global.scss */
body {
font-family: "Saira Semi Condensed", sans-serif;
font-size: medium;
}
/* line 22, ../sass/global.scss */
#principal {
background-color: #FFFBEF;
}
/*MAIN*/
/* line 27, ../sass/global.scss */
main {
background-color: #FFFBEF;
border-width: 2px;
border-color: #375362;
border-style: none;
border-collapse: collapse;
display: table-cell;
margin-top: 0px;
padding: 0px;
}
/* line 37, ../sass/global.scss */
main .fuid, main h1, main h2, main h3 {
margin-left: -15px;
margin-right: -15px;
margin-top: 0px;
margin-bottom: 0px;
}
/* line 43, ../sass/global.scss */
main h1, main h2, main h3 {
margin-top: -2px;
margin-bottom: -2px;
margin-left: -17px;
margin-right: -17px;
color: white;
padding-left: 15px;
padding-right: 15px;
}
/* line 52, ../sass/global.scss */
main h1 {
font-family: "Capriola", sans-serif;
font-weight: 600;
padding-bottom: 10px;
padding-top: 15px;
background-color: #4F778C;
}
/* line 59, ../sass/global.scss */
main h1.activity {
background-color: #4FADB8;
}
/* line 62, ../sass/global.scss */
main h1.event {
background-color: #3488A6;
}
/* line 65, ../sass/global.scss */
main h1.todo {
background-color: #F19F5D;
}
/* line 68, ../sass/global.scss */
main h1.equipment {
background-color: #E75571;
}
/* line 71, ../sass/global.scss */
main h1.staff {
background-color: #3BAD89;
}
/* line 75, ../sass/global.scss */
main h2, main h3 {
border-bottom: 2px solid #5D8CA6;
padding-bottom: 5px;
padding-top: 10px;
font-family: "Capriola", sans-serif;
font-weight: 600;
font-size: x-large;
background-color: #BDD2DE;
}
/* line 84, ../sass/global.scss */
main h2.activity, main h3.activity {
background-color: #5ED1DC;
border-color: #4FADB8;
}
/* line 88, ../sass/global.scss */
main h2.event, main h3.event {
background-color: #3999BA;
border-color: #3488A6;
}
/* line 92, ../sass/global.scss */
main h2.todo, main h3.todo {
background-color: #FF9C4D;
border-color: #F19F5D;
}
/* line 96, ../sass/global.scss */
main h2.equipment, main h3.equipment {
background-color: #FF5C79;
border-color: #E75571;
}
/* line 100, ../sass/global.scss */
main h2.staff, main h3.staff {
background-color: #42C2A2;
border-color: #3BAD89;
}
/* line 105, ../sass/global.scss */
main h3 {
background-color: #F0FAFF;
color: #4F778C;
}
/* line 108, ../sass/global.scss */
main h3.activity {
background-color: #F0FAFF;
color: #5ED1DC;
}
/* line 112, ../sass/global.scss */
main h3.event {
background-color: #F0FAFF;
color: #3999BA;
}
/* line 116, ../sass/global.scss */
main h3.todo {
background-color: #F0FAFF;
color: #FF9C4D;
}
/* line 120, ../sass/global.scss */
main h3.equipment {
background-color: #F0FAFF;
color: #FF5C79;
}
/* line 124, ../sass/global.scss */
main h3.staff {
background-color: #F0FAFF;
color: #42C2A2;
}
/* line 129, ../sass/global.scss */
main a {
color: #FF6969;
}
/* line 132, ../sass/global.scss */
main a:hover, main a:active, main a:focus {
color: #FF6969;
}
/* line 139, ../sass/global.scss */
main .text {
padding: 15px;
}
/*ASIDE*/
/* line 145, ../sass/global.scss */
aside {
background-color: #375362;
color: white;
margin-top: 0px;
padding: 0px !important;
}
/* line 151, ../sass/global.scss */
aside a {
color: #FF9191;
}
/* line 154, ../sass/global.scss */
aside a:hover, aside a:active, aside a:focus {
color: #FF9191;
}
/* line 161, ../sass/global.scss */
aside code {
color: #375362;
background-color: #BDD2DE;
}
/* line 166, ../sass/global.scss */
aside .heading {
padding: 8px 15px;
font-size: 32px;
line-height: 1.3;
text-align: center;
}
/* line 172, ../sass/global.scss */
aside .heading.inverted {
background-color: #FFF5EB;
color: black;
}
/* line 177, ../sass/global.scss */
aside .heading.small {
font-size: 25px;
}
/* line 180, ../sass/global.scss */
aside .heading.small .sub {
font-size: 0.7em;
font-weight: normal;
}
/* line 186, ../sass/global.scss */
aside .heading .sub {
font-size: 0.7em;
font-weight: normal;
}
/* line 191, ../sass/global.scss */
aside .heading.separator {
border-bottom-color: #FF9191;
border-bottom-style: solid;
}
/* line 197, ../sass/global.scss */
aside .text {
padding: 15px;
}
/* line 200, ../sass/global.scss */
aside .text.inverted {
background-color: #FFF5EB;
color: black;
}
@media (min-width: 768px) {
/* line 209, ../sass/global.scss */
main {
margin-top: 20px;
border-style: dashed;
}
/* line 213, ../sass/global.scss */
aside {
margin-top: 20px;
}
}
/* line 218, ../sass/global.scss */
hr {
border-top: 1px solid #FFB363;
}
/* line 223, ../sass/global.scss */
span.vsep {
padding-left: 5px;
padding-right: 5px;
}
/* line 228, ../sass/global.scss */
div.tag-list {
margin-top: 20px;
}
/* line 232, ../sass/global.scss */
code {
font-size: small;
}
/* line 236, ../sass/global.scss */
.module-list {
margin-top: 10px;
margin-bottom: 10px;
display: flex;
align-items: stretch;
flex-wrap: wrap;
}
/* line 244, ../sass/global.scss */
a.module {
padding: 20px 40px;
margin: 5px;
border-bottom-style: solid;
font-size: large;
display: block;
border-bottom-color: #375362;
background-color: #BDD2DE;
color: #375362;
}
/* line 256, ../sass/global.scss */
a.module.activity {
border-bottom-color: #4FADB8;
background-color: #CAE4E7;
color: #4FADB8;
}
/* line 262, ../sass/global.scss */
a.module.event {
border-bottom-color: #3488A6;
background-color: #AAD5E2;
color: #3488A6;
}
/* line 268, ../sass/global.scss */
a.module.todo {
border-bottom-color: #F19F5D;
background-color: #FFDEBC;
color: #F19F5D;
}
/* line 274, ../sass/global.scss */
a.module.equipment {
border-bottom-color: #E75571;
background-color: #FECAD6;
color: #E75571;
}
/* line 280, ../sass/global.scss */
a.module.staff {
border-bottom-color: #3BAD89;
background-color: #A9E1D7;
color: #3BAD89;
}
/* line 286, ../sass/global.scss */
a.module:hover, a.module:active, a.module:focus {
text-decoration: none;
color: #F0FAFF;
background-color: #375362;
}
/* line 293, ../sass/global.scss */
a.module:hover.activity, a.module:active.activity, a.module:focus.activity {
background-color: #5ED1DC;
}
/* line 296, ../sass/global.scss */
a.module:hover.event, a.module:active.event, a.module:focus.event {
background-color: #3999BA;
}
/* line 299, ../sass/global.scss */
a.module:hover.equipment, a.module:active.equipment, a.module:focus.equipment {
background-color: #FF5C79;
}
/* line 302, ../sass/global.scss */
a.module:hover.todo, a.module:active.todo, a.module:focus.todo {
background-color: #FF9C4D;
}
/* line 305, ../sass/global.scss */
a.module:hover.staff, a.module:active.staff, a.module:focus.staff {
background-color: #42C2A2;
}
/* line 311, ../sass/global.scss */
.collapsible {
background-color: #777;
color: white;
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px;
}
/* line 322, ../sass/global.scss */
.collapsible:after {
content: '\002B';
color: white;
font-weight: bold;
float: right;
margin-left: 5px;
}
/* line 330, ../sass/global.scss */
.collapsible:hover {
background-color: #555;
}
/* line 334, ../sass/global.scss */
.collapsible h3 {
margin-top: 0px;
margin-bottom: 0px;
display: inline-block;
}
/* line 341, ../sass/global.scss */
.active {
background-color: #555;
}
/* line 344, ../sass/global.scss */
.active:after {
content: "\2212";
}
/* line 348, ../sass/global.scss */
.content {
padding: 8px 18px;
display: none;
background-color: #f1f1f1;
}
/* line 353, ../sass/global.scss */
.content.fluid {
padding: 0px 0px;
background-color: transparent;
}
/* line 358, ../sass/global.scss */
.content h4 {
font-size: x-large;
font-weight: bold;
display: inline-block;
margin: 0px 0px;
}
/* line 367, ../sass/global.scss */
.planning .activity {
padding: 8px 18px;
padding-top: 8px;
padding-bottom: 12px;
border-left: none;
border-right: 6px solid #FF9191;
}
/* line 375, ../sass/global.scss */
.planning .activity.inverted {
border-left: 6px solid #FF9191;
border-right: none;
}
/* line 380, ../sass/global.scss */
.planning .activity .activity-title {
font-size: large;
}
/* line 387, ../sass/global.scss */
.glyphicon.yes {
color: #55C487 !important;
}
/* line 390, ../sass/global.scss */
.glyphicon.no {
color: #E36268 !important;
}
/* line 393, ../sass/global.scss */
.glyphicon.dunno {
color: #5599C4 !important;
}
/* line 398, ../sass/global.scss */
.sending-request {
position: relative;
}
/* line 401, ../sass/global.scss */
.sending-request:after {
content: "Chargement...";
position: absolute;
width: 100%;
height: 100%;
background: #fff;
opacity: 0.8;
color: #777;
text-align: center;
box-sizing: border-box;
z-index: 5;
top: 0;
left: 0;
padding: 8%;
}

View file

@ -6,7 +6,7 @@
@import '_forms';
@import '_tree';
@import '_filters';
//@import '_dashed-shadows';
//i@import '_dashed-shadows';
/* MISE EN FORME GÉNÉRALE */
html {

View file

@ -1,36 +0,0 @@
/* Backbone models for the API */
"use strict";
var GE_API = new Object();
GE_API.rootUrl = "/api/";
GE_API.Event = Backbone.Model.extend({
rootUrl: GE_API.rootUrl + "event/",
});
GE_API.Events = Backbone.Collection.extend({
model: GE_API.Event,
url: GE_API.rootUrl + "event/"
});
GE_API.Place = Backbone.Model.extend({
rootUrl: function() {
if (this.get("event")) {
return GE_API.rootUrl + "event/" + this.get("event").id + "/place/";
} else {
return GE_API.rootUrl + "place/";
}
}
});
GE_API.Places = Backbone.Collection.extend({
url: function() {
if (this.event) {
return GE_API.rootUrl + "event/" + this.event + "/place/";
} else {
return GE_API.rootUrl + "place/";
}
}
});
GE_API.Places = Backbone.Collection.

File diff suppressed because it is too large Load diff

View file

@ -1,763 +0,0 @@
@charset "UTF-8";
/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE
FICHIER .SCSS */
/* LEGACY COLORS*/
/* COLORS */
/* Header */
/* Général */
/* Le reste */
/* Titres */
/* FONTS */
/* line 2, ../sass/_messages.scss */
.message-info {
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
/* line 7, ../sass/_messages.scss */
.message-success {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
/* line 12, ../sass/_messages.scss */
.message-warning {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
/* line 17, ../sass/_messages.scss */
.message-error {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
/* line 22, ../sass/_messages.scss */
.alert {
margin-bottom: 0;
}
/* line 2, ../sass/_header.scss */
.strong-banner {
padding-top: 20px;
padding-bottom: 10px;
background-color: #375362;
color: white;
}
/* line 10, ../sass/_header.scss */
.navbar-inverse {
background-color: #375362;
background-color: transparent;
border-style: none;
}
/* line 15, ../sass/_header.scss */
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:focus, .navbar-inverse .navbar-nav > .open > a:hover {
color: #fff;
background-color: #5D8CA6;
}
/* line 24, ../sass/_header.scss */
.navbar-collapse {
border-top: 0px solid transparent;
padding: 0px;
/* only < 768px*/
background-color: #5D8CA6;
padding-left: 25px;
margin-left: -15px;
margin-right: -15px;
}
@media (min-width: 768px) {
/* line 24, ../sass/_header.scss */
.navbar-collapse {
background-color: transparent;
padding-left: 0px;
margin-left: 0px;
margin-right: 0px;
}
}
/* line 43, ../sass/_header.scss */
.navbar-nav {
width: 100%;
}
@media (min-width: 768px) {
/* line 43, ../sass/_header.scss */
.navbar-nav {
float: right;
width: auto;
}
}
/* line 51, ../sass/_header.scss */
.navbar-inverse {
/* BRAND */
/* ICONE */
/* LINKS */
}
/* line 54, ../sass/_header.scss */
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus {
color: white;
font-family: "Lily Script One", cursive;
font-size: xx-large;
border-bottom: 5px solid #FF5C79;
}
/* line 65, ../sass/_header.scss */
.navbar-inverse .navbar-toggle, .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: #FFB363;
border-color: #FFB363;
}
/* line 71, ../sass/_header.scss */
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF5EB;
}
/* line 78, ../sass/_header.scss */
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
font-family: "Work Sans", cursive;
font-size: large;
color: #FFB363;
background: transparent;
}
@media (min-width: 768px) {
/* line 78, ../sass/_header.scss */
.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
color: #FFF5EB;
}
}
/* line 108, ../sass/_forms.scss */
.btn-primary {
/**
* This mixins allows defining color-related properties of buttons.
*
* It sets the following properties:
* color: $color, except for disabled-like buttons.
* border-color: $border.
* background-color: Depending on button state:
* - Default, disabled:
* $background-base
* - Hovered, focused, actived, responsible of an opened dropdown:
* (one is sufficent)
* $background-special
*
* ## Bootstrap compatibility
*
* This mixin can be used to replace colors behaviors of Bootstrap buttons.
* Indeed, this mixin aims to replace each definition done by the
* 'button-variant' Bootstrap mixin.
*
*/
color: white;
background-color: #FF6969;
border-color: #FF6969;
/**
* This mixin applies content if the button is in at least one of the
* following states:
*
* - hovered,
* - focused,
* - actived,
* - is responsible of an opened dropdown.
*
* Where possible, state is checked from class attribute and
* :pseudo-classes.
*
* ## Bootstrap compatibility
*
* If content defines 'color', 'background-color' and 'border', it is safe
* to use this mixin with Bootstrap buttons as it will overrides all
* Bootstrap color defaults of the previous cases.
* To be precise, this covers all special important-like cases of the
* Bootstrap mixin 'button-variant' (except the 'disabled' case).
*
*/
}
/* line 10, ../sass/_forms.scss */
.btn-primary:focus, .btn-primary.focus, .btn-primary:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 3, ../sass/_forms.scss */
.btn-primary:active, .btn-primary.active {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.btn-primary:active:focus, .btn-primary:active.focus, .btn-primary:active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 26, ../sass/_forms.scss */
.open > .btn-primary.dropdown-toggle {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:hover {
color: white;
background-color: #FF9191;
border-color: #FF6969;
}
/* line 10, ../sass/_forms.scss */
.btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:hover {
background-color: #FF6969;
border-color: #FF6969;
}
/* line 102, ../sass/_forms.scss */
.btn-primary .badge {
color: #FF6969;
background-color: white;
}
/* line 113, ../sass/_forms.scss */
form#filter_form .form-group {
padding-right: 20px;
}
/* line 117, ../sass/_forms.scss */
form#filter_form ul.form-control {
background-color: transparent;
border: none;
box-shadow: none;
}
/* line 2, ../sass/_tree.scss */
.tree {
font-size: large;
}
/* line 4, ../sass/_tree.scss */
.tree ul, .tree li {
position: relative;
}
/* line 8, ../sass/_tree.scss */
.tree ul {
list-style: none;
padding-left: 32px;
}
/* line 13, ../sass/_tree.scss */
.tree li::before,
.tree li::after {
content: "";
position: absolute;
left: -12px;
}
/* line 19, ../sass/_tree.scss */
.tree li::before {
border-top: 3px solid #FFC282;
top: 9px;
width: 8px;
height: 0;
}
/* line 25, ../sass/_tree.scss */
.tree li::after {
border-left: 3px solid #FFC282;
height: 100%;
width: 0px;
top: 2px;
}
/* line 31, ../sass/_tree.scss */
.tree ul > li:last-child::after {
height: 8px;
}
/* line 4, ../sass/_filters.scss */
#filter_form .form-group .col-md-3, #filter_form .form-group .col-md-9 {
float: none;
}
/* line 7, ../sass/_filters.scss */
#filter_form .form-group ul.form-control {
padding-left: 15px;
list-style: none;
height: auto;
}
/* line 12, ../sass/_filters.scss */
#filter_form .form-group ul.form-control a.selected {
text-decoration: underline;
color: #c40000;
}
/* line 18, ../sass/_dashed-shadows.scss */
.dashed-shadow {
position: relative;
top: 8px;
left: 8px;
display: inline-block;
color: #ba9186;
}
/* line 25, ../sass/_dashed-shadows.scss */
.dashed-shadow:before {
content: " ";
display: block;
position: absolute;
top: -8px;
left: -8px;
bottom: -2px;
right: -2px;
z-index: 1;
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjEuMCIgeDI9IjEuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxMi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iMTIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIzNy41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjM3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PHN0b3Agb2Zmc2V0PSI2Mi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iNjIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI4Ny41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9Ijg3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
background-size: 100%;
background-image: -moz-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-image: -webkit-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-image: linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%);
background-size: 6px 6px;
}
/* line 54, ../sass/_dashed-shadows.scss */
.dashed-shadow:hover:before {
animation: dash-animation 30s infinite linear;
}
/* line 58, ../sass/_dashed-shadows.scss */
.dashed-shadow:after {
z-index: 2;
content: attr(data-text);
position: absolute;
left: -8px;
top: -8px;
color: #b85b3f;
text-shadow: 3px 3px #e8e3c7;
}
/* MISE EN FORME GÉNÉRALE */
/* line 12, ../sass/global.scss */
html {
height: 100%;
background-color: #FFFBEF;
}
/* line 17, ../sass/global.scss */
body {
font-family: "Saira Semi Condensed", sans-serif;
font-size: medium;
}
/* line 22, ../sass/global.scss */
#principal {
background-color: #FFFBEF;
}
/*MAIN*/
/* line 27, ../sass/global.scss */
main {
background-color: #FFFBEF;
border-width: 2px;
border-color: #375362;
border-style: none;
border-collapse: collapse;
display: table-cell;
margin-top: 0px;
padding: 0px;
}
/* line 37, ../sass/global.scss */
main .fuid, main h1, main h2, main h3 {
margin-left: -15px;
margin-right: -15px;
margin-top: 0px;
margin-bottom: 0px;
}
/* line 43, ../sass/global.scss */
main h1, main h2, main h3 {
margin-top: -2px;
margin-bottom: -2px;
margin-left: -17px;
margin-right: -17px;
color: white;
padding-left: 15px;
padding-right: 15px;
}
/* line 52, ../sass/global.scss */
main h1 {
font-family: "Capriola", sans-serif;
font-weight: 600;
padding-bottom: 10px;
padding-top: 15px;
background-color: #4F778C;
}
/* line 59, ../sass/global.scss */
main h1.activity {
background-color: #4FADB8;
}
/* line 62, ../sass/global.scss */
main h1.event {
background-color: #3488A6;
}
/* line 65, ../sass/global.scss */
main h1.todo {
background-color: #F19F5D;
}
/* line 68, ../sass/global.scss */
main h1.equipment {
background-color: #E75571;
}
/* line 71, ../sass/global.scss */
main h1.staff {
background-color: #3BAD89;
}
/* line 75, ../sass/global.scss */
main h2, main h3 {
border-bottom: 2px solid #5D8CA6;
padding-bottom: 5px;
padding-top: 10px;
font-family: "Capriola", sans-serif;
font-weight: 600;
font-size: x-large;
background-color: #BDD2DE;
}
/* line 84, ../sass/global.scss */
main h2.activity, main h3.activity {
background-color: #5ED1DC;
border-color: #4FADB8;
}
/* line 88, ../sass/global.scss */
main h2.event, main h3.event {
background-color: #3999BA;
border-color: #3488A6;
}
/* line 92, ../sass/global.scss */
main h2.todo, main h3.todo {
background-color: #FF9C4D;
border-color: #F19F5D;
}
/* line 96, ../sass/global.scss */
main h2.equipment, main h3.equipment {
background-color: #FF5C79;
border-color: #E75571;
}
/* line 100, ../sass/global.scss */
main h2.staff, main h3.staff {
background-color: #42C2A2;
border-color: #3BAD89;
}
/* line 105, ../sass/global.scss */
main h3 {
background-color: #F0FAFF;
color: #4F778C;
}
/* line 108, ../sass/global.scss */
main h3.activity {
background-color: #F0FAFF;
color: #5ED1DC;
}
/* line 112, ../sass/global.scss */
main h3.event {
background-color: #F0FAFF;
color: #3999BA;
}
/* line 116, ../sass/global.scss */
main h3.todo {
background-color: #F0FAFF;
color: #FF9C4D;
}
/* line 120, ../sass/global.scss */
main h3.equipment {
background-color: #F0FAFF;
color: #FF5C79;
}
/* line 124, ../sass/global.scss */
main h3.staff {
background-color: #F0FAFF;
color: #42C2A2;
}
/* line 129, ../sass/global.scss */
main a {
color: #FF6969;
}
/* line 132, ../sass/global.scss */
main a:hover, main a:active, main a:focus {
color: #FF6969;
}
/* line 139, ../sass/global.scss */
main .text {
padding: 15px;
}
/*ASIDE*/
/* line 145, ../sass/global.scss */
aside {
background-color: #375362;
color: white;
margin-top: 0px;
padding: 0px !important;
}
/* line 151, ../sass/global.scss */
aside a {
color: #FF9191;
}
/* line 154, ../sass/global.scss */
aside a:hover, aside a:active, aside a:focus {
color: #FF9191;
}
/* line 161, ../sass/global.scss */
aside code {
color: #375362;
background-color: #BDD2DE;
}
/* line 166, ../sass/global.scss */
aside .heading {
padding: 8px 15px;
font-size: 32px;
line-height: 1.3;
text-align: center;
}
/* line 172, ../sass/global.scss */
aside .heading.inverted {
background-color: #FFF5EB;
color: black;
}
/* line 177, ../sass/global.scss */
aside .heading.small {
font-size: 25px;
}
/* line 180, ../sass/global.scss */
aside .heading.small .sub {
font-size: 0.7em;
font-weight: normal;
}
/* line 186, ../sass/global.scss */
aside .heading .sub {
font-size: 0.7em;
font-weight: normal;
}
/* line 191, ../sass/global.scss */
aside .heading.separator {
border-bottom-color: #FF9191;
border-bottom-style: solid;
}
/* line 197, ../sass/global.scss */
aside .text {
padding: 15px;
}
/* line 200, ../sass/global.scss */
aside .text.inverted {
background-color: #FFF5EB;
color: black;
}
@media (min-width: 768px) {
/* line 209, ../sass/global.scss */
main {
margin-top: 20px;
border-style: dashed;
}
/* line 213, ../sass/global.scss */
aside {
margin-top: 20px;
}
}
/* line 218, ../sass/global.scss */
hr {
border-top: 1px solid #FFB363;
}
/* line 223, ../sass/global.scss */
span.vsep {
padding-left: 5px;
padding-right: 5px;
}
/* line 228, ../sass/global.scss */
div.tag-list {
margin-top: 20px;
}
/* line 232, ../sass/global.scss */
code {
font-size: small;
}
/* line 236, ../sass/global.scss */
.module-list {
margin-top: 10px;
margin-bottom: 10px;
display: flex;
align-items: stretch;
flex-wrap: wrap;
}
/* line 244, ../sass/global.scss */
a.module {
padding: 20px 40px;
margin: 5px;
border-bottom-style: solid;
font-size: large;
display: block;
border-bottom-color: #375362;
background-color: #BDD2DE;
color: #375362;
}
/* line 256, ../sass/global.scss */
a.module.activity {
border-bottom-color: #4FADB8;
background-color: #CAE4E7;
color: #4FADB8;
}
/* line 262, ../sass/global.scss */
a.module.event {
border-bottom-color: #3488A6;
background-color: #AAD5E2;
color: #3488A6;
}
/* line 268, ../sass/global.scss */
a.module.todo {
border-bottom-color: #F19F5D;
background-color: #FFDEBC;
color: #F19F5D;
}
/* line 274, ../sass/global.scss */
a.module.equipment {
border-bottom-color: #E75571;
background-color: #FECAD6;
color: #E75571;
}
/* line 280, ../sass/global.scss */
a.module.staff {
border-bottom-color: #3BAD89;
background-color: #A9E1D7;
color: #3BAD89;
}
/* line 286, ../sass/global.scss */
a.module:hover, a.module:active, a.module:focus {
text-decoration: none;
color: #F0FAFF;
background-color: #375362;
}
/* line 293, ../sass/global.scss */
a.module:hover.activity, a.module:active.activity, a.module:focus.activity {
background-color: #5ED1DC;
}
/* line 296, ../sass/global.scss */
a.module:hover.event, a.module:active.event, a.module:focus.event {
background-color: #3999BA;
}
/* line 299, ../sass/global.scss */
a.module:hover.equipment, a.module:active.equipment, a.module:focus.equipment {
background-color: #FF5C79;
}
/* line 302, ../sass/global.scss */
a.module:hover.todo, a.module:active.todo, a.module:focus.todo {
background-color: #FF9C4D;
}
/* line 305, ../sass/global.scss */
a.module:hover.staff, a.module:active.staff, a.module:focus.staff {
background-color: #42C2A2;
}
/* line 311, ../sass/global.scss */
.collapsible {
background-color: #777;
color: white;
cursor: pointer;
padding: 18px;
width: 100%;
border: none;
text-align: left;
outline: none;
font-size: 15px;
}
/* line 322, ../sass/global.scss */
.collapsible:after {
content: '\002B';
color: white;
font-weight: bold;
float: right;
margin-left: 5px;
}
/* line 330, ../sass/global.scss */
.collapsible:hover {
background-color: #555;
}
/* line 334, ../sass/global.scss */
.collapsible h3 {
margin-top: 0px;
margin-bottom: 0px;
display: inline-block;
}
/* line 341, ../sass/global.scss */
.active {
background-color: #555;
}
/* line 344, ../sass/global.scss */
.active:after {
content: "\2212";
}
/* line 348, ../sass/global.scss */
.content {
padding: 8px 18px;
display: none;
background-color: #f1f1f1;
}
/* line 353, ../sass/global.scss */
.content.fluid {
padding: 0px 0px;
background-color: transparent;
}
/* line 358, ../sass/global.scss */
.content h4 {
font-size: x-large;
font-weight: bold;
display: inline-block;
margin: 0px 0px;
}
/* line 367, ../sass/global.scss */
.planning .activity {
padding: 8px 18px;
padding-top: 8px;
padding-bottom: 12px;
border-left: none;
border-right: 6px solid #FF9191;
}
/* line 375, ../sass/global.scss */
.planning .activity.inverted {
border-left: 6px solid #FF9191;
border-right: none;
}
/* line 380, ../sass/global.scss */
.planning .activity .activity-title {
font-size: large;
}
/* line 387, ../sass/global.scss */
.glyphicon.yes {
color: #55C487 !important;
}
/* line 390, ../sass/global.scss */
.glyphicon.no {
color: #E36268 !important;
}
/* line 393, ../sass/global.scss */
.glyphicon.dunno {
color: #5599C4 !important;
}
/* line 398, ../sass/global.scss */
.sending-request {
position: relative;
}
/* line 401, ../sass/global.scss */
.sending-request:after {
content: "Chargement...";
position: absolute;
width: 100%;
height: 100%;
background: #fff;
opacity: 0.8;
color: #777;
text-align: center;
box-sizing: border-box;
z-index: 5;
top: 0;
left: 0;
padding: 8%;
}

View file

@ -0,0 +1 @@
global.min.css

View file

@ -6,7 +6,7 @@
@import '_forms';
@import '_tree';
@import '_filters';
//i@import '_dashed-shadows';
//@import '_dashed-shadows';
/* MISE EN FORME GÉNÉRALE */
html {

View file

@ -32,7 +32,6 @@
</header>
<div id="principal">
{% block principal %}
<div class="container">
{% if messages %}
@ -69,7 +68,6 @@
</div>
</div><!-- /.container -->
{% endblock %}
</div><!-- /#principal -->
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->

View file

@ -1,31 +0,0 @@
{% extends "shared/base.html" %}
{% load i18n %}
{% block principal %}
<div class="container-fluid">
{% if messages %}
<div class="row">
{% for message in messages %}
<div class="alert message-{{ message.tags }} alter-dismissible fade in" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="{% trans "Close" %}">
<span aria-hidden="true">×</span>
</button>
<strong>
{% if message.level == DEFAULT_MESSAGE_LEVELS.DEBUG %}{% trans "DEBUG" %}&#8239;:
{% elif message.level == DEFAULT_MESSAGE_LEVELS.INFO %}{% trans "Info"%}&#8239;:
{% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}{% trans "Succès"%}&#8239;:
{% elif message.level == DEFAULT_MESSAGE_LEVELS.WARNING %}{% trans "Attention" %}&#8239;:
{% elif message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}{% trans "Erreur" %}&#8239;:
{% endif %}
</strong>
{{ message }}
</div>
{% endfor %}
</div>
{% endif %}
<div class="row">
{% block content %}{% endblock %}
</div>
</div><!-- /.container -->
{% endblock %}