Skip to content

Commit b314708

Browse files
the-gluthe-glu
authored
Merge pull request ArcaniteSolutions#21 from CedricCook/master
Update to Logistics admin, General moderation buttons
2 parents 928ef5c + 430033f commit b314708

File tree

8 files changed

+145
-75
lines changed

8 files changed

+145
-75
lines changed

‎truffe2/communication/models.py

+20-21
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,15 @@ class MetaData:
300300
list_display_related = [list_display_base[0]] + [('get_display_link', _(u'Affichage')), ] + list_display_base[1:] + [('get_conflits_list', _(u'Conflits')), ]
301301

302302
forced_widths = {
303-
'1': '15%',
303+
'1': '20%',
304304
'4': '150px',
305305
'5': '150px',
306-
'6': '150px',
307306
}
308307

309308
forced_widths_related = {
310-
'1': '15%',
311-
'4': '150px',
312-
'5': '150px',
313-
'6': '150px',
309+
'1': '20%',
310+
'4': '90px',
311+
'5': '90px',
314312
'7': '80px',
315313
}
316314

@@ -400,7 +398,7 @@ def genericFormExtraClean(self, data, form):
400398
def get_display_infos(self):
401399
"""Affiche les infos sur les affichages pour une réserversation"""
402400

403-
tpl = mark_safe(u'<div style="margin-top: 5px;">%s, %s <span class="label label-info">%s</span></div>' % (escape(self.display.title), _(u'gérée par'), escape(self.display.unit.name),))
401+
tpl = mark_safe(u'<div style="margin-top: 5px;">{}, {} <span class="label label-info">{}</span></div>'.format(escape(self.display.title), _(u'gérée par'), escape(self.display.unit.name)))
404402

405403
return tpl
406404

@@ -410,23 +408,21 @@ def get_conflits(self):
410408
status__in=['1_asking', '2_online'], end_date__gt=self.start_date, start_date__lt=self.end_date)
411409

412410
if not liste:
413-
return mark_safe('<span class="txt-color-green"><i class="fa fa-check"></i> %s</span>' % (
414-
unicode(_('Pas de conflits !')),))
411+
return mark_safe('<span class="txt-color-green"><i class="fa fa-check"></i> {}</span>'.format(_('Pas de conflits !')))
415412
else:
416-
retour = '<span class="txt-color-red"><i class="fa fa-warning"></i> %s</span><ul>' % (
417-
unicode(_(u'Il y a d\'autres réservations en même temps !')),)
413+
retour = u'<span class="txt-color-red"><i class="fa fa-warning"></i> {}</span><ul>'.format(_(u'Il y a d\'autres réservations en même temps !'))
418414

419415
for elem in liste:
420-
retour += u'<li><span class="label label-%s"><i class="%s"></i> %s</span> %s pour l\'unité %s <span data-toggle="tooltip" data-placement="right" title="Du %s au %s"><i class="fa fa-clock-o"></i> </span></li>' % (
421-
elem.status_color(), elem.status_icon(), elem.get_status_display(), elem, elem.get_unit_name(),
422-
localtime(elem.start_date), localtime(elem.end_date),)
416+
retour = u'{}<li><span class="label label-{}"><i class="{}"></i> {}</span>'.format(retour, elem.status_color(), elem.status_icon(), elem.get_status_display())
417+
retour = u'{} {} pour l\'unité {}'.format(retour, elem, elem.get_unit_name())
418+
retour = u'{} <span data-toggle="tooltip" data-placement="right" title="Du {} au {}"><i class="fa fa-clock-o"></i></span></li>'.format(retour, localtime(elem.start_date), localtime(elem.end_date))
423419

424-
retour += '</ul>'
420+
retour = u'{}</ul>'.format(retour)
425421

426422
return retour
427423

428424
def get_display_link(self):
429-
return '<a href="%s">%s</a>' % (reverse('communication.views.display_show', args=(self.display.pk,)), self.display,)
425+
return '<a href="{}">{}</a>'.format(reverse('communication.views.display_show', args=(self.display.pk,)), self.display)
430426

431427
def get_conflits_list(self):
432428

@@ -437,11 +433,14 @@ def get_conflits_list(self):
437433
return '<span class="txt-color-green"><i class="fa fa-check"></i></span>'
438434
else:
439435

440-
retour = ''
436+
retour = u'<ul>'
441437

442438
for elem in liste:
443-
retour += u'%s, %s, pour %s du %s au %s, ' % (
444-
elem, elem.get_status_display(), elem.unit if elem.unit else elem.unit_blank_name,
445-
localtime(elem.start_date), localtime(elem.end_date),)
439+
unit = escape(elem.unit) if elem.unit else escape(elem.unit_blank_name)
440+
441+
retour = u'{}<li><span>{} ({}) [{}]<br>'.format(retour, escape(elem), unit, elem.get_status_display())
442+
retour = u'{}du {}<br>au {}</span></li>'.format(retour, localtime(elem.start_date), localtime(elem.end_date))
443+
444+
retour = u'{}</ul>'.format(retour)
446445

