forked from DGNum/gestioCOF
Few display improvements.
- Current day remains on the screen on history. - Message for generic team user connection is sended only if user is connecting from a k-fet url. - Less contrast on history.
This commit is contained in:
parent
0a21858b33
commit
ea81ab7b25
|
@ -1,16 +1,18 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from __future__ import (absolute_import, division,
|
|
||||||
print_function, unicode_literals)
|
|
||||||
from builtins import *
|
|
||||||
|
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.auth.signals import user_logged_in
|
from django.contrib.auth.signals import user_logged_in
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
|
||||||
|
|
||||||
@receiver(user_logged_in)
|
@receiver(user_logged_in)
|
||||||
def messages_on_login(sender, request, user, **kwargs):
|
def messages_on_login(sender, request, user, **kwargs):
|
||||||
if (not user.username == 'kfet_genericteam'
|
if (not user.username == 'kfet_genericteam' and
|
||||||
and user.has_perm('kfet.is_team')):
|
user.has_perm('kfet.is_team') and
|
||||||
messages.info(request, '<a href="%s">Connexion en utilisateur partagé ?</a>' % reverse('kfet.login.genericteam'), extra_tags='safe')
|
'k-fet' in request.GET.get('next', '')):
|
||||||
|
messages.info(
|
||||||
|
request,
|
||||||
|
('<a href="{}">Connexion en utilisateur partagé ?</a>'
|
||||||
|
.format(reverse('kfet.login.genericteam'))),
|
||||||
|
extra_tags='safe')
|
||||||
|
|
|
@ -14,12 +14,15 @@
|
||||||
padding-left:20px;
|
padding-left:20px;
|
||||||
font-size:16px;
|
font-size:16px;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
|
position:sticky;
|
||||||
|
top:50px;
|
||||||
|
z-index:10;
|
||||||
}
|
}
|
||||||
|
|
||||||
#history .opegroup {
|
#history .opegroup {
|
||||||
height:30px;
|
height:30px;
|
||||||
line-height:30px;
|
line-height:30px;
|
||||||
background-color:rgba(200,16,46,0.85);
|
background-color:rgba(200,16,46,0.75);
|
||||||
color:#fff;
|
color:#fff;
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
padding-left:20px;
|
padding-left:20px;
|
||||||
|
|
|
@ -186,8 +186,11 @@ textarea {
|
||||||
text-align:center;
|
text-align:center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-right {
|
|
||||||
margin:0 15px;
|
@media (min-width: 768px) {
|
||||||
|
.content-right {
|
||||||
|
margin: 0 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-right-block {
|
.content-right-block {
|
||||||
|
|
|
@ -423,3 +423,7 @@ input[type=number]::-webkit-outer-spin-button {
|
||||||
.kpsul_middle_right_col {
|
.kpsul_middle_right_col {
|
||||||
overflow:auto;
|
overflow:auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.kpsul_middle_right_col #history .day {
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="row messages">
|
<div class="row messages">
|
||||||
{% for message in messages %}
|
{% for message in messages %}
|
||||||
<div class="col-sm-12 item">
|
<div class="col-sm-12 item">
|
||||||
<div class="alert alert-{{ message.level_tag }} alert-dismissible fade in{% if message.tags %} {{ message.tags }}{% endif %}">
|
<div class="alert alert-{{ message.level_tag }} alert-dismissible fade in {{ message.tags }}">
|
||||||
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button>
|
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button>
|
||||||
{% if 'safe' in message.tags %}
|
{% if 'safe' in message.tags %}
|
||||||
{{ message|safe }}
|
{{ message|safe }}
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/bootstrap-datetimepicker.min.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/bootstrap-datetimepicker.min.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/multiple-select.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/multiple-select.js' %}"></script>
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
|
|
||||||
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
|
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
@ -30,7 +29,6 @@
|
||||||
<div class="line line-big" id="nb_opes"></div>
|
<div class="line line-big" id="nb_opes"></div>
|
||||||
<div class="line line-bigsub">opérations</div>
|
<div class="line line-bigsub">opérations</div>
|
||||||
<div class="block">
|
<div class="block">
|
||||||
<h2>Filtres</h2>
|
|
||||||
<div class="line" style="position:relative"><b>De</b> <input type="text" id="from_date" class="form-control"></div>
|
<div class="line" style="position:relative"><b>De</b> <input type="text" id="from_date" class="form-control"></div>
|
||||||
<div class="line" style="position:relative"><b>à</b> <input type="text" id="to_date" class="form-control"></div>
|
<div class="line" style="position:relative"><b>à</b> <input type="text" id="to_date" class="form-control"></div>
|
||||||
<div class="line"><b>Caisses</b> {{ filter_form.checkouts }}</div>
|
<div class="line"><b>Caisses</b> {{ filter_form.checkouts }}</div>
|
||||||
|
|
Loading…
Reference in a new issue