python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rerouted AuthBackend, changed bootstrap colors

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-17 20:20:06 +02:00
parent 7694c4ea7a
commit 6e9a76696e
16 changed files with 259 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maraudes/notes.py
-8
View File
@@ -22,12 +22,4 @@ class Observation(Note):
def note_bg_colors(self): return ("info", "info")
class Signalement(Note):
source = models.CharField('Source', max_length=128)
def note_labels(self): return [self.source]
def note_bg_colors(self): return ('warning', 'alert')
maraudes/templates/maraudes/details.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% if maraude.est_terminee %}
{% include "compte_rendu/compterendu.html" %}
{% else %}
{% if user.is_superuser %}<a class="btn btn-primary" href="{% url 'maraudes:create' maraude.pk %}">Écrire le compte-rendu</a>
{% if perms.maraudes.can_add_compterendu %}<a class="btn btn-primary" href="{% url 'maraudes:create' maraude.pk %}">Écrire le compte-rendu</a>
{% else %} <p class="alert alert-info">Le compte-rendu n'a pas encore été écrit</p>{% endif %}
{% endif %}
</div>
maraudes/templates/maraudes/list.html → maraudes/templates/maraudes/liste.html
+1 -1
View File
@@ -14,7 +14,7 @@
<div class="btn-group" role="group">
{% if maraude.est_terminee %}
<a href="{% url 'maraudes:details' maraude.id %}" class="btn btn-primary">
{% elif user.is_superuser %}
{% elif perms.maraudes.can_add_compterendu %}
<a href="{% url 'maraudes:create' maraude.id %}" class="btn btn-warning">
{% else %}
<a href="#" class="btn btn-default disabled">
maraudes/views.py
+20 -7
View File
@@ -29,7 +29,7 @@ webpage = website.webpage(
app_menu=["maraudes/menu_dernieres_maraudes.html", "maraudes/menu_administration.html"]
)
from django.core.mail import send_mail
class DerniereMaraudeMixin(object):
count = 5
@@ -83,7 +83,7 @@ class IndexView(DerniereMaraudeMixin, generic.TemplateView):
## MARAUDES
@webpage
class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
model = Maraude
model = CompteRendu
context_object_name = "maraude"
template_name = "maraudes/details.html"
@@ -102,8 +102,8 @@ class MaraudeDetailsView(DerniereMaraudeMixin, generic.DetailView):
@webpage
class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
model = Maraude
template_name = "maraudes/list.html"
model = CompteRendu
template_name = "maraudes/liste.html"
paginate_by = 10
class PageInfo:
@@ -120,7 +120,7 @@ class MaraudeListView(DerniereMaraudeMixin, generic.ListView):
## COMPTE-RENDU DE MARAUDE
@webpage
class CompteRenduCreateView(generic.DetailView):
model = Maraude
model = CompteRendu
template_name = "compte_rendu/compterendu_create.html"
context_object_name = "maraude"
@@ -145,12 +145,25 @@ class CompteRenduCreateView(generic.DetailView):
)
def finalize(self):
print('finalize !')
maraude = self.get_object()
maraude.heure_fin = timezone.now()
maraude.save()
#TODO: send email to all Maraudeurs
# Redirect to a new view to edit mail ??
# Add text to some mails ? Transmission, message à un référent, etc...
# Send mail to Maraudeurs
_from = maraude.referent.email
exclude = (maraude.referent, maraude.binome)
recipients = []
for m in Maraudeur.objects.all():
if not m in exclude:
recipients.append(m.email)
objet = "Compte-rendu de maraude : %s" % maraude.date
message = "Sujets rencontrés : ..." #TODO: Mail content
send_mail(objet, message, _from, recipients)
return redirect("maraudes:details",
pk=self.get_object().pk
pk=maraude.pk
)
def post(self, request, *args, **kwargs):
notes/templates/notes/table_inline.html
+2 -2
View File
@@ -1,5 +1,5 @@
<tr>
<th class="bg-{{bg_color}}">
<th class="bg-{{bg_color}}" >
<strong>{{header}}</strong> <small>{{small}}</small>
<span class="pull-right">
{% for label in labels %}
@@ -8,5 +8,5 @@
</th>
</tr>
<tr>
<td><p>{{text}}</p></td>
<td ><p>{{text}}</p></td>
</tr>
suivi/notes.py
+11 -4
View File
@@ -5,9 +5,16 @@ class Appel(Note):
entrant = models.BooleanField( "Appel entrant ?")
def save(self, **kwargs):
print('save', self)
return super().save(**kwargs)
def note_labels(self): return ["Reçu" if self.entrant else "Émis", self.created_by]
def note_bg_colors(self): return ("warning", "info")
class Signalement(Note):
source = models.CharField('Source', max_length=128)
def note_labels(self): return [self.source]
def note_bg_colors(self): return ('warning', 'alert')
website/backends.py
+16
View File
@@ -0,0 +1,16 @@
from django.contrib.auth.backends import ModelBackend
class MyBackend(ModelBackend):
def authenticate(self, **kwargs):
print('use MyBackend')
return super().authenticate(**kwargs)
def get_user(self, user_id):
print('use MyBackend: get_user', user_id)
return super().get_user(user_id)
def has_perm(self, *args, **kwargs):
print('call has_perm', args, kwargs)
return super().has_perm(*args, **kwargs)
website/mixins.py
+7 -3
View File
@@ -75,7 +75,11 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
return self.content_template
def get_apps_config(self):
""" Load additionnal config data on each app registered in navbar"""
""" Load additionnal config data on each app registered in navbar
Add :
- menu_icon : glyphicon in sidebar
- disabled : show/hide in sidebar
"""
## Utils ##
APP_ICONS = {
'maraudes': 'road',
@@ -86,8 +90,8 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
for name in app_names:
app_config = apps.get_app_config(name)
app_config.menu_icon = APP_ICONS[name]
#Known Issue: there is actually no 'suivi.view_suivi' permission yet !
app_config.disabled = not self.request.user.has_perm('%s.view_%s' % (name, name))
#TODO: Seems unsafe (only need module perm)
app_config.disabled = not self.request.user.has_module_perms(name)
print(self.request.user, app_config, '-> has perm:', not app_config.disabled)
self._apps.append(app_config)
return self._apps
website/static/bootstrap/config.json
+16 -16
View File
@@ -61,7 +61,7 @@
"@table-bg-accent": "#f9f9f9",
"@table-bg-hover": "#f5f5f5",
"@table-bg-active": "@table-bg-hover",
"@table-border-color": "#ddd",
"@table-border-color": "#d5c6c5",
"@btn-font-weight": "normal",
"@btn-default-color": "#333",
"@btn-default-bg": "#fff",
@@ -217,18 +217,18 @@
"@jumbotron-heading-color": "inherit",
"@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
"@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
"@state-success-text": "#3c763d",
"@state-success-bg": "#dff0d8",
"@state-success-text": "#2b2f28",
"@state-success-bg": "#c8f3af",
"@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
"@state-info-text": "#31708f",
"@state-info-bg": "#f7d9d9",
"@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
"@state-warning-text": "#8a6d3b",
"@state-warning-bg": "#fcf8e3",
"@state-warning-border": "darken(spin(@state-warning-bg, -10), 5%)",
"@state-info-text": "#290502",
"@state-info-bg": "#ffd8d5",
"@state-info-border": "darken(@state-info-bg, 15%)",
"@state-warning-text": "#291C00",
"@state-warning-bg": "#ffeec7",
"@state-warning-border": "darken(@state-warning-bg, 15%)",
"@state-danger-text": "#a94442",
"@state-danger-bg": "#f2dede",
"@state-danger-border": "darken(spin(@state-danger-bg, -10), 5%)",
"@state-danger-bg": "#f38b88",
"@state-danger-border": "darken(@state-danger-bg, 15%)",
"@tooltip-max-width": "200px",
"@tooltip-color": "#fff",
"@tooltip-bg": "#000",
@@ -314,7 +314,7 @@
"@panel-default-border": "#ddd",
"@panel-default-heading-bg": "#f5f5f5",
"@panel-primary-text": "#fff",
"@panel-primary-border": "@brand-primary",
"@panel-primary-border": "darken(@brand-primary, 15%)",
"@panel-primary-heading-bg": "@brand-primary",
"@panel-success-text": "@state-success-text",
"@panel-success-border": "@state-success-border",
@@ -322,9 +322,9 @@
"@panel-info-text": "@state-info-text",
"@panel-info-border": "@state-info-border",
"@panel-info-heading-bg": "@state-info-bg",
"@panel-warning-text": "@state-warning-text",
"@panel-warning-border": "@state-warning-border",
"@panel-warning-heading-bg": "@state-warning-bg",
"@panel-warning-text": "#fff",
"@panel-warning-border": "darken(@brand-warning, 15%)",
"@panel-warning-heading-bg": "@brand-warning",
"@panel-danger-text": "@state-danger-text",
"@panel-danger-border": "@state-danger-border",
"@panel-danger-heading-bg": "@state-danger-bg",
@@ -431,5 +431,5 @@
"scrollspy.js",
"transition.js"
],
"customizerUrl": "https://getbootstrap.com/customize/?id=4e370b35f1630f31fde8e0de59c1c6f5"
"customizerUrl": "http://getbootstrap.com/customize/?id=7f853f3d936c9ba68499a06009229bc9"
}
website/static/bootstrap/css/bootstrap-theme.css
Vendored
+46 -46
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=4e370b35f1630f31fde8e0de59c1c6f5)
* Config saved to config.json and https://gist.github.com/4e370b35f1630f31fde8e0de59c1c6f5
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=7f853f3d936c9ba68499a06009229bc9)
* Config saved to config.json and https://gist.github.com/7f853f3d936c9ba68499a06009229bc9
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -421,40 +421,40 @@ fieldset[disabled] .btn-danger.active {
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.alert-success {
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
background-image: -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
background-image: -webkit-linear-gradient(top, #c8f3af 0%, #b1ee8e 100%);
background-image: -o-linear-gradient(top, #c8f3af 0%, #b1ee8e 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#c8f3af), to(#b1ee8e));
background-image: linear-gradient(to bottom, #c8f3af 0%, #b1ee8e 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
border-color: #b2dba1;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8f3af', endColorstr='#ffb1ee8e', GradientType=0);
border-color: #9ae96c;
}
.alert-info {
background-image: -webkit-linear-gradient(top, #f7d9d9 0%, #f0b9b9 100%);
background-image: -o-linear-gradient(top, #f7d9d9 0%, #f0b9b9 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f7d9d9), to(#f0b9b9));
background-image: linear-gradient(to bottom, #f7d9d9 0%, #f0b9b9 100%);
background-image: -webkit-linear-gradient(top, #ffd8d5 0%, #ffb4af 100%);
background-image: -o-linear-gradient(top, #ffd8d5 0%, #ffb4af 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffd8d5), to(#ffb4af));
background-image: linear-gradient(to bottom, #ffd8d5 0%, #ffb4af 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff7d9d9', endColorstr='#fff0b9b9', GradientType=0);
border-color: #ea9a9a;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffd8d5', endColorstr='#ffffb4af', GradientType=0);
border-color: #ff9189;
}
.alert-warning {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
background-image: -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
background-image: -webkit-linear-gradient(top, #ffeec7 0%, #ffe2a1 100%);
background-image: -o-linear-gradient(top, #ffeec7 0%, #ffe2a1 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffeec7), to(#ffe2a1));
background-image: linear-gradient(to bottom, #ffeec7 0%, #ffe2a1 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
border-color: #f5e79e;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffeec7', endColorstr='#ffffe2a1', GradientType=0);
border-color: #ffd77a;
}
.alert-danger {
background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
background-image: -webkit-linear-gradient(top, #f38b88 0%, #ef6965 100%);
background-image: -o-linear-gradient(top, #f38b88 0%, #ef6965 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f38b88), to(#ef6965));
background-image: linear-gradient(to bottom, #f38b88 0%, #ef6965 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
border-color: #dca7a7;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff38b88', endColorstr='#ffef6965', GradientType=0);
border-color: #ec4743;
}
.progress {
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
@@ -552,36 +552,36 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff980300', endColorstr='#ff7f0200', GradientType=0);
}
.panel-success > .panel-heading {
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
background-image: -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
background-image: -webkit-linear-gradient(top, #c8f3af 0%, #b9f099 100%);
background-image: -o-linear-gradient(top, #c8f3af 0%, #b9f099 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#c8f3af), to(#b9f099));
background-image: linear-gradient(to bottom, #c8f3af 0%, #b9f099 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8f3af', endColorstr='#ffb9f099', GradientType=0);
}
.panel-info > .panel-heading {
background-image: -webkit-linear-gradient(top, #f7d9d9 0%, #f3c4c4 100%);
background-image: -o-linear-gradient(top, #f7d9d9 0%, #f3c4c4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f7d9d9), to(#f3c4c4));
background-image: linear-gradient(to bottom, #f7d9d9 0%, #f3c4c4 100%);
background-image: -webkit-linear-gradient(top, #ffd8d5 0%, #ffc0bc 100%);
background-image: -o-linear-gradient(top, #ffd8d5 0%, #ffc0bc 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#ffd8d5), to(#ffc0bc));
background-image: linear-gradient(to bottom, #ffd8d5 0%, #ffc0bc 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff7d9d9', endColorstr='#fff3c4c4', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffd8d5', endColorstr='#ffffc0bc', GradientType=0);
}
.panel-warning > .panel-heading {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
background-image: -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
background-image: -webkit-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -o-linear-gradient(top, #f47f02 0%, #db7202 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f47f02), to(#db7202));
background-image: linear-gradient(to bottom, #f47f02 0%, #db7202 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff47f02', endColorstr='#ffdb7202', GradientType=0);
}
.panel-danger > .panel-heading {
background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
background-image: -webkit-linear-gradient(top, #f38b88 0%, #f17471 100%);
background-image: -o-linear-gradient(top, #f38b88 0%, #f17471 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f38b88), to(#f17471));
background-image: linear-gradient(to bottom, #f38b88 0%, #f17471 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff38b88', endColorstr='#fff17471', GradientType=0);
}
.well {
background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
website/static/bootstrap/css/bootstrap-theme.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/css/bootstrap.css
Vendored
+126 -126
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=4e370b35f1630f31fde8e0de59c1c6f5)
* Config saved to config.json and https://gist.github.com/4e370b35f1630f31fde8e0de59c1c6f5
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=7f853f3d936c9ba68499a06009229bc9)
* Config saved to config.json and https://gist.github.com/7f853f3d936c9ba68499a06009229bc9
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -1312,7 +1312,7 @@ small,
}
mark,
.mark {
background-color: #fcf8e3;
background-color: #ffeec7;
padding: .2em;
}
.text-left {
@@ -1350,25 +1350,25 @@ a.text-primary:focus {
color: #650200;
}
.text-success {
color: #3c763d;
color: #2b2f28;
}
a.text-success:hover,
a.text-success:focus {
color: #2b542c;
color: #121311;
}
.text-info {
color: #31708f;
color: #290502;
}
a.text-info:hover,
a.text-info:focus {
color: #245269;
color: #000000;
}
.text-warning {
color: #8a6d3b;
color: #291c00;
}
a.text-warning:hover,
a.text-warning:focus {
color: #66512c;
color: #000000;
}
.text-danger {
color: #a94442;
@@ -1386,32 +1386,32 @@ a.bg-primary:focus {
background-color: #650200;
}
.bg-success {
background-color: #dff0d8;
background-color: #c8f3af;
}
a.bg-success:hover,
a.bg-success:focus {
background-color: #c1e2b3;
background-color: #aaec83;
}
.bg-info {
background-color: #f7d9d9;
background-color: #ffd8d5;
}
a.bg-info:hover,
a.bg-info:focus {
background-color: #eeafaf;
background-color: #ffa9a2;
}
.bg-warning {
background-color: #fcf8e3;
background-color: #ffeec7;
}
a.bg-warning:hover,
a.bg-warning:focus {
background-color: #f7ecb5;
background-color: #ffdf94;
}
.bg-danger {
background-color: #f2dede;
background-color: #f38b88;
}
a.bg-danger:hover,
a.bg-danger:focus {
background-color: #e4b9b9;
background-color: #ee5e5a;
}
.page-header {
padding-bottom: 9px;
@@ -2280,11 +2280,11 @@ th {
padding: 8px;
line-height: 1.42857143;
vertical-align: top;
border-top: 1px solid #dddddd;
border-top: 1px solid #d5c6c5;
}
.table > thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid #dddddd;
border-bottom: 2px solid #d5c6c5;
}
.table > caption + thead > tr:first-child > th,
.table > colgroup + thead > tr:first-child > th,
@@ -2295,7 +2295,7 @@ th {
border-top: 0;
}
.table > tbody + tbody {
border-top: 2px solid #dddddd;
border-top: 2px solid #d5c6c5;
}
.table .table {
background-color: #eeeeee;
@@ -2309,7 +2309,7 @@ th {
padding: 5px;
}
.table-bordered {
border: 1px solid #dddddd;
border: 1px solid #d5c6c5;
}
.table-bordered > thead > tr > th,
.table-bordered > tbody > tr > th,
@@ -2317,7 +2317,7 @@ th {
.table-bordered > thead > tr > td,
.table-bordered > tbody > tr > td,
.table-bordered > tfoot > tr > td {
border: 1px solid #dddddd;
border: 1px solid #d5c6c5;
}
.table-bordered > thead > tr > th,
.table-bordered > thead > tr > td {
@@ -2373,14 +2373,14 @@ table th[class*="col-"] {
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
background-color: #dff0d8;
background-color: #c8f3af;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr:hover > .success,
.table-hover > tbody > tr.success:hover > th {
background-color: #d0e9c6;
background-color: #b9f099;
}
.table > thead > tr > td.info,
.table > tbody > tr > td.info,
@@ -2394,14 +2394,14 @@ table th[class*="col-"] {
.table > thead > tr.info > th,
.table > tbody > tr.info > th,
.table > tfoot > tr.info > th {
background-color: #f7d9d9;
background-color: #ffd8d5;
}
.table-hover > tbody > tr > td.info:hover,
.table-hover > tbody > tr > th.info:hover,
.table-hover > tbody > tr.info:hover > td,
.table-hover > tbody > tr:hover > .info,
.table-hover > tbody > tr.info:hover > th {
background-color: #f3c4c4;
background-color: #ffc0bc;
}
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
@@ -2415,14 +2415,14 @@ table th[class*="col-"] {
.table > thead > tr.warning > th,
.table > tbody > tr.warning > th,
.table > tfoot > tr.warning > th {
background-color: #fcf8e3;
background-color: #ffeec7;
}
.table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr:hover > .warning,
.table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc;
background-color: #ffe6ad;
}
.table > thead > tr > td.danger,
.table > tbody > tr > td.danger,
@@ -2436,14 +2436,14 @@ table th[class*="col-"] {
.table > thead > tr.danger > th,
.table > tbody > tr.danger > th,
.table > tfoot > tr.danger > th {
background-color: #f2dede;
background-color: #f38b88;
}
.table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover,
.table-hover > tbody > tr.danger:hover > td,
.table-hover > tbody > tr:hover > .danger,
.table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc;
background-color: #f17471;
}
.table-responsive {
overflow-x: auto;
@@ -2455,7 +2455,7 @@ table th[class*="col-"] {
margin-bottom: 15px;
overflow-y: hidden;
-ms-overflow-style: -ms-autohiding-scrollbar;
border: 1px solid #dddddd;
border: 1px solid #d5c6c5;
}
.table-responsive > .table {
margin-bottom: 0;
@@ -2826,25 +2826,25 @@ select[multiple].input-lg {
.has-success.checkbox label,
.has-success.radio-inline label,
.has-success.checkbox-inline label {
color: #3c763d;
color: #2b2f28;
}
.has-success .form-control {
border-color: #3c763d;
border-color: #2b2f28;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-success .form-control:focus {
border-color: #2b542c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
border-color: #121311;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #5d6657;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #5d6657;
}
.has-success .input-group-addon {
color: #3c763d;
border-color: #3c763d;
background-color: #dff0d8;
color: #2b2f28;
border-color: #2b2f28;
background-color: #c8f3af;
}
.has-success .form-control-feedback {
color: #3c763d;
color: #2b2f28;
}
.has-warning .help-block,
.has-warning .control-label,
@@ -2856,25 +2856,25 @@ select[multiple].input-lg {
.has-warning.checkbox label,
.has-warning.radio-inline label,
.has-warning.checkbox-inline label {
color: #8a6d3b;
color: #291c00;
}
.has-warning .form-control {
border-color: #8a6d3b;
border-color: #291c00;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-warning .form-control:focus {
border-color: #66512c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
border-color: #000000;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #8f6200;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #8f6200;
}
.has-warning .input-group-addon {
color: #8a6d3b;
border-color: #8a6d3b;
background-color: #fcf8e3;
color: #291c00;
border-color: #291c00;
background-color: #ffeec7;
}
.has-warning .form-control-feedback {
color: #8a6d3b;
color: #291c00;
}
.has-error .help-block,
.has-error .control-label,
@@ -2901,7 +2901,7 @@ select[multiple].input-lg {
.has-error .input-group-addon {
color: #a94442;
border-color: #a94442;
background-color: #f2dede;
background-color: #f38b88;
}
.has-error .form-control-feedback {
color: #a94442;
@@ -5062,45 +5062,45 @@ a.thumbnail.active {
color: inherit;
}
.alert-success {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #3c763d;
background-color: #c8f3af;
border-color: #c7f099;
color: #2b2f28;
}
.alert-success hr {
border-top-color: #c9e2b3;
border-top-color: #bbec83;
}
.alert-success .alert-link {
color: #2b542c;
color: #121311;
}
.alert-info {
background-color: #f7d9d9;
border-color: #f1bcc4;
color: #31708f;
background-color: #ffd8d5;
border-color: #ff9189;
color: #290502;
}
.alert-info hr {
border-top-color: #eca6b2;
border-top-color: #ff796f;
}
.alert-info .alert-link {
color: #245269;
color: #000000;
}
.alert-warning {
background-color: #fcf8e3;
border-color: #faebcc;
color: #8a6d3b;
background-color: #ffeec7;
border-color: #ffd77a;
color: #291c00;
}
.alert-warning hr {
border-top-color: #f7e1b5;
border-top-color: #ffcf61;
}
.alert-warning .alert-link {
color: #66512c;
color: #000000;
}
.alert-danger {
background-color: #f2dede;
border-color: #ebccd1;
background-color: #f38b88;
border-color: #ec4743;
color: #a94442;
}
.alert-danger hr {
border-top-color: #e4b9c0;
border-top-color: #ea312b;
}
.alert-danger .alert-link {
color: #843534;
@@ -5330,12 +5330,12 @@ button.list-group-item {
color: #ffe2c3;
}
.list-group-item-success {
color: #3c763d;
background-color: #dff0d8;
color: #2b2f28;
background-color: #c8f3af;
}
a.list-group-item-success,
button.list-group-item-success {
color: #3c763d;
color: #2b2f28;
}
a.list-group-item-success .list-group-item-heading,
button.list-group-item-success .list-group-item-heading {
@@ -5345,8 +5345,8 @@ a.list-group-item-success:hover,
button.list-group-item-success:hover,
a.list-group-item-success:focus,
button.list-group-item-success:focus {
color: #3c763d;
background-color: #d0e9c6;
color: #2b2f28;
background-color: #b9f099;
}
a.list-group-item-success.active,
button.list-group-item-success.active,
@@ -5355,16 +5355,16 @@ button.list-group-item-success.active:hover,
a.list-group-item-success.active:focus,
button.list-group-item-success.active:focus {
color: #fff;
background-color: #3c763d;
border-color: #3c763d;
background-color: #2b2f28;
border-color: #2b2f28;
}
.list-group-item-info {
color: #31708f;
background-color: #f7d9d9;
color: #290502;
background-color: #ffd8d5;
}
a.list-group-item-info,
button.list-group-item-info {
color: #31708f;
color: #290502;
}
a.list-group-item-info .list-group-item-heading,
button.list-group-item-info .list-group-item-heading {
@@ -5374,8 +5374,8 @@ a.list-group-item-info:hover,
button.list-group-item-info:hover,
a.list-group-item-info:focus,
button.list-group-item-info:focus {
color: #31708f;
background-color: #f3c4c4;
color: #290502;
background-color: #ffc0bc;
}
a.list-group-item-info.active,
button.list-group-item-info.active,
@@ -5384,16 +5384,16 @@ button.list-group-item-info.active:hover,
a.list-group-item-info.active:focus,
button.list-group-item-info.active:focus {
color: #fff;
background-color: #31708f;
border-color: #31708f;
background-color: #290502;
border-color: #290502;
}
.list-group-item-warning {
color: #8a6d3b;
background-color: #fcf8e3;
color: #291c00;
background-color: #ffeec7;
}
a.list-group-item-warning,
button.list-group-item-warning {
color: #8a6d3b;
color: #291c00;
}
a.list-group-item-warning .list-group-item-heading,
button.list-group-item-warning .list-group-item-heading {
@@ -5403,8 +5403,8 @@ a.list-group-item-warning:hover,
button.list-group-item-warning:hover,
a.list-group-item-warning:focus,
button.list-group-item-warning:focus {
color: #8a6d3b;
background-color: #faf2cc;
color: #291c00;
background-color: #ffe6ad;
}
a.list-group-item-warning.active,
button.list-group-item-warning.active,
@@ -5413,12 +5413,12 @@ button.list-group-item-warning.active:hover,
a.list-group-item-warning.active:focus,
button.list-group-item-warning.active:focus {
color: #fff;
background-color: #8a6d3b;
border-color: #8a6d3b;
background-color: #291c00;
border-color: #291c00;
}
.list-group-item-danger {
color: #a94442;
background-color: #f2dede;
background-color: #f38b88;
}
a.list-group-item-danger,
button.list-group-item-danger {
@@ -5433,7 +5433,7 @@ button.list-group-item-danger:hover,
a.list-group-item-danger:focus,
button.list-group-item-danger:focus {
color: #a94442;
background-color: #ebcccc;
background-color: #f17471;
}
a.list-group-item-danger.active,
button.list-group-item-danger.active,
@@ -5603,7 +5603,7 @@ button.list-group-item-danger.active:focus {
.panel > .panel-body + .table-responsive,
.panel > .table + .panel-body,
.panel > .table-responsive + .panel-body {
border-top: 1px solid #dddddd;
border-top: 1px solid #d5c6c5;
}
.panel > .table > tbody:first-child > tr:first-child th,
.panel > .table > tbody:first-child > tr:first-child td {
@@ -5707,94 +5707,94 @@ button.list-group-item-danger.active:focus {
border-bottom-color: #dddddd;
}
.panel-primary {
border-color: #980300;
border-color: #4c0100;
}
.panel-primary > .panel-heading {
color: #ffffff;
background-color: #980300;
border-color: #980300;
border-color: #4c0100;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #980300;
border-top-color: #4c0100;
}
.panel-primary > .panel-heading .badge {
color: #980300;
background-color: #ffffff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #980300;
border-bottom-color: #4c0100;
}
.panel-success {
border-color: #d6e9c6;
border-color: #c7f099;
}
.panel-success > .panel-heading {
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
color: #2b2f28;
background-color: #c8f3af;
border-color: #c7f099;
}
.panel-success > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #d6e9c6;
border-top-color: #c7f099;
}
.panel-success > .panel-heading .badge {
color: #dff0d8;
background-color: #3c763d;
color: #c8f3af;
background-color: #2b2f28;
}
.panel-success > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #d6e9c6;
border-bottom-color: #c7f099;
}
.panel-info {
border-color: #f1bcc4;
border-color: #ff9189;
}
.panel-info > .panel-heading {
color: #31708f;
background-color: #f7d9d9;
border-color: #f1bcc4;
color: #290502;
background-color: #ffd8d5;
border-color: #ff9189;
}
.panel-info > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #f1bcc4;
border-top-color: #ff9189;
}
.panel-info > .panel-heading .badge {
color: #f7d9d9;
background-color: #31708f;
color: #ffd8d5;
background-color: #290502;
}
.panel-info > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #f1bcc4;
border-bottom-color: #ff9189;
}
.panel-warning {
border-color: #faebcc;
border-color: #a85801;
}
.panel-warning > .panel-heading {
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
color: #ffffff;
background-color: #f47f02;
border-color: #a85801;
}
.panel-warning > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #faebcc;
border-top-color: #a85801;
}
.panel-warning > .panel-heading .badge {
color: #fcf8e3;
background-color: #8a6d3b;
color: #f47f02;
background-color: #ffffff;
}
.panel-warning > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #faebcc;
border-bottom-color: #a85801;
}
.panel-danger {
border-color: #ebccd1;
border-color: #ec4743;
}
.panel-danger > .panel-heading {
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
background-color: #f38b88;
border-color: #ec4743;
}
.panel-danger > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #ebccd1;
border-top-color: #ec4743;
}
.panel-danger > .panel-heading .badge {
color: #f2dede;
color: #f38b88;
background-color: #a94442;
}
.panel-danger > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #ebccd1;
border-bottom-color: #ec4743;
}
.embed-responsive {
position: relative;
website/static/bootstrap/css/bootstrap.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/js/bootstrap.js
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=4e370b35f1630f31fde8e0de59c1c6f5)
* Config saved to config.json and https://gist.github.com/4e370b35f1630f31fde8e0de59c1c6f5
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=7f853f3d936c9ba68499a06009229bc9)
* Config saved to config.json and https://gist.github.com/7f853f3d936c9ba68499a06009229bc9
*/
if (typeof jQuery === 'undefined') {
throw new Error('Bootstrap\'s JavaScript requires jQuery')
website/static/bootstrap/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
website/templates/navbar.html
+3 -3
View File
@@ -11,12 +11,12 @@
<a class="navbar-brand" href="{% url 'index' %}">La Maraude ALSA</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">{% for app in apps %}
<li class="{% if app == active_app %}active{%endif%} {% if app.disabled %}disabled{% endif%}">
<ul class="nav navbar-nav">{% for app in apps %}{% if not app.disabled %}
<li class="{% if app == active_app %}active{%endif%}">
<a href="/{{app.label}}/">{% bootstrap_icon app.menu_icon %} &middot; <strong>{{ app.name|title }}</strong></a>
</li>
{% if app == active_app %}{% for t in app_menu %}{% include t %}{% endfor %}{% endif %}
{%endfor%}
{% endif %}{%endfor%}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">