447-
return '<span class="txt-color-red" title="%s"><i class="fa fa-warning"></i></span><ul>' % (retour[:-2],)
446+
return u'<span class="txt-color-red conflicts-tooltip-parent" rel="tooltip" data-placement="bottom" data-html="true" title="{}"><i class="fa fa-warning"></i></span>'.format(retour)

‎truffe2/data/pip-reqs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pillow<3
55
django-bootstrap3<6
66
phonenumbers
77
requests
8-
django-impersonate<1.0
8+
django-impersonate==0.9.2
99
pytz
1010
git+https://github.com/goinnn/django-multiselectfield
1111
easy_thumbnails

‎truffe2/generic/templates/generic/generic/list_json.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
{{elem|get_attr:field|date:"d.m.Y"|force_escape|escapejs}} {{elem|get_attr:field|time:"H:i:s"|force_escape|escapejs}}
2525
{% else %}
2626
{% if field == 'status' and elem.MetaState.states %}
27-
<span class='label label-{{elem.status_color}}'><i class='{{elem.status_icon}}'></i> {{elem.get_status_display|force_escape|escapejs}}</span>
27+
{% if elem.status_icon %}
28+
<span class='label label-{{elem.status_color}} label-crlf'><i class='{{elem.status_icon}}'></i> {{elem.get_status_display|force_escape|escapejs}}</span>
29+
{% else %}
30+
<span class='label label-{{elem.status_color}} label-crlf'>{{elem.get_status_display|force_escape|escapejs}}</span>
31+
{% endif %}
2832
{% else %}
2933
{% if field in Model.MetaData.safe_fields %}
3034
{{elem|get_attr:field|escapejs}}
@@ -40,10 +44,10 @@
4044
{% endfor %}
4145
"{% spaceless %}
4246
{% ifhasright elem user 'DELETE' %}
43-
<a href=\"{% url delete_view elem.pk %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}\" class=\"btn btn-xs btn-danger\" title=\"{% trans "Supprimer" %}\" rel=\"tooltip\" multido_action=\"window.location = '{% url delete_view 9999429999 %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}';\" multido_pkreplace=\"9999429999\" multido_button=\"<a href='#' class='btn btn-danger'><i class='fa fa-times'></i> {% trans "Supprimer" %}</a>\"><i class=\"fa fa-times\"></i></a>
47+
<a href=\"{% url delete_view elem.pk %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}\" class=\"btn btn-xs btn-danger quick-switch-btn\" title=\"{% trans "Supprimer" %}\" rel=\"tooltip\" data-placement=\"left\" multido_action=\"window.location = '{% url delete_view 9999429999 %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}';\" multido_pkreplace=\"9999429999\" multido_button=\"<a href='#' class='btn btn-danger'><i class='fa fa-times'></i> {% trans "Supprimer" %}</a>\"><i class=\"fa fa-times\"></i></a>
4448
{% endifhasright %}
4549
{% ifhasright elem user 'EDIT' %}
46-
<a href=\"{% url edit_view elem.pk %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}\" style=\"margin-left: 3px;\" class=\"btn btn-xs btn-default\" title=\"{% trans "Editer" %}\" rel=\"tooltip\"><i class=\"fa fa-pencil\"></i></a>
50+
<a href=\"{% url edit_view elem.pk %}?{% if upk_noswitch %}&_upkns=_{% endif %}{% if from_related %}&_fromrelated=_{% endif %}\" class=\"btn btn-xs btn-default quick-switch-btn\" title=\"{% trans "Editer" %}\" rel=\"tooltip\" data-placement=\"left\"><i class=\"fa fa-pencil\"></i></a>
4751
{% endifhasright %}
4852
{% if elem.MetaState.list_quick_switch %}
4953
{% include "generic/generic/list_json_quick_switch.html" %}

‎truffe2/generic/templates/generic/generic/list_json_quick_switch.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
{% get_list_quick_switch elem as qsdata %}
44
{% if qsdata %}
55
{% for status, icon, title in qsdata %}
6-
<a class=\"btn btn-xs btn-{{elem.MetaState.states_colors|get_attr:status}}\" style=\"margin-left: 3px;\" title=\"{{title}}\" rel=\"tooltip\" onclick=\"disp_switch('{{elem.pk}}', '{{status}}'); return false;\" multido_action=\"disp_switch('9999429999', '{{status}}');\" multido_pkreplace=\"9999429999\" multido_button=\"<a href='#' class='btn btn-{{elem.MetaState.states_colors|get_attr:status}}'><i class='{{icon}}'></i> {{title}}</a>\"><i class=\"{{icon}}\"></i></a>
6+
<a class=\"btn btn-xs btn-{{elem.MetaState.states_colors|get_attr:status}} quick-switch-btn\" title=\"{{title}}\" rel=\"tooltip\" data-placement=\"left\" onclick=\"disp_switch('{{elem.pk}}', '{{status}}'); return false;\" multido_action=\"disp_switch('9999429999', '{{status}}');\" multido_pkreplace=\"9999429999\" multido_button=\"<a href='#' class='btn btn-{{elem.MetaState.states_colors|get_attr:status}}'><i class='{{icon}}'></i> {{title}}</a>\"><i class=\"{{icon}}\"></i></a>
77
{% endfor %}
88
{% endif %}

0 commit comments

Comments
 (0)