From 9295325d21791f71b67f5100cd6f83098f0ae94f Mon Sep 17 00:00:00 2001 From: thomas girod Date: Sun, 21 Jul 2024 16:16:40 +0200 Subject: [PATCH 01/20] remove jquery datetime picker --- club/forms.py | 10 ++-- com/views.py | 21 +++++--- .../static/core/jquery.datetimepicker.min.css | 1 - .../core/js/jquery.datetimepicker.full.min.js | 2 - core/templates/core/base.jinja | 35 +++--------- core/views/forms.py | 54 +++---------------- counter/forms.py | 10 ++-- election/views.py | 18 ++++--- sith/settings.py | 1 - subscription/views.py | 12 ++--- 10 files changed, 60 insertions(+), 104 deletions(-) delete mode 100644 core/static/core/jquery.datetimepicker.min.css delete mode 100644 core/static/core/js/jquery.datetimepicker.full.min.js diff --git a/club/forms.py b/club/forms.py index ad3273c6..604f44f2 100644 --- a/club/forms.py +++ b/club/forms.py @@ -29,7 +29,7 @@ from django.utils.translation import gettext_lazy as _ from club.models import Club, Mailing, MailingSubscription, Membership from core.models import User -from core.views.forms import SelectDate, TzAwareDateTimeField +from core.views.forms import SelectDate, SelectDateTime from counter.models import Counter @@ -155,8 +155,12 @@ class MailingForm(forms.Form): class SellingsForm(forms.Form): - begin_date = TzAwareDateTimeField(label=_("Begin date"), required=False) - end_date = TzAwareDateTimeField(label=_("End date"), required=False) + begin_date = forms.DateTimeField( + label=_("Begin date"), widget=SelectDateTime, required=False + ) + end_date = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=False + ) counters = forms.ModelMultipleChoiceField( Counter.objects.order_by("name").all(), label=_("Counter"), required=False diff --git a/com/views.py b/com/views.py index 646b25c2..5d8380d7 100644 --- a/com/views.py +++ b/com/views.py @@ -50,7 +50,7 @@ from core.views import ( QuickNotifMixin, TabedViewMixin, ) -from core.views.forms import MarkdownInput, TzAwareDateTimeField +from core.views.forms import MarkdownInput, SelectDateTime # Sith object @@ -72,12 +72,15 @@ class PosterForm(forms.ModelForm): widgets = {"screens": forms.CheckboxSelectMultiple} help_texts = {"file": _("Format: 16:9 | Resolution: 1920x1080")} - date_begin = TzAwareDateTimeField( + date_begin = forms.DateTimeField( label=_("Start date"), + widget=SelectDateTime, required=True, initial=timezone.now().strftime("%Y-%m-%d %H:%M:%S"), ) - date_end = TzAwareDateTimeField(label=_("End date"), required=False) + date_end = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=False + ) def __init__(self, *args, **kwargs): self.user = kwargs.pop("user", None) @@ -191,9 +194,13 @@ class NewsForm(forms.ModelForm): "content": MarkdownInput, } - start_date = TzAwareDateTimeField(label=_("Start date"), required=False) - end_date = TzAwareDateTimeField(label=_("End date"), required=False) - until = TzAwareDateTimeField(label=_("Until"), required=False) + start_date = forms.DateTimeField( + label=_("Start date"), widget=SelectDateTime, required=False + ) + end_date = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=False + ) + until = forms.DateTimeField(label=_("Until"), widget=SelectDateTime, required=False) automoderation = forms.BooleanField(label=_("Automoderation"), required=False) @@ -258,7 +265,7 @@ class NewsEditView(CanEditMixin, UpdateView): def post(self, request, *args, **kwargs): form = self.get_form() - if form.is_valid() and "preview" not in request.POST.keys(): + if form.is_valid() and "preview" not in request.POST: return self.form_valid(form) else: return self.form_invalid(form) diff --git a/core/static/core/jquery.datetimepicker.min.css b/core/static/core/jquery.datetimepicker.min.css deleted file mode 100644 index e3e02e2b..00000000 --- a/core/static/core/jquery.datetimepicker.min.css +++ /dev/null @@ -1 +0,0 @@ -.xdsoft_datetimepicker{box-shadow:0 5px 15px -5px rgba(0,0,0,0.506);background:#fff;border-bottom:1px solid #bbb;border-left:1px solid #ccc;border-right:1px solid #ccc;border-top:1px solid #ccc;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;padding:8px;padding-left:0;padding-top:2px;position:absolute;z-index:9999;-moz-box-sizing:border-box;box-sizing:border-box;display:none}.xdsoft_datetimepicker.xdsoft_rtl{padding:8px 0 8px 8px}.xdsoft_datetimepicker iframe{position:absolute;left:0;top:0;width:75px;height:210px;background:transparent;border:0}.xdsoft_datetimepicker button{border:none !important}.xdsoft_noselect{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.xdsoft_noselect::selection{background:transparent}.xdsoft_noselect::-moz-selection{background:transparent}.xdsoft_datetimepicker.xdsoft_inline{display:inline-block;position:static;box-shadow:none}.xdsoft_datetimepicker *{-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin:0}.xdsoft_datetimepicker .xdsoft_datepicker,.xdsoft_datetimepicker .xdsoft_timepicker{display:none}.xdsoft_datetimepicker .xdsoft_datepicker.active,.xdsoft_datetimepicker .xdsoft_timepicker.active{display:block}.xdsoft_datetimepicker .xdsoft_datepicker{width:224px;float:left;margin-left:8px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_datepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_datepicker{width:256px}.xdsoft_datetimepicker .xdsoft_timepicker{width:58px;float:left;text-align:center;margin-left:8px;margin-top:0}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker .xdsoft_datepicker.active+.xdsoft_timepicker{margin-top:8px;margin-bottom:3px}.xdsoft_datetimepicker .xdsoft_monthpicker{position:relative;text-align:center}.xdsoft_datetimepicker .xdsoft_label i,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Q0NBRjI1NjM0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Q0NBRjI1NjQ0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDQ0FGMjU2MTQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDQ0FGMjU2MjQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoNEP54AAAIOSURBVHja7Jq9TsMwEMcxrZD4WpBYeKUCe+kTMCACHZh4BFfHO/AAIHZGFhYkBBsSEqxsLCAgXKhbXYOTxh9pfJVP+qutnZ5s/5Lz2Y5I03QhWji2GIcgAokWgfCxNvcOCCGKqiSqhUp0laHOne05vdEyGMfkdxJDVjgwDlEQgYQBgx+ULJaWSXXS6r/ER5FBVR8VfGftTKcITNs+a1XpcFoExREIDF14AVIFxgQUS+h520cdud6wNkC0UBw6BCO/HoCYwBhD8QCkQ/x1mwDyD4plh4D6DDV0TAGyo4HcawLIBBSLDkHeH0Mg2yVP3l4TQMZQDDsEOl/MgHQqhMNuE0D+oBh0CIr8MAKyazBH9WyBuKxDWgbXfjNf32TZ1KWm/Ap1oSk/R53UtQ5xTh3LUlMmT8gt6g51Q9p+SobxgJQ/qmsfZhWywGFSl0yBjCLJCMgXail3b7+rumdVJ2YRss4cN+r6qAHDkPWjPjdJCF4n9RmAD/V9A/Wp4NQassDjwlB6XBiCxcJQWmZZb8THFilfy/lfrTvLghq2TqTHrRMTKNJ0sIhdo15RT+RpyWwFdY96UZ/LdQKBGjcXpcc1AlSFEfLmouD+1knuxBDUVrvOBmoOC/rEcN7OQxKVeJTCiAdUzUJhA2Oez9QTkp72OTVcxDcXY8iKNkxGAJXmJCOQwOa6dhyXsOa6XwEGAKdeb5ET3rQdAAAAAElFTkSuQmCC)}.xdsoft_datetimepicker .xdsoft_label i{opacity:.5;background-position:-92px -19px;display:inline-block;width:9px;height:20px;vertical-align:middle}.xdsoft_datetimepicker .xdsoft_prev{float:left;background-position:-20px 0}.xdsoft_datetimepicker .xdsoft_today_button{float:left;background-position:-70px 0;margin-left:5px}.xdsoft_datetimepicker .xdsoft_next{float:right;background-position:0 0}.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_today_button{background-color:transparent;background-repeat:no-repeat;border:0 none;cursor:pointer;display:block;height:30px;opacity:.5;-ms-filter:"alpha(opacity=50)";outline:medium none;overflow:hidden;padding:0;position:relative;text-indent:100%;white-space:nowrap;width:20px;min-width:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_next{float:none;background-position:-40px -15px;height:15px;width:30px;display:block;margin-left:14px;margin-top:7px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_next{float:none;margin-left:0;margin-right:14px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev{background-position:-40px 0;margin-bottom:7px;margin-top:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box{height:151px;overflow:hidden;border-bottom:1px solid #ddd}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div{background:#f5f5f5;border-top:1px solid #ddd;color:#666;font-size:12px;text-align:center;border-collapse:collapse;cursor:pointer;border-bottom-width:0;height:25px;line-height:25px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:first-child{border-top-width:0}.xdsoft_datetimepicker .xdsoft_today_button:hover,.xdsoft_datetimepicker .xdsoft_next:hover,.xdsoft_datetimepicker .xdsoft_prev:hover{opacity:1;-ms-filter:"alpha(opacity=100)"}.xdsoft_datetimepicker .xdsoft_label{display:inline;position:relative;z-index:9999;margin:0;padding:5px 3px;font-size:14px;line-height:20px;font-weight:bold;background-color:#fff;float:left;width:182px;text-align:center;cursor:pointer}.xdsoft_datetimepicker .xdsoft_label:hover>span{text-decoration:underline}.xdsoft_datetimepicker .xdsoft_label:hover i{opacity:1.0}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select{border:1px solid #ccc;position:absolute;right:0;top:30px;z-index:101;display:none;background:#fff;max-height:160px;overflow-y:hidden}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_monthselect{right:-7px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_yearselect{right:2px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#fff;background:#ff8000}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option{padding:2px 10px 2px 5px;text-decoration:none !important}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_month{width:100px;text-align:right}.xdsoft_datetimepicker .xdsoft_calendar{clear:both}.xdsoft_datetimepicker .xdsoft_year{width:48px;margin-left:5px}.xdsoft_datetimepicker .xdsoft_calendar table{border-collapse:collapse;width:100%}.xdsoft_datetimepicker .xdsoft_calendar td>div{padding-right:5px}.xdsoft_datetimepicker .xdsoft_calendar th{height:25px}.xdsoft_datetimepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_calendar th{width:14.2857142%;background:#f5f5f5;border:1px solid #ddd;color:#666;font-size:12px;text-align:right;vertical-align:middle;padding:0;border-collapse:collapse;cursor:pointer;height:25px}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar th{width:12.5%}.xdsoft_datetimepicker .xdsoft_calendar th{background:#f1f1f1}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_today{color:#3af}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_time_box>div>div.xdsoft_disabled{opacity:.5;-ms-filter:"alpha(opacity=50)";cursor:default}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{opacity:.2;-ms-filter:"alpha(opacity=20)"}.xdsoft_datetimepicker .xdsoft_calendar td:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#fff !important;background:#ff8000 !important;box-shadow:none !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current.xdsoft_disabled:hover{background:#3af !important;box-shadow:#178fe5 0 1px 3px 0 inset !important;color:#fff !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_disabled:hover{color:inherit !important;background:inherit !important;box-shadow:inherit !important}.xdsoft_datetimepicker .xdsoft_calendar th{font-weight:700;text-align:center;color:#999;cursor:default}.xdsoft_datetimepicker .xdsoft_copyright{color:#ccc !important;font-size:10px;clear:both;float:none;margin-left:8px}.xdsoft_datetimepicker .xdsoft_copyright a{color:#eee !important}.xdsoft_datetimepicker .xdsoft_copyright a:hover{color:#aaa !important}.xdsoft_time_box{position:relative;border:1px solid #ccc}.xdsoft_scrollbar>.xdsoft_scroller{background:#ccc !important;height:20px;border-radius:3px}.xdsoft_scrollbar{position:absolute;width:7px;right:0;top:0;bottom:0;cursor:pointer}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_scrollbar{left:0;right:auto}.xdsoft_scroller_box{position:relative}.xdsoft_datetimepicker.xdsoft_dark{box-shadow:0 5px 15px -5px rgba(255,255,255,0.506);background:#000;border-bottom:1px solid #444;border-left:1px solid #333;border-right:1px solid #333;border-top:1px solid #333;color:#ccc}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box{border-bottom:1px solid #222}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div{background:#0a0a0a;border-top:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label{background-color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select{border:1px solid #333;background:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#000;background:#007fff}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label i,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_next,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUExQUUzOTA0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUExQUUzOTE0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQTFBRTM4RTQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQTFBRTM4RjQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pp0VxGEAAAIASURBVHja7JrNSgMxEMebtgh+3MSLr1T1Xn2CHoSKB08+QmR8Bx9A8e7RixdB9CKCoNdexIugxFlJa7rNZneTbLIpM/CnNLsdMvNjM8l0mRCiQ9Ye61IKCAgZAUnH+mU3MMZaHYChBnJUDzWOFZdVfc5+ZFLbrWDeXPwbxIqrLLfaeS0hEBVGIRQCEiZoHQwtlGSByCCdYBl8g8egTTAWoKQMRBRBcZxYlhzhKegqMOageErsCHVkk3hXIFooDgHB1KkHIHVgzKB4ADJQ/A1jAFmAYhkQqA5TOBtocrKrgXwQA8gcFIuAIO8sQSA7hidvPwaQGZSaAYHOUWJABhWWw2EMIH9QagQERU4SArJXo0ZZL18uvaxejXt/Em8xjVBXmvFr1KVm/AJ10tRe2XnraNqaJvKE3KHuUbfK1E+VHB0q40/y3sdQSxY4FHWeKJCunP8UyDdqJZenT3ntVV5jIYCAh20vT7ioP8tpf6E2lfEMwERe+whV1MHjwZB7PBiCxcGQWwKZKD62lfGNnP/1poFAA60T7rF1UgcKd2id3KDeUS+oLWV8DfWAepOfq00CgQabi9zjcgJVYVD7PVzQUAUGAQkbNJTBICDhgwYTjDYD6XeW08ZKh+A4pYkzenOxXUbvZcWz7E8ykRMnIHGX1XPl+1m2vPYpL+2qdb8CDAARlKFEz/ZVkAAAAABJRU5ErkJggg==)}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0a0a0a;border:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0e0e0e}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_today{color:#c50}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td:hover,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#000 !important;background:#007fff !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{color:#666}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright{color:#333 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a{color:#111 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a:hover{color:#555 !important}.xdsoft_dark .xdsoft_time_box{border:1px solid #333}.xdsoft_dark .xdsoft_scrollbar>.xdsoft_scroller{background:#333 !important}.xdsoft_datetimepicker .xdsoft_save_selected{display:block;border:1px solid #ddd !important;margin-top:5px;width:100%;color:#454551;font-size:13px}.xdsoft_datetimepicker .blue-gradient-button{font-family:"museo-sans","Book Antiqua",sans-serif;font-size:12px;font-weight:300;color:#82878c;height:28px;position:relative;padding:4px 17px 4px 33px;border:1px solid #d7d8da;background:-moz-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(73%,#f4f8fa));background:-webkit-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-o-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-ms-linear-gradient(top,#fff 0,#f4f8fa 73%);background:linear-gradient(to bottom,#fff 0,#f4f8fa 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff',endColorstr='#f4f8fa',GradientType=0)}.xdsoft_datetimepicker .blue-gradient-button:hover,.xdsoft_datetimepicker .blue-gradient-button:focus,.xdsoft_datetimepicker .blue-gradient-button:hover span,.xdsoft_datetimepicker .blue-gradient-button:focus span{color:#454551;background:-moz-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f4f8fa),color-stop(73%,#FFF));background:-webkit-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-o-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-ms-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:linear-gradient(to bottom,#f4f8fa 0,#FFF 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f8fa',endColorstr='#FFF',GradientType=0)} diff --git a/core/static/core/js/jquery.datetimepicker.full.min.js b/core/static/core/js/jquery.datetimepicker.full.min.js deleted file mode 100644 index a55d541c..00000000 --- a/core/static/core/js/jquery.datetimepicker.full.min.js +++ /dev/null @@ -1,2 +0,0 @@ -var DateFormatter;!function(){"use strict";var e,t,a,r,n,o;n=864e5,o=3600,e=function(e,t){return"string"==typeof e&&"string"==typeof t&&e.toLowerCase()===t.toLowerCase()},t=function(e,a,r){var n=r||"0",o=e.toString();return o.lengths?"20":"19")+i):4===f&&(y.year=s),h=!0;break;case"m":case"n":case"M":case"F":isNaN(i)?(d=p.monthsShort.indexOf(i),d>-1&&(y.month=d+1),d=p.months.indexOf(i),d>-1&&(y.month=d+1)):s>=1&&12>=s&&(y.month=s),h=!0;break;case"d":case"j":s>=1&&31>=s&&(y.day=s),h=!0;break;case"g":case"h":u=r.indexOf("a")>-1?r.indexOf("a"):r.indexOf("A")>-1?r.indexOf("A"):-1,c=n[u],u>-1?(l=e(c,p.meridiem[0])?0:e(c,p.meridiem[1])?12:-1,s>=1&&12>=s&&l>-1?y.hour=s+l:s>=0&&23>=s&&(y.hour=s)):s>=0&&23>=s&&(y.hour=s),g=!0;break;case"G":case"H":s>=0&&23>=s&&(y.hour=s),g=!0;break;case"i":s>=0&&59>=s&&(y.min=s),g=!0;break;case"s":s>=0&&59>=s&&(y.sec=s),g=!0}if(h===!0&&y.year&&y.month&&y.day)y.date=new Date(y.year,y.month-1,y.day,y.hour,y.min,y.sec,0);else{if(g!==!0)return!1;y.date=new Date(0,0,0,y.hour,y.min,y.sec,0)}return y.date},guessDate:function(e,t){if("string"!=typeof e)return e;var a,r,n,o,i=this,s=e.replace(i.separators,"\x00").split("\x00"),d=/^[djmn]/g,u=t.match(i.validParts),l=new Date,f=0;if(!d.test(u[0]))return e;for(r=0;r0&&s.splice(r+1,0,n.substr(f))}return l},parseFormat:function(e,a){var r,i=this,s=i.dateSettings,d=/\\?(.?)/gi,u=function(e,t){return r[e]?r[e]():t};return r={d:function(){return t(r.j(),2)},D:function(){return s.daysShort[r.w()]},j:function(){return a.getDate()},l:function(){return s.days[r.w()]},N:function(){return r.w()||7},w:function(){return a.getDay()},z:function(){var e=new Date(r.Y(),r.n()-1,r.j()),t=new Date(r.Y(),0,1);return Math.round((e-t)/n)},W:function(){var e=new Date(r.Y(),r.n()-1,r.j()-r.N()+3),a=new Date(e.getFullYear(),0,4);return t(1+Math.round((e-a)/n/7),2)},F:function(){return s.months[a.getMonth()]},m:function(){return t(r.n(),2)},M:function(){return s.monthsShort[a.getMonth()]},n:function(){return a.getMonth()+1},t:function(){return new Date(r.Y(),r.n(),0).getDate()},L:function(){var e=r.Y();return e%4===0&&e%100!==0||e%400===0?1:0},o:function(){var e=r.n(),t=r.W(),a=r.Y();return a+(12===e&&9>t?1:1===e&&t>9?-1:0)},Y:function(){return a.getFullYear()},y:function(){return r.Y().toString().slice(-2)},a:function(){return r.A().toLowerCase()},A:function(){var e=r.G()<12?0:1;return s.meridiem[e]},B:function(){var e=a.getUTCHours()*o,r=60*a.getUTCMinutes(),n=a.getUTCSeconds();return t(Math.floor((e+r+n+o)/86.4)%1e3,3)},g:function(){return r.G()%12||12},G:function(){return a.getHours()},h:function(){return t(r.g(),2)},H:function(){return t(r.G(),2)},i:function(){return t(a.getMinutes(),2)},s:function(){return t(a.getSeconds(),2)},u:function(){return t(1e3*a.getMilliseconds(),6)},e:function(){var e=/\((.*)\)/.exec(String(a))[1];return e||"Coordinated Universal Time"},T:function(){var e=(String(a).match(i.tzParts)||[""]).pop().replace(i.tzClip,"");return e||"UTC"},I:function(){var e=new Date(r.Y(),0),t=Date.UTC(r.Y(),0),a=new Date(r.Y(),6),n=Date.UTC(r.Y(),6);return e-t!==a-n?1:0},O:function(){var e=a.getTimezoneOffset(),r=Math.abs(e);return(e>0?"-":"+")+t(100*Math.floor(r/60)+r%60,4)},P:function(){var e=r.O();return e.substr(0,3)+":"+e.substr(3,2)},Z:function(){return 60*-a.getTimezoneOffset()},c:function(){return"Y-m-d\\TH:i:sP".replace(d,u)},r:function(){return"D, d M Y H:i:s O".replace(d,u)},U:function(){return a.getTime()/1e3||0}},u(e,e)},formatDate:function(e,t){var a,r,n,o,i,s=this,d="";if("string"==typeof e&&(e=s.parseDate(e,t),e===!1))return!1;if(e instanceof Date){for(n=t.length,a=0;n>a;a++)i=t.charAt(a),"S"!==i&&(o=s.parseFormat(i,e),a!==n-1&&s.intParts.test(i)&&"S"===t.charAt(a+1)&&(r=parseInt(o),o+=s.dateSettings.ordinal(r)),d+=o);return d}return""}}}(),function(e){"function"==typeof define&&define.amd?define(["jquery","jquery-mousewheel"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(e){"use strict";function t(e,t,a){this.date=e,this.desc=t,this.style=a}var a={i18n:{ar:{months:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],dayOfWeekShort:["ن","ث","ع","خ","ج","س","ح"],dayOfWeek:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت","الأحد"]},ro:{months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],dayOfWeekShort:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],dayOfWeek:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"]},id:{months:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],dayOfWeekShort:["Min","Sen","Sel","Rab","Kam","Jum","Sab"],dayOfWeek:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"]},is:{months:["Janúar","Febrúar","Mars","Apríl","Maí","Júní","Júlí","Ágúst","September","Október","Nóvember","Desember"],dayOfWeekShort:["Sun","Mán","Þrið","Mið","Fim","Fös","Lau"],dayOfWeek:["Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur"]},bg:{months:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],dayOfWeekShort:["Нд","Пн","Вт","Ср","Чт","Пт","Сб"],dayOfWeek:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"]},fa:{months:["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],dayOfWeekShort:["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],dayOfWeek:["یک‌شنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنج‌شنبه","جمعه","شنبه","یک‌شنبه"]},ru:{months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],dayOfWeekShort:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],dayOfWeek:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"]},uk:{months:["Січень","Лютий","Березень","Квітень","Травень","Червень","Липень","Серпень","Вересень","Жовтень","Листопад","Грудень"],dayOfWeekShort:["Ндл","Пнд","Втр","Срд","Чтв","Птн","Сбт"],dayOfWeek:["Неділя","Понеділок","Вівторок","Середа","Четвер","П'ятниця","Субота"]},en:{months:["January","February","March","April","May","June","July","August","September","October","November","December"],dayOfWeekShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayOfWeek:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},el:{months:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],dayOfWeekShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],dayOfWeek:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"]},de:{months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],dayOfWeekShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayOfWeek:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"]},nl:{months:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],dayOfWeekShort:["zo","ma","di","wo","do","vr","za"],dayOfWeek:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"]},tr:{months:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],dayOfWeekShort:["Paz","Pts","Sal","Çar","Per","Cum","Cts"],dayOfWeek:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"]},fr:{months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],dayOfWeekShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],dayOfWeek:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"]},es:{months:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],dayOfWeekShort:["Dom","Lun","Mar","Mié","Jue","Vie","Sáb"],dayOfWeek:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"]},th:{months:["มกราคม","กุมภาพันธ์","มีนาคม","เมษายน","พฤษภาคม","มิถุนายน","กรกฎาคม","สิงหาคม","กันยายน","ตุลาคม","พฤศจิกายน","ธันวาคม"],dayOfWeekShort:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],dayOfWeek:["อาทิตย์","จันทร์","อังคาร","พุธ","พฤหัส","ศุกร์","เสาร์","อาทิตย์"]},pl:{months:["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],dayOfWeekShort:["nd","pn","wt","śr","cz","pt","sb"],dayOfWeek:["niedziela","poniedziałek","wtorek","środa","czwartek","piątek","sobota"]},pt:{months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],dayOfWeekShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sab"],dayOfWeek:["Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado"]},ch:{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"]},se:{months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],dayOfWeekShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"]},kr:{months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayOfWeekShort:["일","월","화","수","목","금","토"],dayOfWeek:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"]},it:{months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],dayOfWeekShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],dayOfWeek:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"]},da:{months:["January","Februar","Marts","April","Maj","Juni","July","August","September","Oktober","November","December"],dayOfWeekShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayOfWeek:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"]},no:{months:["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],dayOfWeekShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayOfWeek:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"]},ja:{months:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayOfWeekShort:["日","月","火","水","木","金","土"],dayOfWeek:["日曜","月曜","火曜","水曜","木曜","金曜","土曜"]},vi:{months:["Tháng 1","Tháng 2","Tháng 3","Tháng 4","Tháng 5","Tháng 6","Tháng 7","Tháng 8","Tháng 9","Tháng 10","Tháng 11","Tháng 12"],dayOfWeekShort:["CN","T2","T3","T4","T5","T6","T7"],dayOfWeek:["Chủ nhật","Thứ hai","Thứ ba","Thứ tư","Thứ năm","Thứ sáu","Thứ bảy"]},sl:{months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],dayOfWeekShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],dayOfWeek:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"]},cs:{months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],dayOfWeekShort:["Ne","Po","Út","St","Čt","Pá","So"]},hu:{months:["Január","Február","Március","Április","Május","Június","Július","Augusztus","Szeptember","Október","November","December"],dayOfWeekShort:["Va","Hé","Ke","Sze","Cs","Pé","Szo"],dayOfWeek:["vasárnap","hétfő","kedd","szerda","csütörtök","péntek","szombat"]},az:{months:["Yanvar","Fevral","Mart","Aprel","May","Iyun","Iyul","Avqust","Sentyabr","Oktyabr","Noyabr","Dekabr"],dayOfWeekShort:["B","Be","Ça","Ç","Ca","C","Ş"],dayOfWeek:["Bazar","Bazar ertəsi","Çərşənbə axşamı","Çərşənbə","Cümə axşamı","Cümə","Şənbə"]},bs:{months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],dayOfWeekShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayOfWeek:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"]},ca:{months:["Gener","Febrer","Març","Abril","Maig","Juny","Juliol","Agost","Setembre","Octubre","Novembre","Desembre"],dayOfWeekShort:["Dg","Dl","Dt","Dc","Dj","Dv","Ds"],dayOfWeek:["Diumenge","Dilluns","Dimarts","Dimecres","Dijous","Divendres","Dissabte"]},"en-GB":{months:["January","February","March","April","May","June","July","August","September","October","November","December"],dayOfWeekShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayOfWeek:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},et:{months:["Jaanuar","Veebruar","Märts","Aprill","Mai","Juuni","Juuli","August","September","Oktoober","November","Detsember"],dayOfWeekShort:["P","E","T","K","N","R","L"],dayOfWeek:["Pühapäev","Esmaspäev","Teisipäev","Kolmapäev","Neljapäev","Reede","Laupäev"]},eu:{months:["Urtarrila","Otsaila","Martxoa","Apirila","Maiatza","Ekaina","Uztaila","Abuztua","Iraila","Urria","Azaroa","Abendua"],dayOfWeekShort:["Ig.","Al.","Ar.","Az.","Og.","Or.","La."],dayOfWeek:["Igandea","Astelehena","Asteartea","Asteazkena","Osteguna","Ostirala","Larunbata"]},fi:{months:["Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu","Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu"],dayOfWeekShort:["Su","Ma","Ti","Ke","To","Pe","La"],dayOfWeek:["sunnuntai","maanantai","tiistai","keskiviikko","torstai","perjantai","lauantai"]},gl:{months:["Xan","Feb","Maz","Abr","Mai","Xun","Xul","Ago","Set","Out","Nov","Dec"],dayOfWeekShort:["Dom","Lun","Mar","Mer","Xov","Ven","Sab"],dayOfWeek:["Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado"]},hr:{months:["Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj","Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac"],dayOfWeekShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayOfWeek:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"]},ko:{months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayOfWeekShort:["일","월","화","수","목","금","토"],dayOfWeek:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"]},lt:{months:["Sausio","Vasario","Kovo","Balandžio","Gegužės","Birželio","Liepos","Rugpjūčio","Rugsėjo","Spalio","Lapkričio","Gruodžio"],dayOfWeekShort:["Sek","Pir","Ant","Tre","Ket","Pen","Šeš"],dayOfWeek:["Sekmadienis","Pirmadienis","Antradienis","Trečiadienis","Ketvirtadienis","Penktadienis","Šeštadienis"]},lv:{months:["Janvāris","Februāris","Marts","Aprīlis ","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],dayOfWeekShort:["Sv","Pr","Ot","Tr","Ct","Pk","St"],dayOfWeek:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"]},mk:{months:["јануари","февруари","март","април","мај","јуни","јули","август","септември","октомври","ноември","декември"],dayOfWeekShort:["нед","пон","вто","сре","чет","пет","саб"],dayOfWeek:["Недела","Понеделник","Вторник","Среда","Четврток","Петок","Сабота"]},mn:{months:["1-р сар","2-р сар","3-р сар","4-р сар","5-р сар","6-р сар","7-р сар","8-р сар","9-р сар","10-р сар","11-р сар","12-р сар"],dayOfWeekShort:["Дав","Мяг","Лха","Пүр","Бсн","Бям","Ням"],dayOfWeek:["Даваа","Мягмар","Лхагва","Пүрэв","Баасан","Бямба","Ням"]},"pt-BR":{months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],dayOfWeekShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayOfWeek:["Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado"]},sk:{months:["Január","Február","Marec","Apríl","Máj","Jún","Júl","August","September","Október","November","December"],dayOfWeekShort:["Ne","Po","Ut","St","Št","Pi","So"],dayOfWeek:["Nedeľa","Pondelok","Utorok","Streda","Štvrtok","Piatok","Sobota"]},sq:{months:["Janar","Shkurt","Mars","Prill","Maj","Qershor","Korrik","Gusht","Shtator","Tetor","Nëntor","Dhjetor"],dayOfWeekShort:["Die","Hën","Mar","Mër","Enj","Pre","Shtu"],dayOfWeek:["E Diel","E Hënë","E Martē","E Mërkurë","E Enjte","E Premte","E Shtunë"]},"sr-YU":{months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],dayOfWeekShort:["Ned","Pon","Uto","Sre","čet","Pet","Sub"],dayOfWeek:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"]},sr:{months:["јануар","фебруар","март","април","мај","јун","јул","август","септембар","октобар","новембар","децембар"],dayOfWeekShort:["нед","пон","уто","сре","чет","пет","суб"],dayOfWeek:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"]},sv:{months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],dayOfWeekShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],dayOfWeek:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"]},"zh-TW":{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"],dayOfWeek:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"]},zh:{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"],dayOfWeek:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"]},he:{months:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],dayOfWeekShort:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],dayOfWeek:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת","ראשון"]},hy:{months:["Հունվար","Փետրվար","Մարտ","Ապրիլ","Մայիս","Հունիս","Հուլիս","Օգոստոս","Սեպտեմբեր","Հոկտեմբեր","Նոյեմբեր","Դեկտեմբեր"],dayOfWeekShort:["Կի","Երկ","Երք","Չոր","Հնգ","Ուրբ","Շբթ"],dayOfWeek:["Կիրակի","Երկուշաբթի","Երեքշաբթի","Չորեքշաբթի","Հինգշաբթի","Ուրբաթ","Շաբաթ"]},kg:{months:["Үчтүн айы","Бирдин айы","Жалган Куран","Чын Куран","Бугу","Кулжа","Теке","Баш Оона","Аяк Оона","Тогуздун айы","Жетинин айы","Бештин айы"],dayOfWeekShort:["Жек","Дүй","Шей","Шар","Бей","Жум","Ише"],dayOfWeek:["Жекшемб","Дүйшөмб","Шейшемб","Шаршемб","Бейшемби","Жума","Ишенб"]},rm:{months:["Schaner","Favrer","Mars","Avrigl","Matg","Zercladur","Fanadur","Avust","Settember","October","November","December"],dayOfWeekShort:["Du","Gli","Ma","Me","Gie","Ve","So"],dayOfWeek:["Dumengia","Glindesdi","Mardi","Mesemna","Gievgia","Venderdi","Sonda"]},ka:{months:["იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი","ივლისი","აგვისტო","სექტემბერი","ოქტომბერი","ნოემბერი","დეკემბერი"],dayOfWeekShort:["კვ","ორშ","სამშ","ოთხ","ხუთ","პარ","შაბ"],dayOfWeek:["კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი"]}},value:"",rtl:!1,format:"Y/m/d H:i",formatTime:"H:i",formatDate:"Y/m/d",startDate:!1,step:60,monthChangeSpinner:!0,closeOnDateSelect:!1,closeOnTimeSelect:!0,closeOnWithoutClick:!0,closeOnInputClick:!0,timepicker:!0,datepicker:!0,weeks:!1,defaultTime:!1,defaultDate:!1,minDate:!1,maxDate:!1,minTime:!1,maxTime:!1,disabledMinTime:!1,disabledMaxTime:!1,allowTimes:[],opened:!1,initTime:!0,inline:!1,theme:"",onSelectDate:function(){},onSelectTime:function(){},onChangeMonth:function(){},onGetWeekOfYear:function(){},onChangeYear:function(){},onChangeDateTime:function(){},onShow:function(){},onClose:function(){},onGenerate:function(){},withoutCopyright:!0,inverseButton:!1,hours12:!1,next:"xdsoft_next",prev:"xdsoft_prev",dayOfWeekStart:0,parentID:"body",timeHeightInTimePicker:25,timepickerScrollbar:!0,todayButton:!0,prevButton:!0,nextButton:!0,defaultSelect:!0,scrollMonth:!0,scrollTime:!0,scrollInput:!0,lazyInit:!1,mask:!1,validateOnBlur:!0,allowBlank:!0,yearStart:1950,yearEnd:2050,monthStart:0,monthEnd:11,style:"",id:"",fixed:!1,roundTime:"round",className:"",weekends:[],highlightedDates:[],highlightedPeriods:[],allowDates:[],allowDateRe:null,disabledDates:[],disabledWeekDays:[],yearOffset:0,beforeShowDay:null,enterLikeTab:!0,showApplyButton:!1},r=null,n="en",o="en",i={meridiem:["AM","PM"]},s=function(){var t=a.i18n[o],n={days:t.dayOfWeek,daysShort:t.dayOfWeekShort,months:t.months,monthsShort:e.map(t.months,function(e){return e.substring(0,3)})};r=new DateFormatter({dateSettings:e.extend({},i,n)})};e.datetimepicker={setLocale:function(e){var t=a.i18n[e]?e:n;o!=t&&(o=t,s())},setDateFormatter:function(e){r=e},RFC_2822:"D, d M Y H:i:s O",ATOM:"Y-m-dTH:i:sP",ISO_8601:"Y-m-dTH:i:sO",RFC_822:"D, d M y H:i:s O",RFC_850:"l, d-M-y H:i:s T",RFC_1036:"D, d M y H:i:s O",RFC_1123:"D, d M Y H:i:s O",RSS:"D, d M Y H:i:s O",W3C:"Y-m-dTH:i:sP"},s(),window.getComputedStyle||(window.getComputedStyle=function(e){return this.el=e,this.getPropertyValue=function(t){var a=/(\-([a-z]){1})/g;return"float"===t&&(t="styleFloat"),a.test(t)&&(t=t.replace(a,function(e,t,a){return a.toUpperCase()})),e.currentStyle[t]||null},this}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e,t){var a,r;for(a=t||0,r=this.length;r>a;a+=1)if(this[a]===e)return a;return-1}),Date.prototype.countDaysInMonth=function(){return new Date(this.getFullYear(),this.getMonth()+1,0).getDate()},e.fn.xdsoftScroller=function(t){return this.each(function(){var a,r,n,o,i,s=e(this),d=function(e){var t,a={x:0,y:0};return"touchstart"===e.type||"touchmove"===e.type||"touchend"===e.type||"touchcancel"===e.type?(t=e.originalEvent.touches[0]||e.originalEvent.changedTouches[0],a.x=t.clientX,a.y=t.clientY):("mousedown"===e.type||"mouseup"===e.type||"mousemove"===e.type||"mouseover"===e.type||"mouseout"===e.type||"mouseenter"===e.type||"mouseleave"===e.type)&&(a.x=e.clientX,a.y=e.clientY),a},u=100,l=!1,f=0,c=0,m=0,h=!1,g=0,p=function(){};return"hide"===t?void s.find(".xdsoft_scrollbar").hide():(e(this).hasClass("xdsoft_scroller_box")||(a=s.children().eq(0),r=s[0].clientHeight,n=a[0].offsetHeight,o=e('
'),i=e('
'),o.append(i),s.addClass("xdsoft_scroller_box").append(o),p=function(e){var t=d(e).y-f+g;0>t&&(t=0),t+i[0].offsetHeight>m&&(t=m-i[0].offsetHeight),s.trigger("scroll_element.xdsoft_scroller",[u?t/u:0])},i.on("touchstart.xdsoft_scroller mousedown.xdsoft_scroller",function(a){r||s.trigger("resize_scroll.xdsoft_scroller",[t]),f=d(a).y,g=parseInt(i.css("margin-top"),10),m=o[0].offsetHeight,"mousedown"===a.type||"touchstart"===a.type?(document&&e(document.body).addClass("xdsoft_noselect"),e([document.body,window]).on("touchend mouseup.xdsoft_scroller",function n(){e([document.body,window]).off("touchend mouseup.xdsoft_scroller",n).off("mousemove.xdsoft_scroller",p).removeClass("xdsoft_noselect")}),e(document.body).on("mousemove.xdsoft_scroller",p)):(h=!0,a.stopPropagation(),a.preventDefault())}).on("touchmove",function(e){h&&(e.preventDefault(),p(e))}).on("touchend touchcancel",function(){h=!1,g=0}),s.on("scroll_element.xdsoft_scroller",function(e,t){r||s.trigger("resize_scroll.xdsoft_scroller",[t,!0]),t=t>1?1:0>t||isNaN(t)?0:t,i.css("margin-top",u*t),setTimeout(function(){a.css("marginTop",-parseInt((a[0].offsetHeight-r)*t,10))},10)}).on("resize_scroll.xdsoft_scroller",function(e,t,d){var l,f;r=s[0].clientHeight,n=a[0].offsetHeight,l=r/n,f=l*o[0].offsetHeight,l>1?i.hide():(i.show(),i.css("height",parseInt(f>10?f:10,10)),u=o[0].offsetHeight-i[0].offsetHeight,d!==!0&&s.trigger("scroll_element.xdsoft_scroller",[t||Math.abs(parseInt(a.css("marginTop"),10))/(n-r)]))}),s.on("mousewheel",function(e){var t=Math.abs(parseInt(a.css("marginTop"),10));return t-=20*e.deltaY,0>t&&(t=0),s.trigger("scroll_element.xdsoft_scroller",[t/(n-r)]),e.stopPropagation(),!1}),s.on("touchstart",function(e){l=d(e),c=Math.abs(parseInt(a.css("marginTop"),10))}),s.on("touchmove",function(e){if(l){e.preventDefault();var t=d(e);s.trigger("scroll_element.xdsoft_scroller",[(c-(t.y-l.y))/(n-r)])}}),s.on("touchend touchcancel",function(){l=!1,c=0})),void s.trigger("resize_scroll.xdsoft_scroller",[t]))})},e.fn.datetimepicker=function(n,i){var s,d,u=this,l=48,f=57,c=96,m=105,h=17,g=46,p=13,y=27,v=8,b=37,D=38,k=39,x=40,T=9,S=116,w=65,O=67,M=86,_=90,W=89,F=!1,C=e.isPlainObject(n)||!n?e.extend(!0,{},a,n):e.extend(!0,{},a),P=0,A=function(e){e.on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function t(){e.is(":disabled")||e.data("xdsoft_datetimepicker")||(clearTimeout(P),P=setTimeout(function(){e.data("xdsoft_datetimepicker")||s(e),e.off("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",t).trigger("open.xdsoft")},100))})};return s=function(a){function i(){var e,t=!1;return C.startDate?t=j.strToDate(C.startDate):(t=C.value||(a&&a.val&&a.val()?a.val():""),t?t=j.strToDateTime(t):C.defaultDate&&(t=j.strToDateTime(C.defaultDate),C.defaultTime&&(e=j.strtotime(C.defaultTime),t.setHours(e.getHours()),t.setMinutes(e.getMinutes())))),t&&j.isValidDate(t)?J.data("changed",!0):t="",t||0}function s(t){var r=function(e,t){var a=e.replace(/([\[\]\/\{\}\(\)\-\.\+]{1})/g,"\\$1").replace(/_/g,"{digit+}").replace(/([0-9]{1})/g,"{digit$1}").replace(/\{digit([0-9]{1})\}/g,"[0-$1_]{1}").replace(/\{digit[\+]\}/g,"[0-9_]{1}");return new RegExp(a).test(t)},n=function(e){try{if(document.selection&&document.selection.createRange){var t=document.selection.createRange();return t.getBookmark().charCodeAt(2)-2}if(e.setSelectionRange)return e.selectionStart}catch(a){return 0}},o=function(e,t){if(e="string"==typeof e||e instanceof String?document.getElementById(e):e,!e)return!1;if(e.createTextRange){var a=e.createTextRange();return a.collapse(!0),a.moveEnd("character",t),a.moveStart("character",t),a.select(),!0}return e.setSelectionRange?(e.setSelectionRange(t,t),!0):!1};t.mask&&a.off("keydown.xdsoft"),t.mask===!0&&(t.mask="undefined"!=typeof moment?t.format.replace(/Y{4}/g,"9999").replace(/Y{2}/g,"99").replace(/M{2}/g,"19").replace(/D{2}/g,"39").replace(/H{2}/g,"29").replace(/m{2}/g,"59").replace(/s{2}/g,"59"):t.format.replace(/Y/g,"9999").replace(/F/g,"9999").replace(/m/g,"19").replace(/d/g,"39").replace(/H/g,"29").replace(/i/g,"59").replace(/s/g,"59")),"string"===e.type(t.mask)&&(r(t.mask,a.val())||(a.val(t.mask.replace(/[0-9]/g,"_")),o(a[0],0)),a.on("keydown.xdsoft",function(i){var s,d,u=this.value,C=i.which;if(C>=l&&f>=C||C>=c&&m>=C||C===v||C===g){for(s=n(this),d=C!==v&&C!==g?String.fromCharCode(C>=c&&m>=C?C-l:C):"_",C!==v&&C!==g||!s||(s-=1,d="_");/[^0-9_]/.test(t.mask.substr(s,1))&&s0;)s+=C===v||C===g?-1:1;if(u=u.substr(0,s)+d+u.substr(s+1),""===e.trim(u))u=t.mask.replace(/[0-9]/g,"_");else if(s===t.mask.length)return i.preventDefault(),!1;for(s+=C===v||C===g?0:1;/[^0-9_]/.test(t.mask.substr(s,1))&&s0;)s+=C===v||C===g?-1:1;r(t.mask,u)?(this.value=u,o(this,s)):""===e.trim(u)?this.value=t.mask.replace(/[0-9]/g,"_"):a.trigger("error_input.xdsoft")}else if(-1!==[w,O,M,_,W].indexOf(C)&&F||-1!==[y,D,x,b,k,S,h,T,p].indexOf(C))return!0;return i.preventDefault(),!1}))}var d,u,P,A,Y,j,H,J=e('
'),z=e('
xdsoft.net
'),I=e('
'),N=e('
'),L=e('
'),E=e('
'),R=E.find(".xdsoft_time_box").eq(0),B=e('
'),V=e(''),G=e('
'),U=e('
'),q=!1,X=0;C.id&&J.attr("id",C.id),C.style&&J.attr("style",C.style),C.weeks&&J.addClass("xdsoft_showweeks"),C.rtl&&J.addClass("xdsoft_rtl"),J.addClass("xdsoft_"+C.theme),J.addClass(C.className),N.find(".xdsoft_month span").after(G),N.find(".xdsoft_year span").after(U),N.find(".xdsoft_month,.xdsoft_year").on("touchstart mousedown.xdsoft",function(t){var a,r,n=e(this).find(".xdsoft_select").eq(0),o=0,i=0,s=n.is(":visible");for(N.find(".xdsoft_select").hide(),j.currentTime&&(o=j.currentTime[e(this).hasClass("xdsoft_month")?"getMonth":"getFullYear"]()),n[s?"hide":"show"](),a=n.find("div.xdsoft_option"),r=0;r=i;)u=new t(i,d,c),l=r.formatDate(i,C.formatDate),i.setDate(i.getDate()+1),void 0!==o[l]?(f=o[l].desc,f&&f.length&&u.desc&&u.desc.length&&(o[l].desc=f+"\n"+u.desc)):o[l]=u}),C.highlightedDates=e.extend(!0,[],o)),n.disabledDates&&e.isArray(n.disabledDates)&&n.disabledDates.length&&(C.disabledDates=e.extend(!0,[],n.disabledDates)),n.disabledWeekDays&&e.isArray(n.disabledWeekDays)&&n.disabledWeekDays.length&&(C.disabledWeekDays=e.extend(!0,[],n.disabledWeekDays)),!C.open&&!C.opened||C.inline||a.trigger("open.xdsoft"),C.inline&&(q=!0,J.addClass("xdsoft_inline"),a.after(J).hide()),C.inverseButton&&(C.next="xdsoft_prev",C.prev="xdsoft_next"),C.datepicker?I.addClass("active"):I.removeClass("active"),C.timepicker?E.addClass("active"):E.removeClass("active"),C.value&&(j.setCurrentTime(C.value),a&&a.val&&a.val(j.str)),C.dayOfWeekStart=isNaN(C.dayOfWeekStart)?0:parseInt(C.dayOfWeekStart,10)%7,C.timepickerScrollbar||R.xdsoftScroller("hide"),C.minDate&&/^[\+\-](.*)$/.test(C.minDate)&&(C.minDate=r.formatDate(j.strToDateTime(C.minDate),C.formatDate)),C.maxDate&&/^[\+\-](.*)$/.test(C.maxDate)&&(C.maxDate=r.formatDate(j.strToDateTime(C.maxDate),C.formatDate)),V.toggle(C.showApplyButton),N.find(".xdsoft_today_button").css("visibility",C.todayButton?"visible":"hidden"),N.find("."+C.prev).css("visibility",C.prevButton?"visible":"hidden"),N.find("."+C.next).css("visibility",C.nextButton?"visible":"hidden"),s(C),C.validateOnBlur&&a.off("blur.xdsoft").on("blur.xdsoft",function(){if(C.allowBlank&&(!e.trim(e(this).val()).length||"string"==typeof C.mask&&e.trim(e(this).val())===C.mask.replace(/[0-9]/g,"_")))e(this).val(null),J.data("xdsoft_datetime").empty();else{var t=r.parseDate(e(this).val(),C.format);if(t)e(this).val(r.formatDate(t,C.format));else{var a=+[e(this).val()[0],e(this).val()[1]].join(""),n=+[e(this).val()[2],e(this).val()[3]].join("");e(this).val(!C.datepicker&&C.timepicker&&a>=0&&24>a&&n>=0&&60>n?[a,n].map(function(e){return e>9?e:"0"+e}).join(":"):r.formatDate(j.now(),C.format))}J.data("xdsoft_datetime").setCurrentTime(e(this).val())}J.trigger("changedatetime.xdsoft"),J.trigger("close.xdsoft")}),C.dayOfWeekStartPrev=0===C.dayOfWeekStart?6:C.dayOfWeekStart-1,J.trigger("xchange.xdsoft").trigger("afterOpen.xdsoft")},J.data("options",C).on("touchstart mousedown.xdsoft",function(e){return e.stopPropagation(),e.preventDefault(),U.hide(),G.hide(),!1}),R.append(B),R.xdsoftScroller(),J.on("afterOpen.xdsoft",function(){R.xdsoftScroller()}),J.append(I).append(E),C.withoutCopyright!==!0&&J.append(z),I.append(N).append(L).append(V),e(C.parentID).append(J),d=function(){var t=this;t.now=function(e){var a,r,n=new Date;return!e&&C.defaultDate&&(a=t.strToDateTime(C.defaultDate),n.setFullYear(a.getFullYear()),n.setMonth(a.getMonth()),n.setDate(a.getDate())),C.yearOffset&&n.setFullYear(n.getFullYear()+C.yearOffset),!e&&C.defaultTime&&(r=t.strtotime(C.defaultTime),n.setHours(r.getHours()),n.setMinutes(r.getMinutes())),n},t.isValidDate=function(e){return"[object Date]"!==Object.prototype.toString.call(e)?!1:!isNaN(e.getTime())},t.setCurrentTime=function(e,a){t.currentTime="string"==typeof e?t.strToDateTime(e):t.isValidDate(e)?e:e||a||!C.allowBlank?t.now():null,J.trigger("xchange.xdsoft")},t.empty=function(){t.currentTime=null},t.getCurrentTime=function(){return t.currentTime},t.nextMonth=function(){(void 0===t.currentTime||null===t.currentTime)&&(t.currentTime=t.now());var a,r=t.currentTime.getMonth()+1;return 12===r&&(t.currentTime.setFullYear(t.currentTime.getFullYear()+1),r=0),a=t.currentTime.getFullYear(),t.currentTime.setDate(Math.min(new Date(t.currentTime.getFullYear(),r+1,0).getDate(),t.currentTime.getDate())),t.currentTime.setMonth(r),C.onChangeMonth&&e.isFunction(C.onChangeMonth)&&C.onChangeMonth.call(J,j.currentTime,J.data("input")),a!==t.currentTime.getFullYear()&&e.isFunction(C.onChangeYear)&&C.onChangeYear.call(J,j.currentTime,J.data("input")),J.trigger("xchange.xdsoft"),r},t.prevMonth=function(){(void 0===t.currentTime||null===t.currentTime)&&(t.currentTime=t.now());var a=t.currentTime.getMonth()-1;return-1===a&&(t.currentTime.setFullYear(t.currentTime.getFullYear()-1),a=11),t.currentTime.setDate(Math.min(new Date(t.currentTime.getFullYear(),a+1,0).getDate(),t.currentTime.getDate())),t.currentTime.setMonth(a),C.onChangeMonth&&e.isFunction(C.onChangeMonth)&&C.onChangeMonth.call(J,j.currentTime,J.data("input")),J.trigger("xchange.xdsoft"),a},t.getWeekOfYear=function(t){if(C.onGetWeekOfYear&&e.isFunction(C.onGetWeekOfYear)){var a=C.onGetWeekOfYear.call(J,t);if("undefined"!=typeof a)return a}var r=new Date(t.getFullYear(),0,1);return 4!=r.getDay()&&r.setMonth(0,1+(4-r.getDay()+7)%7),Math.ceil(((t-r)/864e5+r.getDay()+1)/7)},t.strToDateTime=function(e){var a,n,o=[];return e&&e instanceof Date&&t.isValidDate(e)?e:(o=/^(\+|\-)(.*)$/.exec(e),o&&(o[2]=r.parseDate(o[2],C.formatDate)),o&&o[2]?(a=o[2].getTime()-6e4*o[2].getTimezoneOffset(),n=new Date(t.now(!0).getTime()+parseInt(o[1]+"1",10)*a)):n=e?r.parseDate(e,C.format):t.now(),t.isValidDate(n)||(n=t.now()),n)},t.strToDate=function(e){if(e&&e instanceof Date&&t.isValidDate(e))return e;var a=e?r.parseDate(e,C.formatDate):t.now(!0);return t.isValidDate(a)||(a=t.now(!0)),a},t.strtotime=function(e){if(e&&e instanceof Date&&t.isValidDate(e))return e;var a=e?r.parseDate(e,C.formatTime):t.now(!0);return t.isValidDate(a)||(a=t.now(!0)),a},t.str=function(){return r.formatDate(t.currentTime,C.format)},t.currentTime=this.now()},j=new d,V.on("touchend click",function(e){e.preventDefault(),J.data("changed",!0),j.setCurrentTime(i()),a.val(j.str()),J.trigger("close.xdsoft")}),N.find(".xdsoft_today_button").on("touchend mousedown.xdsoft",function(){J.data("changed",!0),j.setCurrentTime(0,!0),J.trigger("afterOpen.xdsoft")}).on("dblclick.xdsoft",function(){var e,t,r=j.getCurrentTime();r=new Date(r.getFullYear(),r.getMonth(),r.getDate()),e=j.strToDate(C.minDate),e=new Date(e.getFullYear(),e.getMonth(),e.getDate()),e>r||(t=j.strToDate(C.maxDate),t=new Date(t.getFullYear(),t.getMonth(),t.getDate()),r>t||(a.val(j.str()),a.trigger("change"),J.trigger("close.xdsoft")))}),N.find(".xdsoft_prev,.xdsoft_next").on("touchend mousedown.xdsoft",function(){var t=e(this),a=0,r=!1;!function n(e){t.hasClass(C.next)?j.nextMonth():t.hasClass(C.prev)&&j.prevMonth(),C.monthChangeSpinner&&(r||(a=setTimeout(n,e||100)))}(500),e([document.body,window]).on("touchend mouseup.xdsoft",function o(){clearTimeout(a),r=!0,e([document.body,window]).off("touchend mouseup.xdsoft",o)})}),E.find(".xdsoft_prev,.xdsoft_next").on("touchend mousedown.xdsoft",function(){var t=e(this),a=0,r=!1,n=110;!function o(e){var i=R[0].clientHeight,s=B[0].offsetHeight,d=Math.abs(parseInt(B.css("marginTop"),10));t.hasClass(C.next)&&s-i-C.timeHeightInTimePicker>=d?B.css("marginTop","-"+(d+C.timeHeightInTimePicker)+"px"):t.hasClass(C.prev)&&d-C.timeHeightInTimePicker>=0&&B.css("marginTop","-"+(d-C.timeHeightInTimePicker)+"px"),R.trigger("scroll_element.xdsoft_scroller",[Math.abs(parseInt(B[0].style.marginTop,10)/(s-i))]),n=n>10?10:n-10,r||(a=setTimeout(o,e||n))}(500),e([document.body,window]).on("touchend mouseup.xdsoft",function i(){clearTimeout(a),r=!0,e([document.body,window]).off("touchend mouseup.xdsoft",i)})}),u=0,J.on("xchange.xdsoft",function(t){clearTimeout(u),u=setTimeout(function(){if(void 0===j.currentTime||null===j.currentTime){if(C.allowBlank)return;j.currentTime=j.now()}for(var t,i,s,d,u,l,f,c,m,h,g="",p=new Date(j.currentTime.getFullYear(),j.currentTime.getMonth(),1,12,0,0),y=0,v=j.now(),b=!1,D=!1,k=[],x=!0,T="",S="";p.getDay()!==C.dayOfWeekStart;)p.setDate(p.getDate()-1);for(g+="",C.weeks&&(g+=""),t=0;7>t;t+=1)g+="";for(g+="",g+="",C.maxDate!==!1&&(b=j.strToDate(C.maxDate),b=new Date(b.getFullYear(),b.getMonth(),b.getDate(),23,59,59,999)),C.minDate!==!1&&(D=j.strToDate(C.minDate),D=new Date(D.getFullYear(),D.getMonth(),D.getDate()));y0?-1===C.allowDates.indexOf(r.formatDate(p,C.formatDate))&&k.push("xdsoft_disabled"):b!==!1&&p>b||D!==!1&&D>p||c&&c[0]===!1?k.push("xdsoft_disabled"):-1!==C.disabledDates.indexOf(r.formatDate(p,C.formatDate))?k.push("xdsoft_disabled"):-1!==C.disabledWeekDays.indexOf(s)?k.push("xdsoft_disabled"):a.is("[readonly]")&&k.push("xdsoft_disabled"),c&&""!==c[1]&&k.push(c[1]),j.currentTime.getMonth()!==l&&k.push("xdsoft_other_month"),(C.defaultSelect||J.data("changed"))&&r.formatDate(j.currentTime,C.formatDate)===r.formatDate(p,C.formatDate)&&k.push("xdsoft_current"),r.formatDate(v,C.formatDate)===r.formatDate(p,C.formatDate)&&k.push("xdsoft_today"),(0===p.getDay()||6===p.getDay()||-1!==C.weekends.indexOf(r.formatDate(p,C.formatDate)))&&k.push("xdsoft_weekend"),void 0!==C.highlightedDates[r.formatDate(p,C.formatDate)]&&(i=C.highlightedDates[r.formatDate(p,C.formatDate)],k.push(void 0===i.style?"xdsoft_highlighted_default":i.style),h=void 0===i.desc?"":i.desc),C.beforeShowDay&&e.isFunction(C.beforeShowDay)&&k.push(C.beforeShowDay(p)),x&&(g+="",x=!1,C.weeks&&(g+="")),g+='",p.getDay()===C.dayOfWeekStartPrev&&(g+="",x=!0),p.setDate(d+1);if(g+="
"+C.i18n[o].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+"
"+f+"
'+d+"
",L.html(g),N.find(".xdsoft_label span").eq(0).text(C.i18n[o].months[j.currentTime.getMonth()]),N.find(".xdsoft_label span").eq(1).text(j.currentTime.getFullYear()),T="",S="",l="",m=function(t,n){var o,i,s=j.now(),d=C.allowTimes&&e.isArray(C.allowTimes)&&C.allowTimes.length;s.setHours(t),t=parseInt(s.getHours(),10),s.setMinutes(n),n=parseInt(s.getMinutes(),10),o=new Date(j.currentTime),o.setHours(t),o.setMinutes(n),k=[],C.minDateTime!==!1&&C.minDateTime>o||C.maxTime!==!1&&j.strtotime(C.maxTime).getTime()s.getTime()?k.push("xdsoft_disabled"):C.minDateTime!==!1&&C.minDateTime>o||C.disabledMinTime!==!1&&s.getTime()>j.strtotime(C.disabledMinTime).getTime()&&C.disabledMaxTime!==!1&&s.getTime()59||i.getMinutes()===parseInt(n,10))&&(C.defaultSelect||J.data("changed")?k.push("xdsoft_current"):C.initTime&&k.push("xdsoft_init_time")),parseInt(v.getHours(),10)===parseInt(t,10)&&parseInt(v.getMinutes(),10)===parseInt(n,10)&&k.push("xdsoft_today"),T+='
'+r.formatDate(s,C.formatTime)+"
"},C.allowTimes&&e.isArray(C.allowTimes)&&C.allowTimes.length)for(y=0;yt;t+=C.step)S=(10>y?"0":"")+y,l=(10>t?"0":"")+t,m(S,l);for(B.html(T),n="",y=0,y=parseInt(C.yearStart,10)+C.yearOffset;y<=parseInt(C.yearEnd,10)+C.yearOffset;y+=1)n+='
'+y+"
";for(U.children().eq(0).html(n),y=parseInt(C.monthStart,10),n="";y<=parseInt(C.monthEnd,10);y+=1)n+='
'+C.i18n[o].months[y]+"
";G.children().eq(0).html(n),e(J).trigger("generate.xdsoft")},10),t.stopPropagation()}).on("afterOpen.xdsoft",function(){if(C.timepicker){var e,t,a,r;B.find(".xdsoft_current").length?e=".xdsoft_current":B.find(".xdsoft_init_time").length&&(e=".xdsoft_init_time"),e?(t=R[0].clientHeight,a=B[0].offsetHeight,r=B.find(e).index()*C.timeHeightInTimePicker+1,r>a-t&&(r=a-t),R.trigger("scroll_element.xdsoft_scroller",[parseInt(r,10)/(a-t)])):R.trigger("scroll_element.xdsoft_scroller",[0])}}),P=0,L.on("touchend click.xdsoft","td",function(t){t.stopPropagation(),P+=1;var r=e(this),n=j.currentTime;return(void 0===n||null===n)&&(j.currentTime=j.now(),n=j.currentTime),r.hasClass("xdsoft_disabled")?!1:(n.setDate(1),n.setFullYear(r.data("year")),n.setMonth(r.data("month")),n.setDate(r.data("date")),J.trigger("select.xdsoft",[n]),a.val(j.str()),C.onSelectDate&&e.isFunction(C.onSelectDate)&&C.onSelectDate.call(J,j.currentTime,J.data("input"),t),J.data("changed",!0),J.trigger("xchange.xdsoft"),J.trigger("changedatetime.xdsoft"),(P>1||C.closeOnDateSelect===!0||C.closeOnDateSelect===!1&&!C.timepicker)&&!C.inline&&J.trigger("close.xdsoft"),void setTimeout(function(){P=0},200))}),B.on("touchend click.xdsoft","div",function(t){t.stopPropagation();var a=e(this),r=j.currentTime;return(void 0===r||null===r)&&(j.currentTime=j.now(),r=j.currentTime),a.hasClass("xdsoft_disabled")?!1:(r.setHours(a.data("hour")),r.setMinutes(a.data("minute")),J.trigger("select.xdsoft",[r]),J.data("input").val(j.str()),C.onSelectTime&&e.isFunction(C.onSelectTime)&&C.onSelectTime.call(J,j.currentTime,J.data("input"),t),J.data("changed",!0),J.trigger("xchange.xdsoft"),J.trigger("changedatetime.xdsoft"),void(C.inline!==!0&&C.closeOnTimeSelect===!0&&J.trigger("close.xdsoft")))}),I.on("mousewheel.xdsoft",function(e){return C.scrollMonth?(e.deltaY<0?j.nextMonth():j.prevMonth(),!1):!0}),a.on("mousewheel.xdsoft",function(e){return C.scrollInput?!C.datepicker&&C.timepicker?(A=B.find(".xdsoft_current").length?B.find(".xdsoft_current").eq(0).index():0,A+e.deltaY>=0&&A+e.deltaYc+m?(l="bottom",r=c+m-t.top):r-=m):r+a.offsetHeight>c+m&&(r=t.top-a.offsetHeight+1),0>r&&(r=0),n+a.offsetWidth>u&&(n=u-a.offsetWidth)),i=J[0],H(i,function(e){var t;return t=window.getComputedStyle(e).getPropertyValue("position"),"relative"===t&&u>=e.offsetWidth?(n-=(u-e.offsetWidth)/2,!1):void 0}),f={position:o,left:n,top:"",bottom:""},f[l]=r,J.css(f)},J.on("open.xdsoft",function(t){var a=!0;C.onShow&&e.isFunction(C.onShow)&&(a=C.onShow.call(J,j.currentTime,J.data("input"),t)),a!==!1&&(J.show(),Y(),e(window).off("resize.xdsoft",Y).on("resize.xdsoft",Y),C.closeOnWithoutClick&&e([document.body,window]).on("touchstart mousedown.xdsoft",function r(){J.trigger("close.xdsoft"),e([document.body,window]).off("touchstart mousedown.xdsoft",r)}))}).on("close.xdsoft",function(t){var a=!0;N.find(".xdsoft_month,.xdsoft_year").find(".xdsoft_select").hide(),C.onClose&&e.isFunction(C.onClose)&&(a=C.onClose.call(J,j.currentTime,J.data("input"),t)),a===!1||C.opened||C.inline||J.hide(),t.stopPropagation()}).on("toggle.xdsoft",function(){J.trigger(J.is(":visible")?"close.xdsoft":"open.xdsoft")}).data("input",a),X=0,J.data("xdsoft_datetime",j),J.setOptions(C),j.setCurrentTime(i()),a.data("xdsoft_datetimepicker",J).on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function(){a.is(":disabled")||a.data("xdsoft_datetimepicker").is(":visible")&&C.closeOnInputClick||(clearTimeout(X),X=setTimeout(function(){a.is(":disabled")||(q=!0,j.setCurrentTime(i(),!0),C.mask&&s(C),J.trigger("open.xdsoft"))},100))}).on("keydown.xdsoft",function(t){var a,r=t.which;return-1!==[p].indexOf(r)&&C.enterLikeTab?(a=e("input:visible,textarea:visible,button:visible,a:visible"),J.trigger("close.xdsoft"),a.eq(a.index(this)+1).focus(),!1):-1!==[T].indexOf(r)?(J.trigger("close.xdsoft"),!0):void 0}).on("blur.xdsoft",function(){J.trigger("close.xdsoft")})},d=function(t){var a=t.data("xdsoft_datetimepicker");a&&(a.data("xdsoft_datetime",null),a.remove(),t.data("xdsoft_datetimepicker",null).off(".xdsoft"),e(window).off("resize.xdsoft"),e([window,document.body]).off("mousedown.xdsoft touchstart"),t.unmousewheel&&t.unmousewheel())},e(document).off("keydown.xdsoftctrl keyup.xdsoftctrl").on("keydown.xdsoftctrl",function(e){e.keyCode===h&&(F=!0)}).on("keyup.xdsoftctrl",function(e){e.keyCode===h&&(F=!1)}),this.each(function(){var t,a=e(this).data("xdsoft_datetimepicker");if(a){if("string"===e.type(n))switch(n){case"show":e(this).select().focus(),a.trigger("open.xdsoft");break;case"hide":a.trigger("close.xdsoft");break;case"toggle":a.trigger("toggle.xdsoft");break;case"destroy":d(e(this));break;case"reset":this.value=this.defaultValue,this.value&&a.data("xdsoft_datetime").isValidDate(r.parseDate(this.value,C.format))||a.data("changed",!1),a.data("xdsoft_datetime").setCurrentTime(this.value);break;case"validate":t=a.data("input"),t.trigger("blur.xdsoft");break;default:a[n]&&e.isFunction(a[n])&&(u=a[n](i))}else a.setOptions(n);return 0}"string"!==e.type(n)&&(!C.lazyInit||C.open||C.inline?s(e(this)):A(e(this)))}),u},e.fn.datetimepicker.defaults=a}),function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(e){function t(t){var i=t||window.event,s=d.call(arguments,1),u=0,f=0,c=0,m=0,h=0,g=0;if(t=e.event.fix(i),t.type="mousewheel","detail"in i&&(c=-1*i.detail),"wheelDelta"in i&&(c=i.wheelDelta),"wheelDeltaY"in i&&(c=i.wheelDeltaY),"wheelDeltaX"in i&&(f=-1*i.wheelDeltaX),"axis"in i&&i.axis===i.HORIZONTAL_AXIS&&(f=-1*c,c=0),u=0===c?f:c,"deltaY"in i&&(c=-1*i.deltaY,u=c),"deltaX"in i&&(f=i.deltaX,0===c&&(u=-1*f)),0!==c||0!==f){if(1===i.deltaMode){var p=e.data(this,"mousewheel-line-height");u*=p,c*=p,f*=p}else if(2===i.deltaMode){var y=e.data(this,"mousewheel-page-height");u*=y,c*=y,f*=y}if(m=Math.max(Math.abs(c),Math.abs(f)),(!o||o>m)&&(o=m,r(i,m)&&(o/=40)),r(i,m)&&(u/=40,f/=40,c/=40),u=Math[u>=1?"floor":"ceil"](u/o),f=Math[f>=1?"floor":"ceil"](f/o),c=Math[c>=1?"floor":"ceil"](c/o),l.settings.normalizeOffset&&this.getBoundingClientRect){var v=this.getBoundingClientRect();h=t.clientX-v.left,g=t.clientY-v.top}return t.deltaX=f,t.deltaY=c,t.deltaFactor=o,t.offsetX=h,t.offsetY=g,t.deltaMode=0,s.unshift(t,u,f,c),n&&clearTimeout(n),n=setTimeout(a,200),(e.event.dispatch||e.event.handle).apply(this,s)}}function a(){o=null}function r(e,t){return l.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120===0}var n,o,i=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],s="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],d=Array.prototype.slice;if(e.event.fixHooks)for(var u=i.length;u;)e.event.fixHooks[i[--u]]=e.event.mouseHooks;var l=e.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var a=s.length;a;)this.addEventListener(s[--a],t,!1);else this.onmousewheel=t;e.data(this,"mousewheel-line-height",l.getLineHeight(this)),e.data(this,"mousewheel-page-height",l.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var a=s.length;a;)this.removeEventListener(s[--a],t,!1);else this.onmousewheel=null;e.removeData(this,"mousewheel-line-height"),e.removeData(this,"mousewheel-page-height")},getLineHeight:function(t){var a=e(t),r=a["offsetParent"in e.fn?"offsetParent":"parent"]();return r.length||(r=e("body")),parseInt(r.css("fontSize"),10)||parseInt(a.css("fontSize"),10)||16},getPageHeight:function(t){return e(t).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})}); diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index 2cdccfdf..3e9521ea 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -6,7 +6,6 @@ - @@ -295,47 +294,25 @@ {% endif %} - {% block script %} - - - {% endblock %} diff --git a/core/views/forms.py b/core/views/forms.py index 811b13d5..f756d786 100644 --- a/core/views/forms.py +++ b/core/views/forms.py @@ -20,7 +20,6 @@ # Place - Suite 330, Boston, MA 02111-1307, USA. # # -import datetime import re from io import BytesIO @@ -39,11 +38,8 @@ from django.forms import ( Textarea, TextInput, ) -from django.forms.utils import to_current_timezone from django.templatetags.static import static from django.urls import reverse -from django.utils import timezone -from django.utils.dateparse import parse_datetime from django.utils.translation import gettext from django.utils.translation import gettext_lazy as _ from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget @@ -56,21 +52,17 @@ from core.utils import resize_image class SelectDateTime(DateTimeInput): - def render(self, name, value, attrs=None, renderer=None): - if attrs: - attrs["class"] = "select_datetime" - else: - attrs = {"class": "select_datetime"} - return super().render(name, value, attrs, renderer) + def __init__(self, attrs=None, format=None): # noqa A002 + default = {"type": "datetime-local"} + attrs = default if attrs is None else default | attrs + super().__init__(attrs=attrs, format=format or "%Y-%m-%d %H:%M") class SelectDate(DateInput): - def render(self, name, value, attrs=None, renderer=None): - if attrs: - attrs["class"] = "select_date" - else: - attrs = {"class": "select_date"} - return super().render(name, value, attrs, renderer) + def __init__(self, attrs=None, format=None): # noqa A002 + default = {"type": "date"} + attrs = default if attrs is None else default | attrs + super().__init__(attrs=attrs, format=format or "%Y-%m-%d") class MarkdownInput(Textarea): @@ -248,12 +240,6 @@ class UserProfileForm(forms.ModelForm): "scrub_pict": _("Scrub: let other know how your scrub looks like!"), } - def __init__(self, *arg, **kwargs): - super().__init__(*arg, **kwargs) - - def full_clean(self): - super().full_clean() - def generate_name(self, field_name, f): field_name = field_name[:-4] return field_name + str(self.instance.id) + "." + f.content_type.split("/")[-1] @@ -395,27 +381,3 @@ class GiftForm(forms.ModelForm): id=user_id ) self.fields["user"].widget = forms.HiddenInput() - - -class TzAwareDateTimeField(forms.DateTimeField): - def __init__(self, input_formats=None, widget=SelectDateTime, **kwargs): - if input_formats is None: - input_formats = ["%Y-%m-%d %H:%M:%S"] - super().__init__(input_formats=input_formats, widget=widget, **kwargs) - - def prepare_value(self, value): - # the db value is a datetime as a string in UTC - if isinstance(value, str): - # convert it into a naive datetime (no timezone attached) - value = parse_datetime(value) - # attach it to the UTC timezone (so that to_current_timezone()) if not None - # converts it to the local timezone) - if value is not None: - value = timezone.make_aware(value, datetime.timezone.utc) - - if isinstance(value, datetime.datetime): - value = to_current_timezone(value) - # otherwise it is formatted according to locale (in french) - value = str(value) - - return value diff --git a/counter/forms.py b/counter/forms.py index 1adbed68..1436c616 100644 --- a/counter/forms.py +++ b/counter/forms.py @@ -3,7 +3,7 @@ from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultip from django import forms from django.utils.translation import gettext_lazy as _ -from core.views.forms import SelectDate, TzAwareDateTimeField +from core.views.forms import SelectDate, SelectDateTime from counter.models import ( BillingInfo, Counter, @@ -170,8 +170,12 @@ class ProductEditForm(forms.ModelForm): class CashSummaryFormBase(forms.Form): - begin_date = TzAwareDateTimeField(label=_("Begin date"), required=False) - end_date = TzAwareDateTimeField(label=_("End date"), required=False) + begin_date = forms.DateTimeField( + label=_("Begin date"), widget=SelectDateTime, required=False + ) + end_date = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=False + ) class EticketForm(forms.ModelForm): diff --git a/election/views.py b/election/views.py index e2f412f3..b559b9e2 100644 --- a/election/views.py +++ b/election/views.py @@ -12,7 +12,7 @@ from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateVi from core.models import User from core.views import CanCreateMixin, CanEditMixin, CanViewMixin -from core.views.forms import MarkdownInput, TzAwareDateTimeField +from core.views.forms import MarkdownInput, SelectDateTime from election.models import Candidature, Election, ElectionList, Role, Vote # Custom form field @@ -163,12 +163,18 @@ class ElectionForm(forms.ModelForm): label=_("candidature groups"), ) - start_date = TzAwareDateTimeField(label=_("Start date"), required=True) - end_date = TzAwareDateTimeField(label=_("End date"), required=True) - start_candidature = TzAwareDateTimeField( - label=_("Start candidature"), required=True + start_date = forms.DateTimeField( + label=_("Start date"), widget=SelectDateTime, required=True + ) + end_date = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=True + ) + start_candidature = forms.DateTimeField( + label=_("Start candidature"), widget=SelectDateTime, required=True + ) + end_candidature = forms.DateTimeField( + label=_("End candidature"), widget=SelectDateTime, required=True ) - end_candidature = TzAwareDateTimeField(label=_("End candidature"), required=True) # Display elections diff --git a/sith/settings.py b/sith/settings.py index e37ab2eb..a487efd4 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -729,7 +729,6 @@ if SENTRY_DSN: SITH_FRONT_DEP_VERSIONS = { "https://github.com/chartjs/Chart.js/": "2.6.0", - "https://github.com/xdan/datetimepicker/": "2.5.21", "https://github.com/Ionaru/easy-markdown-editor/": "2.18.0", "https://github.com/FortAwesome/Font-Awesome/": "4.7.0", "https://github.com/jquery/jquery/": "3.6.2", diff --git a/subscription/views.py b/subscription/views.py index a8bd7177..5dddcf84 100644 --- a/subscription/views.py +++ b/subscription/views.py @@ -24,18 +24,18 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.edit import CreateView, FormView from core.models import User -from core.views.forms import SelectDate, TzAwareDateTimeField +from core.views.forms import SelectDate, SelectDateTime from subscription.models import Subscription class SelectionDateForm(forms.Form): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.fields["start_date"] = TzAwareDateTimeField( - label=_("Start date"), required=True + self.fields["start_date"] = forms.DateTimeField( + label=_("Start date"), widget=SelectDateTime, required=True ) - self.fields["end_date"] = TzAwareDateTimeField( - label=_("End date"), required=True + self.fields["end_date"] = forms.DateTimeField( + label=_("End date"), widget=SelectDateTime, required=True ) @@ -56,7 +56,7 @@ class SubscriptionForm(forms.ModelForm): max_length=User._meta.get_field("first_name").max_length ) self.fields["email"] = forms.EmailField() - self.fields["date_of_birth"] = forms.DateTimeField(widget=SelectDate) + self.fields["date_of_birth"] = forms.DateField(widget=SelectDate) self.field_order = [ "member", From 41b93180287ebb60695ca858e0a72405a892ad07 Mon Sep 17 00:00:00 2001 From: Sli Date: Tue, 23 Jul 2024 12:11:19 +0200 Subject: [PATCH 02/20] Download user pictures as a zip --- core/static/core/js/jszip/jszip-utils.min.js | 1 + core/static/core/js/jszip/jszip.min.js | 13 + .../js/native-file-system-adapter/LICENSE | 21 + .../core/js/native-file-system-adapter/mod.js | 1 + .../js/native-file-system-adapter/mod.min.js | 0 .../src/FileSystemDirectoryHandle.js | 1 + .../src/FileSystemFileHandle.js | 1 + .../src/FileSystemHandle.js | 1 + .../src/FileSystemWritableFileStream.js | 1 + .../src/adapters/_template.js | 1 + .../src/adapters/cache.js | 1 + .../src/adapters/deno.js | 1 + .../src/adapters/downloader.js | 1 + .../src/adapters/indexeddb.js | 1 + .../src/adapters/jsdelivr.js | 1 + .../src/adapters/memory.js | 1 + .../src/adapters/node.js | 1 + .../src/adapters/sandbox.js | 1 + .../native-file-system-adapter/src/config.js | 1 + .../js/native-file-system-adapter/src/es6.js | 1 + .../src/getOriginPrivateDirectory.js | 1 + .../src/showDirectoryPicker.js | 1 + .../src/showOpenFilePicker.js | 1 + .../src/showSaveFilePicker.js | 1 + .../js/native-file-system-adapter/src/util.js | 1 + .../core/js/native-file-system-adapter/sw.js | 1 + core/templates/core/user_pictures.jinja | 177 ++- locale/fr/LC_MESSAGES/django.po | 1331 +++++++++-------- sith/settings.py | 4 +- 29 files changed, 810 insertions(+), 759 deletions(-) create mode 100644 core/static/core/js/jszip/jszip-utils.min.js create mode 100644 core/static/core/js/jszip/jszip.min.js create mode 100644 core/static/core/js/native-file-system-adapter/LICENSE create mode 100644 core/static/core/js/native-file-system-adapter/mod.js create mode 100644 core/static/core/js/native-file-system-adapter/mod.min.js create mode 100644 core/static/core/js/native-file-system-adapter/src/FileSystemDirectoryHandle.js create mode 100644 core/static/core/js/native-file-system-adapter/src/FileSystemFileHandle.js create mode 100644 core/static/core/js/native-file-system-adapter/src/FileSystemHandle.js create mode 100644 core/static/core/js/native-file-system-adapter/src/FileSystemWritableFileStream.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/_template.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/cache.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/deno.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/downloader.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/indexeddb.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/jsdelivr.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/memory.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/node.js create mode 100644 core/static/core/js/native-file-system-adapter/src/adapters/sandbox.js create mode 100644 core/static/core/js/native-file-system-adapter/src/config.js create mode 100644 core/static/core/js/native-file-system-adapter/src/es6.js create mode 100644 core/static/core/js/native-file-system-adapter/src/getOriginPrivateDirectory.js create mode 100644 core/static/core/js/native-file-system-adapter/src/showDirectoryPicker.js create mode 100644 core/static/core/js/native-file-system-adapter/src/showOpenFilePicker.js create mode 100644 core/static/core/js/native-file-system-adapter/src/showSaveFilePicker.js create mode 100644 core/static/core/js/native-file-system-adapter/src/util.js create mode 100644 core/static/core/js/native-file-system-adapter/sw.js diff --git a/core/static/core/js/jszip/jszip-utils.min.js b/core/static/core/js/jszip/jszip-utils.min.js new file mode 100644 index 00000000..aa910525 --- /dev/null +++ b/core/static/core/js/jszip/jszip-utils.min.js @@ -0,0 +1 @@ +!function(e){"object"==typeof exports?module.exports=e():"function"==typeof define&&define.amd?define(e):"undefined"!=typeof window?window.JSZipUtils=e():"undefined"!=typeof global?global.JSZipUtils=e():"undefined"!=typeof self&&(self.JSZipUtils=e())}(function(){return function o(i,f,u){function s(n,e){if(!f[n]){if(!i[n]){var t="function"==typeof require&&require;if(!e&&t)return t(n,!0);if(a)return a(n,!0);throw new Error("Cannot find module '"+n+"'")}var r=f[n]={exports:{}};i[n][0].call(r.exports,function(e){var t=i[n][1][e];return s(t||e)},r,r.exports,o,i,f,u)}return f[n].exports}for(var a="function"==typeof require&&require,e=0;e + +(c) 2009-2016 Stuart Knightley +Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown. + +JSZip uses the library pako released under the MIT license : +https://github.com/nodeca/pako/blob/main/LICENSE +*/ + +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JSZip=e()}}(function(){return function s(a,o,h){function u(r,e){if(!o[r]){if(!a[r]){var t="function"==typeof require&&require;if(!e&&t)return t(r,!0);if(l)return l(r,!0);var n=new Error("Cannot find module '"+r+"'");throw n.code="MODULE_NOT_FOUND",n}var i=o[r]={exports:{}};a[r][0].call(i.exports,function(e){var t=a[r][1][e];return u(t||e)},i,i.exports,s,a,o,h)}return o[r].exports}for(var l="function"==typeof require&&require,e=0;e>2,s=(3&t)<<4|r>>4,a=1>6:64,o=2>4,r=(15&i)<<4|(s=p.indexOf(e.charAt(o++)))>>2,n=(3&s)<<6|(a=p.indexOf(e.charAt(o++))),l[h++]=t,64!==s&&(l[h++]=r),64!==a&&(l[h++]=n);return l}},{"./support":30,"./utils":32}],2:[function(e,t,r){"use strict";var n=e("./external"),i=e("./stream/DataWorker"),s=e("./stream/Crc32Probe"),a=e("./stream/DataLengthProbe");function o(e,t,r,n,i){this.compressedSize=e,this.uncompressedSize=t,this.crc32=r,this.compression=n,this.compressedContent=i}o.prototype={getContentWorker:function(){var e=new i(n.Promise.resolve(this.compressedContent)).pipe(this.compression.uncompressWorker()).pipe(new a("data_length")),t=this;return e.on("end",function(){if(this.streamInfo.data_length!==t.uncompressedSize)throw new Error("Bug : uncompressed data size mismatch")}),e},getCompressedWorker:function(){return new i(n.Promise.resolve(this.compressedContent)).withStreamInfo("compressedSize",this.compressedSize).withStreamInfo("uncompressedSize",this.uncompressedSize).withStreamInfo("crc32",this.crc32).withStreamInfo("compression",this.compression)}},o.createWorkerFrom=function(e,t,r){return e.pipe(new s).pipe(new a("uncompressedSize")).pipe(t.compressWorker(r)).pipe(new a("compressedSize")).withStreamInfo("compression",t)},t.exports=o},{"./external":6,"./stream/Crc32Probe":25,"./stream/DataLengthProbe":26,"./stream/DataWorker":27}],3:[function(e,t,r){"use strict";var n=e("./stream/GenericWorker");r.STORE={magic:"\0\0",compressWorker:function(){return new n("STORE compression")},uncompressWorker:function(){return new n("STORE decompression")}},r.DEFLATE=e("./flate")},{"./flate":7,"./stream/GenericWorker":28}],4:[function(e,t,r){"use strict";var n=e("./utils");var o=function(){for(var e,t=[],r=0;r<256;r++){e=r;for(var n=0;n<8;n++)e=1&e?3988292384^e>>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t){return void 0!==e&&e.length?"string"!==n.getTypeOf(e)?function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}(0|t,e,e.length,0):function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t.charCodeAt(a))];return-1^e}(0|t,e,e.length,0):0}},{"./utils":32}],5:[function(e,t,r){"use strict";r.base64=!1,r.binary=!1,r.dir=!1,r.createFolders=!0,r.date=null,r.compression=null,r.compressionOptions=null,r.comment=null,r.unixPermissions=null,r.dosPermissions=null},{}],6:[function(e,t,r){"use strict";var n=null;n="undefined"!=typeof Promise?Promise:e("lie"),t.exports={Promise:n}},{lie:37}],7:[function(e,t,r){"use strict";var n="undefined"!=typeof Uint8Array&&"undefined"!=typeof Uint16Array&&"undefined"!=typeof Uint32Array,i=e("pako"),s=e("./utils"),a=e("./stream/GenericWorker"),o=n?"uint8array":"array";function h(e,t){a.call(this,"FlateWorker/"+e),this._pako=null,this._pakoAction=e,this._pakoOptions=t,this.meta={}}r.magic="\b\0",s.inherits(h,a),h.prototype.processChunk=function(e){this.meta=e.meta,null===this._pako&&this._createPako(),this._pako.push(s.transformTo(o,e.data),!1)},h.prototype.flush=function(){a.prototype.flush.call(this),null===this._pako&&this._createPako(),this._pako.push([],!0)},h.prototype.cleanUp=function(){a.prototype.cleanUp.call(this),this._pako=null},h.prototype._createPako=function(){this._pako=new i[this._pakoAction]({raw:!0,level:this._pakoOptions.level||-1});var t=this;this._pako.onData=function(e){t.push({data:e,meta:t.meta})}},r.compressWorker=function(e){return new h("Deflate",e)},r.uncompressWorker=function(){return new h("Inflate",{})}},{"./stream/GenericWorker":28,"./utils":32,pako:38}],8:[function(e,t,r){"use strict";function A(e,t){var r,n="";for(r=0;r>>=8;return n}function n(e,t,r,n,i,s){var a,o,h=e.file,u=e.compression,l=s!==O.utf8encode,f=I.transformTo("string",s(h.name)),c=I.transformTo("string",O.utf8encode(h.name)),d=h.comment,p=I.transformTo("string",s(d)),m=I.transformTo("string",O.utf8encode(d)),_=c.length!==h.name.length,g=m.length!==d.length,b="",v="",y="",w=h.dir,k=h.date,x={crc32:0,compressedSize:0,uncompressedSize:0};t&&!r||(x.crc32=e.crc32,x.compressedSize=e.compressedSize,x.uncompressedSize=e.uncompressedSize);var S=0;t&&(S|=8),l||!_&&!g||(S|=2048);var z=0,C=0;w&&(z|=16),"UNIX"===i?(C=798,z|=function(e,t){var r=e;return e||(r=t?16893:33204),(65535&r)<<16}(h.unixPermissions,w)):(C=20,z|=function(e){return 63&(e||0)}(h.dosPermissions)),a=k.getUTCHours(),a<<=6,a|=k.getUTCMinutes(),a<<=5,a|=k.getUTCSeconds()/2,o=k.getUTCFullYear()-1980,o<<=4,o|=k.getUTCMonth()+1,o<<=5,o|=k.getUTCDate(),_&&(v=A(1,1)+A(B(f),4)+c,b+="up"+A(v.length,2)+v),g&&(y=A(1,1)+A(B(p),4)+m,b+="uc"+A(y.length,2)+y);var E="";return E+="\n\0",E+=A(S,2),E+=u.magic,E+=A(a,2),E+=A(o,2),E+=A(x.crc32,4),E+=A(x.compressedSize,4),E+=A(x.uncompressedSize,4),E+=A(f.length,2),E+=A(b.length,2),{fileRecord:R.LOCAL_FILE_HEADER+E+f+b,dirRecord:R.CENTRAL_FILE_HEADER+A(C,2)+E+A(p.length,2)+"\0\0\0\0"+A(z,4)+A(n,4)+f+b+p}}var I=e("../utils"),i=e("../stream/GenericWorker"),O=e("../utf8"),B=e("../crc32"),R=e("../signature");function s(e,t,r,n){i.call(this,"ZipFileWorker"),this.bytesWritten=0,this.zipComment=t,this.zipPlatform=r,this.encodeFileName=n,this.streamFiles=e,this.accumulate=!1,this.contentBuffer=[],this.dirRecords=[],this.currentSourceOffset=0,this.entriesCount=0,this.currentFile=null,this._sources=[]}I.inherits(s,i),s.prototype.push=function(e){var t=e.meta.percent||0,r=this.entriesCount,n=this._sources.length;this.accumulate?this.contentBuffer.push(e):(this.bytesWritten+=e.data.length,i.prototype.push.call(this,{data:e.data,meta:{currentFile:this.currentFile,percent:r?(t+100*(r-n-1))/r:100}}))},s.prototype.openedSource=function(e){this.currentSourceOffset=this.bytesWritten,this.currentFile=e.file.name;var t=this.streamFiles&&!e.file.dir;if(t){var r=n(e,t,!1,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);this.push({data:r.fileRecord,meta:{percent:0}})}else this.accumulate=!0},s.prototype.closedSource=function(e){this.accumulate=!1;var t=this.streamFiles&&!e.file.dir,r=n(e,t,!0,this.currentSourceOffset,this.zipPlatform,this.encodeFileName);if(this.dirRecords.push(r.dirRecord),t)this.push({data:function(e){return R.DATA_DESCRIPTOR+A(e.crc32,4)+A(e.compressedSize,4)+A(e.uncompressedSize,4)}(e),meta:{percent:100}});else for(this.push({data:r.fileRecord,meta:{percent:0}});this.contentBuffer.length;)this.push(this.contentBuffer.shift());this.currentFile=null},s.prototype.flush=function(){for(var e=this.bytesWritten,t=0;t=this.index;t--)r=(r<<8)+this.byteAt(t);return this.index+=e,r},readString:function(e){return n.transformTo("string",this.readData(e))},readData:function(){},lastIndexOfSignature:function(){},readAndCheckSignature:function(){},readDate:function(){var e=this.readInt(4);return new Date(Date.UTC(1980+(e>>25&127),(e>>21&15)-1,e>>16&31,e>>11&31,e>>5&63,(31&e)<<1))}},t.exports=i},{"../utils":32}],19:[function(e,t,r){"use strict";var n=e("./Uint8ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./Uint8ArrayReader":21}],20:[function(e,t,r){"use strict";var n=e("./DataReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.byteAt=function(e){return this.data.charCodeAt(this.zero+e)},i.prototype.lastIndexOfSignature=function(e){return this.data.lastIndexOf(e)-this.zero},i.prototype.readAndCheckSignature=function(e){return e===this.readData(4)},i.prototype.readData=function(e){this.checkOffset(e);var t=this.data.slice(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./DataReader":18}],21:[function(e,t,r){"use strict";var n=e("./ArrayReader");function i(e){n.call(this,e)}e("../utils").inherits(i,n),i.prototype.readData=function(e){if(this.checkOffset(e),0===e)return new Uint8Array(0);var t=this.data.subarray(this.zero+this.index,this.zero+this.index+e);return this.index+=e,t},t.exports=i},{"../utils":32,"./ArrayReader":17}],22:[function(e,t,r){"use strict";var n=e("../utils"),i=e("../support"),s=e("./ArrayReader"),a=e("./StringReader"),o=e("./NodeBufferReader"),h=e("./Uint8ArrayReader");t.exports=function(e){var t=n.getTypeOf(e);return n.checkSupport(t),"string"!==t||i.uint8array?"nodebuffer"===t?new o(e):i.uint8array?new h(n.transformTo("uint8array",e)):new s(n.transformTo("array",e)):new a(e)}},{"../support":30,"../utils":32,"./ArrayReader":17,"./NodeBufferReader":19,"./StringReader":20,"./Uint8ArrayReader":21}],23:[function(e,t,r){"use strict";r.LOCAL_FILE_HEADER="PK",r.CENTRAL_FILE_HEADER="PK",r.CENTRAL_DIRECTORY_END="PK",r.ZIP64_CENTRAL_DIRECTORY_LOCATOR="PK",r.ZIP64_CENTRAL_DIRECTORY_END="PK",r.DATA_DESCRIPTOR="PK\b"},{}],24:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../utils");function s(e){n.call(this,"ConvertWorker to "+e),this.destType=e}i.inherits(s,n),s.prototype.processChunk=function(e){this.push({data:i.transformTo(this.destType,e.data),meta:e.meta})},t.exports=s},{"../utils":32,"./GenericWorker":28}],25:[function(e,t,r){"use strict";var n=e("./GenericWorker"),i=e("../crc32");function s(){n.call(this,"Crc32Probe"),this.withStreamInfo("crc32",0)}e("../utils").inherits(s,n),s.prototype.processChunk=function(e){this.streamInfo.crc32=i(e.data,this.streamInfo.crc32||0),this.push(e)},t.exports=s},{"../crc32":4,"../utils":32,"./GenericWorker":28}],26:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataLengthProbe for "+e),this.propName=e,this.withStreamInfo(e,0)}n.inherits(s,i),s.prototype.processChunk=function(e){if(e){var t=this.streamInfo[this.propName]||0;this.streamInfo[this.propName]=t+e.data.length}i.prototype.processChunk.call(this,e)},t.exports=s},{"../utils":32,"./GenericWorker":28}],27:[function(e,t,r){"use strict";var n=e("../utils"),i=e("./GenericWorker");function s(e){i.call(this,"DataWorker");var t=this;this.dataIsReady=!1,this.index=0,this.max=0,this.data=null,this.type="",this._tickScheduled=!1,e.then(function(e){t.dataIsReady=!0,t.data=e,t.max=e&&e.length||0,t.type=n.getTypeOf(e),t.isPaused||t._tickAndRepeat()},function(e){t.error(e)})}n.inherits(s,i),s.prototype.cleanUp=function(){i.prototype.cleanUp.call(this),this.data=null},s.prototype.resume=function(){return!!i.prototype.resume.call(this)&&(!this._tickScheduled&&this.dataIsReady&&(this._tickScheduled=!0,n.delay(this._tickAndRepeat,[],this)),!0)},s.prototype._tickAndRepeat=function(){this._tickScheduled=!1,this.isPaused||this.isFinished||(this._tick(),this.isFinished||(n.delay(this._tickAndRepeat,[],this),this._tickScheduled=!0))},s.prototype._tick=function(){if(this.isPaused||this.isFinished)return!1;var e=null,t=Math.min(this.max,this.index+16384);if(this.index>=this.max)return this.end();switch(this.type){case"string":e=this.data.substring(this.index,t);break;case"uint8array":e=this.data.subarray(this.index,t);break;case"array":case"nodebuffer":e=this.data.slice(this.index,t)}return this.index=t,this.push({data:e,meta:{percent:this.max?this.index/this.max*100:0}})},t.exports=s},{"../utils":32,"./GenericWorker":28}],28:[function(e,t,r){"use strict";function n(e){this.name=e||"default",this.streamInfo={},this.generatedError=null,this.extraStreamInfo={},this.isPaused=!0,this.isFinished=!1,this.isLocked=!1,this._listeners={data:[],end:[],error:[]},this.previous=null}n.prototype={push:function(e){this.emit("data",e)},end:function(){if(this.isFinished)return!1;this.flush();try{this.emit("end"),this.cleanUp(),this.isFinished=!0}catch(e){this.emit("error",e)}return!0},error:function(e){return!this.isFinished&&(this.isPaused?this.generatedError=e:(this.isFinished=!0,this.emit("error",e),this.previous&&this.previous.error(e),this.cleanUp()),!0)},on:function(e,t){return this._listeners[e].push(t),this},cleanUp:function(){this.streamInfo=this.generatedError=this.extraStreamInfo=null,this._listeners=[]},emit:function(e,t){if(this._listeners[e])for(var r=0;r "+e:e}},t.exports=n},{}],29:[function(e,t,r){"use strict";var h=e("../utils"),i=e("./ConvertWorker"),s=e("./GenericWorker"),u=e("../base64"),n=e("../support"),a=e("../external"),o=null;if(n.nodestream)try{o=e("../nodejs/NodejsStreamOutputAdapter")}catch(e){}function l(e,o){return new a.Promise(function(t,r){var n=[],i=e._internalType,s=e._outputType,a=e._mimeType;e.on("data",function(e,t){n.push(e),o&&o(t)}).on("error",function(e){n=[],r(e)}).on("end",function(){try{var e=function(e,t,r){switch(e){case"blob":return h.newBlob(h.transformTo("arraybuffer",t),r);case"base64":return u.encode(t);default:return h.transformTo(e,t)}}(s,function(e,t){var r,n=0,i=null,s=0;for(r=0;r>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t}(e)},s.utf8decode=function(e){return h.nodebuffer?o.transformTo("nodebuffer",e).toString("utf-8"):function(e){var t,r,n,i,s=e.length,a=new Array(2*s);for(t=r=0;t>10&1023,a[r++]=56320|1023&n)}return a.length!==r&&(a.subarray?a=a.subarray(0,r):a.length=r),o.applyFromCharCode(a)}(e=o.transformTo(h.uint8array?"uint8array":"array",e))},o.inherits(a,n),a.prototype.processChunk=function(e){var t=o.transformTo(h.uint8array?"uint8array":"array",e.data);if(this.leftOver&&this.leftOver.length){if(h.uint8array){var r=t;(t=new Uint8Array(r.length+this.leftOver.length)).set(this.leftOver,0),t.set(r,this.leftOver.length)}else t=this.leftOver.concat(t);this.leftOver=null}var n=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}(t),i=t;n!==t.length&&(h.uint8array?(i=t.subarray(0,n),this.leftOver=t.subarray(n,t.length)):(i=t.slice(0,n),this.leftOver=t.slice(n,t.length))),this.push({data:s.utf8decode(i),meta:e.meta})},a.prototype.flush=function(){this.leftOver&&this.leftOver.length&&(this.push({data:s.utf8decode(this.leftOver),meta:{}}),this.leftOver=null)},s.Utf8DecodeWorker=a,o.inherits(l,n),l.prototype.processChunk=function(e){this.push({data:s.utf8encode(e.data),meta:e.meta})},s.Utf8EncodeWorker=l},{"./nodejsUtils":14,"./stream/GenericWorker":28,"./support":30,"./utils":32}],32:[function(e,t,a){"use strict";var o=e("./support"),h=e("./base64"),r=e("./nodejsUtils"),u=e("./external");function n(e){return e}function l(e,t){for(var r=0;r>8;this.dir=!!(16&this.externalFileAttributes),0==e&&(this.dosPermissions=63&this.externalFileAttributes),3==e&&(this.unixPermissions=this.externalFileAttributes>>16&65535),this.dir||"/"!==this.fileNameStr.slice(-1)||(this.dir=!0)},parseZIP64ExtraField:function(){if(this.extraFields[1]){var e=n(this.extraFields[1].value);this.uncompressedSize===s.MAX_VALUE_32BITS&&(this.uncompressedSize=e.readInt(8)),this.compressedSize===s.MAX_VALUE_32BITS&&(this.compressedSize=e.readInt(8)),this.localHeaderOffset===s.MAX_VALUE_32BITS&&(this.localHeaderOffset=e.readInt(8)),this.diskNumberStart===s.MAX_VALUE_32BITS&&(this.diskNumberStart=e.readInt(4))}},readExtraFields:function(e){var t,r,n,i=e.index+this.extraFieldsLength;for(this.extraFields||(this.extraFields={});e.index+4>>6:(r<65536?t[s++]=224|r>>>12:(t[s++]=240|r>>>18,t[s++]=128|r>>>12&63),t[s++]=128|r>>>6&63),t[s++]=128|63&r);return t},r.buf2binstring=function(e){return l(e,e.length)},r.binstring2buf=function(e){for(var t=new h.Buf8(e.length),r=0,n=t.length;r>10&1023,o[n++]=56320|1023&i)}return l(o,n)},r.utf8border=function(e,t){var r;for((t=t||e.length)>e.length&&(t=e.length),r=t-1;0<=r&&128==(192&e[r]);)r--;return r<0?t:0===r?t:r+u[e[r]]>t?r:t}},{"./common":41}],43:[function(e,t,r){"use strict";t.exports=function(e,t,r,n){for(var i=65535&e|0,s=e>>>16&65535|0,a=0;0!==r;){for(r-=a=2e3>>1:e>>>1;t[r]=e}return t}();t.exports=function(e,t,r,n){var i=o,s=n+r;e^=-1;for(var a=n;a>>8^i[255&(e^t[a])];return-1^e}},{}],46:[function(e,t,r){"use strict";var h,c=e("../utils/common"),u=e("./trees"),d=e("./adler32"),p=e("./crc32"),n=e("./messages"),l=0,f=4,m=0,_=-2,g=-1,b=4,i=2,v=8,y=9,s=286,a=30,o=19,w=2*s+1,k=15,x=3,S=258,z=S+x+1,C=42,E=113,A=1,I=2,O=3,B=4;function R(e,t){return e.msg=n[t],t}function T(e){return(e<<1)-(4e.avail_out&&(r=e.avail_out),0!==r&&(c.arraySet(e.output,t.pending_buf,t.pending_out,r,e.next_out),e.next_out+=r,t.pending_out+=r,e.total_out+=r,e.avail_out-=r,t.pending-=r,0===t.pending&&(t.pending_out=0))}function N(e,t){u._tr_flush_block(e,0<=e.block_start?e.block_start:-1,e.strstart-e.block_start,t),e.block_start=e.strstart,F(e.strm)}function U(e,t){e.pending_buf[e.pending++]=t}function P(e,t){e.pending_buf[e.pending++]=t>>>8&255,e.pending_buf[e.pending++]=255&t}function L(e,t){var r,n,i=e.max_chain_length,s=e.strstart,a=e.prev_length,o=e.nice_match,h=e.strstart>e.w_size-z?e.strstart-(e.w_size-z):0,u=e.window,l=e.w_mask,f=e.prev,c=e.strstart+S,d=u[s+a-1],p=u[s+a];e.prev_length>=e.good_match&&(i>>=2),o>e.lookahead&&(o=e.lookahead);do{if(u[(r=t)+a]===p&&u[r+a-1]===d&&u[r]===u[s]&&u[++r]===u[s+1]){s+=2,r++;do{}while(u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&u[++s]===u[++r]&&sh&&0!=--i);return a<=e.lookahead?a:e.lookahead}function j(e){var t,r,n,i,s,a,o,h,u,l,f=e.w_size;do{if(i=e.window_size-e.lookahead-e.strstart,e.strstart>=f+(f-z)){for(c.arraySet(e.window,e.window,f,f,0),e.match_start-=f,e.strstart-=f,e.block_start-=f,t=r=e.hash_size;n=e.head[--t],e.head[t]=f<=n?n-f:0,--r;);for(t=r=f;n=e.prev[--t],e.prev[t]=f<=n?n-f:0,--r;);i+=f}if(0===e.strm.avail_in)break;if(a=e.strm,o=e.window,h=e.strstart+e.lookahead,u=i,l=void 0,l=a.avail_in,u=x)for(s=e.strstart-e.insert,e.ins_h=e.window[s],e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x)if(n=u._tr_tally(e,e.strstart-e.match_start,e.match_length-x),e.lookahead-=e.match_length,e.match_length<=e.max_lazy_match&&e.lookahead>=x){for(e.match_length--;e.strstart++,e.ins_h=(e.ins_h<=x&&(e.ins_h=(e.ins_h<=x&&e.match_length<=e.prev_length){for(i=e.strstart+e.lookahead-x,n=u._tr_tally(e,e.strstart-1-e.prev_match,e.prev_length-x),e.lookahead-=e.prev_length-1,e.prev_length-=2;++e.strstart<=i&&(e.ins_h=(e.ins_h<e.pending_buf_size-5&&(r=e.pending_buf_size-5);;){if(e.lookahead<=1){if(j(e),0===e.lookahead&&t===l)return A;if(0===e.lookahead)break}e.strstart+=e.lookahead,e.lookahead=0;var n=e.block_start+r;if((0===e.strstart||e.strstart>=n)&&(e.lookahead=e.strstart-n,e.strstart=n,N(e,!1),0===e.strm.avail_out))return A;if(e.strstart-e.block_start>=e.w_size-z&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):(e.strstart>e.block_start&&(N(e,!1),e.strm.avail_out),A)}),new M(4,4,8,4,Z),new M(4,5,16,8,Z),new M(4,6,32,32,Z),new M(4,4,16,16,W),new M(8,16,32,32,W),new M(8,16,128,128,W),new M(8,32,128,256,W),new M(32,128,258,1024,W),new M(32,258,258,4096,W)],r.deflateInit=function(e,t){return Y(e,t,v,15,8,0)},r.deflateInit2=Y,r.deflateReset=K,r.deflateResetKeep=G,r.deflateSetHeader=function(e,t){return e&&e.state?2!==e.state.wrap?_:(e.state.gzhead=t,m):_},r.deflate=function(e,t){var r,n,i,s;if(!e||!e.state||5>8&255),U(n,n.gzhead.time>>16&255),U(n,n.gzhead.time>>24&255),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,255&n.gzhead.os),n.gzhead.extra&&n.gzhead.extra.length&&(U(n,255&n.gzhead.extra.length),U(n,n.gzhead.extra.length>>8&255)),n.gzhead.hcrc&&(e.adler=p(e.adler,n.pending_buf,n.pending,0)),n.gzindex=0,n.status=69):(U(n,0),U(n,0),U(n,0),U(n,0),U(n,0),U(n,9===n.level?2:2<=n.strategy||n.level<2?4:0),U(n,3),n.status=E);else{var a=v+(n.w_bits-8<<4)<<8;a|=(2<=n.strategy||n.level<2?0:n.level<6?1:6===n.level?2:3)<<6,0!==n.strstart&&(a|=32),a+=31-a%31,n.status=E,P(n,a),0!==n.strstart&&(P(n,e.adler>>>16),P(n,65535&e.adler)),e.adler=1}if(69===n.status)if(n.gzhead.extra){for(i=n.pending;n.gzindex<(65535&n.gzhead.extra.length)&&(n.pending!==n.pending_buf_size||(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending!==n.pending_buf_size));)U(n,255&n.gzhead.extra[n.gzindex]),n.gzindex++;n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),n.gzindex===n.gzhead.extra.length&&(n.gzindex=0,n.status=73)}else n.status=73;if(73===n.status)if(n.gzhead.name){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.gzindex=0,n.status=91)}else n.status=91;if(91===n.status)if(n.gzhead.comment){i=n.pending;do{if(n.pending===n.pending_buf_size&&(n.gzhead.hcrc&&n.pending>i&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),F(e),i=n.pending,n.pending===n.pending_buf_size)){s=1;break}s=n.gzindexi&&(e.adler=p(e.adler,n.pending_buf,n.pending-i,i)),0===s&&(n.status=103)}else n.status=103;if(103===n.status&&(n.gzhead.hcrc?(n.pending+2>n.pending_buf_size&&F(e),n.pending+2<=n.pending_buf_size&&(U(n,255&e.adler),U(n,e.adler>>8&255),e.adler=0,n.status=E)):n.status=E),0!==n.pending){if(F(e),0===e.avail_out)return n.last_flush=-1,m}else if(0===e.avail_in&&T(t)<=T(r)&&t!==f)return R(e,-5);if(666===n.status&&0!==e.avail_in)return R(e,-5);if(0!==e.avail_in||0!==n.lookahead||t!==l&&666!==n.status){var o=2===n.strategy?function(e,t){for(var r;;){if(0===e.lookahead&&(j(e),0===e.lookahead)){if(t===l)return A;break}if(e.match_length=0,r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++,r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):3===n.strategy?function(e,t){for(var r,n,i,s,a=e.window;;){if(e.lookahead<=S){if(j(e),e.lookahead<=S&&t===l)return A;if(0===e.lookahead)break}if(e.match_length=0,e.lookahead>=x&&0e.lookahead&&(e.match_length=e.lookahead)}if(e.match_length>=x?(r=u._tr_tally(e,1,e.match_length-x),e.lookahead-=e.match_length,e.strstart+=e.match_length,e.match_length=0):(r=u._tr_tally(e,0,e.window[e.strstart]),e.lookahead--,e.strstart++),r&&(N(e,!1),0===e.strm.avail_out))return A}return e.insert=0,t===f?(N(e,!0),0===e.strm.avail_out?O:B):e.last_lit&&(N(e,!1),0===e.strm.avail_out)?A:I}(n,t):h[n.level].func(n,t);if(o!==O&&o!==B||(n.status=666),o===A||o===O)return 0===e.avail_out&&(n.last_flush=-1),m;if(o===I&&(1===t?u._tr_align(n):5!==t&&(u._tr_stored_block(n,0,0,!1),3===t&&(D(n.head),0===n.lookahead&&(n.strstart=0,n.block_start=0,n.insert=0))),F(e),0===e.avail_out))return n.last_flush=-1,m}return t!==f?m:n.wrap<=0?1:(2===n.wrap?(U(n,255&e.adler),U(n,e.adler>>8&255),U(n,e.adler>>16&255),U(n,e.adler>>24&255),U(n,255&e.total_in),U(n,e.total_in>>8&255),U(n,e.total_in>>16&255),U(n,e.total_in>>24&255)):(P(n,e.adler>>>16),P(n,65535&e.adler)),F(e),0=r.w_size&&(0===s&&(D(r.head),r.strstart=0,r.block_start=0,r.insert=0),u=new c.Buf8(r.w_size),c.arraySet(u,t,l-r.w_size,r.w_size,0),t=u,l=r.w_size),a=e.avail_in,o=e.next_in,h=e.input,e.avail_in=l,e.next_in=0,e.input=t,j(r);r.lookahead>=x;){for(n=r.strstart,i=r.lookahead-(x-1);r.ins_h=(r.ins_h<>>=y=v>>>24,p-=y,0===(y=v>>>16&255))C[s++]=65535&v;else{if(!(16&y)){if(0==(64&y)){v=m[(65535&v)+(d&(1<>>=y,p-=y),p<15&&(d+=z[n++]<>>=y=v>>>24,p-=y,!(16&(y=v>>>16&255))){if(0==(64&y)){v=_[(65535&v)+(d&(1<>>=y,p-=y,(y=s-a)>3,d&=(1<<(p-=w<<3))-1,e.next_in=n,e.next_out=s,e.avail_in=n>>24&255)+(e>>>8&65280)+((65280&e)<<8)+((255&e)<<24)}function s(){this.mode=0,this.last=!1,this.wrap=0,this.havedict=!1,this.flags=0,this.dmax=0,this.check=0,this.total=0,this.head=null,this.wbits=0,this.wsize=0,this.whave=0,this.wnext=0,this.window=null,this.hold=0,this.bits=0,this.length=0,this.offset=0,this.extra=0,this.lencode=null,this.distcode=null,this.lenbits=0,this.distbits=0,this.ncode=0,this.nlen=0,this.ndist=0,this.have=0,this.next=null,this.lens=new I.Buf16(320),this.work=new I.Buf16(288),this.lendyn=null,this.distdyn=null,this.sane=0,this.back=0,this.was=0}function a(e){var t;return e&&e.state?(t=e.state,e.total_in=e.total_out=t.total=0,e.msg="",t.wrap&&(e.adler=1&t.wrap),t.mode=P,t.last=0,t.havedict=0,t.dmax=32768,t.head=null,t.hold=0,t.bits=0,t.lencode=t.lendyn=new I.Buf32(n),t.distcode=t.distdyn=new I.Buf32(i),t.sane=1,t.back=-1,N):U}function o(e){var t;return e&&e.state?((t=e.state).wsize=0,t.whave=0,t.wnext=0,a(e)):U}function h(e,t){var r,n;return e&&e.state?(n=e.state,t<0?(r=0,t=-t):(r=1+(t>>4),t<48&&(t&=15)),t&&(t<8||15=s.wsize?(I.arraySet(s.window,t,r-s.wsize,s.wsize,0),s.wnext=0,s.whave=s.wsize):(n<(i=s.wsize-s.wnext)&&(i=n),I.arraySet(s.window,t,r-n,i,s.wnext),(n-=i)?(I.arraySet(s.window,t,r-n,n,0),s.wnext=n,s.whave=s.wsize):(s.wnext+=i,s.wnext===s.wsize&&(s.wnext=0),s.whave>>8&255,r.check=B(r.check,E,2,0),l=u=0,r.mode=2;break}if(r.flags=0,r.head&&(r.head.done=!1),!(1&r.wrap)||(((255&u)<<8)+(u>>8))%31){e.msg="incorrect header check",r.mode=30;break}if(8!=(15&u)){e.msg="unknown compression method",r.mode=30;break}if(l-=4,k=8+(15&(u>>>=4)),0===r.wbits)r.wbits=k;else if(k>r.wbits){e.msg="invalid window size",r.mode=30;break}r.dmax=1<>8&1),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=3;case 3:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>8&255,E[2]=u>>>16&255,E[3]=u>>>24&255,r.check=B(r.check,E,4,0)),l=u=0,r.mode=4;case 4:for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>8),512&r.flags&&(E[0]=255&u,E[1]=u>>>8&255,r.check=B(r.check,E,2,0)),l=u=0,r.mode=5;case 5:if(1024&r.flags){for(;l<16;){if(0===o)break e;o--,u+=n[s++]<>>8&255,r.check=B(r.check,E,2,0)),l=u=0}else r.head&&(r.head.extra=null);r.mode=6;case 6:if(1024&r.flags&&(o<(d=r.length)&&(d=o),d&&(r.head&&(k=r.head.extra_len-r.length,r.head.extra||(r.head.extra=new Array(r.head.extra_len)),I.arraySet(r.head.extra,n,s,d,k)),512&r.flags&&(r.check=B(r.check,n,d,s)),o-=d,s+=d,r.length-=d),r.length))break e;r.length=0,r.mode=7;case 7:if(2048&r.flags){if(0===o)break e;for(d=0;k=n[s+d++],r.head&&k&&r.length<65536&&(r.head.name+=String.fromCharCode(k)),k&&d>9&1,r.head.done=!0),e.adler=r.check=0,r.mode=12;break;case 10:for(;l<32;){if(0===o)break e;o--,u+=n[s++]<>>=7&l,l-=7&l,r.mode=27;break}for(;l<3;){if(0===o)break e;o--,u+=n[s++]<>>=1)){case 0:r.mode=14;break;case 1:if(j(r),r.mode=20,6!==t)break;u>>>=2,l-=2;break e;case 2:r.mode=17;break;case 3:e.msg="invalid block type",r.mode=30}u>>>=2,l-=2;break;case 14:for(u>>>=7&l,l-=7&l;l<32;){if(0===o)break e;o--,u+=n[s++]<>>16^65535)){e.msg="invalid stored block lengths",r.mode=30;break}if(r.length=65535&u,l=u=0,r.mode=15,6===t)break e;case 15:r.mode=16;case 16:if(d=r.length){if(o>>=5,l-=5,r.ndist=1+(31&u),u>>>=5,l-=5,r.ncode=4+(15&u),u>>>=4,l-=4,286>>=3,l-=3}for(;r.have<19;)r.lens[A[r.have++]]=0;if(r.lencode=r.lendyn,r.lenbits=7,S={bits:r.lenbits},x=T(0,r.lens,0,19,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid code lengths set",r.mode=30;break}r.have=0,r.mode=19;case 19:for(;r.have>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=_,l-=_,r.lens[r.have++]=b;else{if(16===b){for(z=_+2;l>>=_,l-=_,0===r.have){e.msg="invalid bit length repeat",r.mode=30;break}k=r.lens[r.have-1],d=3+(3&u),u>>>=2,l-=2}else if(17===b){for(z=_+3;l>>=_)),u>>>=3,l-=3}else{for(z=_+7;l>>=_)),u>>>=7,l-=7}if(r.have+d>r.nlen+r.ndist){e.msg="invalid bit length repeat",r.mode=30;break}for(;d--;)r.lens[r.have++]=k}}if(30===r.mode)break;if(0===r.lens[256]){e.msg="invalid code -- missing end-of-block",r.mode=30;break}if(r.lenbits=9,S={bits:r.lenbits},x=T(D,r.lens,0,r.nlen,r.lencode,0,r.work,S),r.lenbits=S.bits,x){e.msg="invalid literal/lengths set",r.mode=30;break}if(r.distbits=6,r.distcode=r.distdyn,S={bits:r.distbits},x=T(F,r.lens,r.nlen,r.ndist,r.distcode,0,r.work,S),r.distbits=S.bits,x){e.msg="invalid distances set",r.mode=30;break}if(r.mode=20,6===t)break e;case 20:r.mode=21;case 21:if(6<=o&&258<=h){e.next_out=a,e.avail_out=h,e.next_in=s,e.avail_in=o,r.hold=u,r.bits=l,R(e,c),a=e.next_out,i=e.output,h=e.avail_out,s=e.next_in,n=e.input,o=e.avail_in,u=r.hold,l=r.bits,12===r.mode&&(r.back=-1);break}for(r.back=0;g=(C=r.lencode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,r.length=b,0===g){r.mode=26;break}if(32&g){r.back=-1,r.mode=12;break}if(64&g){e.msg="invalid literal/length code",r.mode=30;break}r.extra=15&g,r.mode=22;case 22:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}r.was=r.length,r.mode=23;case 23:for(;g=(C=r.distcode[u&(1<>>16&255,b=65535&C,!((_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>v)])>>>16&255,b=65535&C,!(v+(_=C>>>24)<=l);){if(0===o)break e;o--,u+=n[s++]<>>=v,l-=v,r.back+=v}if(u>>>=_,l-=_,r.back+=_,64&g){e.msg="invalid distance code",r.mode=30;break}r.offset=b,r.extra=15&g,r.mode=24;case 24:if(r.extra){for(z=r.extra;l>>=r.extra,l-=r.extra,r.back+=r.extra}if(r.offset>r.dmax){e.msg="invalid distance too far back",r.mode=30;break}r.mode=25;case 25:if(0===h)break e;if(d=c-h,r.offset>d){if((d=r.offset-d)>r.whave&&r.sane){e.msg="invalid distance too far back",r.mode=30;break}p=d>r.wnext?(d-=r.wnext,r.wsize-d):r.wnext-d,d>r.length&&(d=r.length),m=r.window}else m=i,p=a-r.offset,d=r.length;for(hd?(m=R[T+a[v]],A[I+a[v]]):(m=96,0),h=1<>S)+(u-=h)]=p<<24|m<<16|_|0,0!==u;);for(h=1<>=1;if(0!==h?(E&=h-1,E+=h):E=0,v++,0==--O[b]){if(b===w)break;b=t[r+a[v]]}if(k>>7)]}function U(e,t){e.pending_buf[e.pending++]=255&t,e.pending_buf[e.pending++]=t>>>8&255}function P(e,t,r){e.bi_valid>d-r?(e.bi_buf|=t<>d-e.bi_valid,e.bi_valid+=r-d):(e.bi_buf|=t<>>=1,r<<=1,0<--t;);return r>>>1}function Z(e,t,r){var n,i,s=new Array(g+1),a=0;for(n=1;n<=g;n++)s[n]=a=a+r[n-1]<<1;for(i=0;i<=t;i++){var o=e[2*i+1];0!==o&&(e[2*i]=j(s[o]++,o))}}function W(e){var t;for(t=0;t>1;1<=r;r--)G(e,s,r);for(i=h;r=e.heap[1],e.heap[1]=e.heap[e.heap_len--],G(e,s,1),n=e.heap[1],e.heap[--e.heap_max]=r,e.heap[--e.heap_max]=n,s[2*i]=s[2*r]+s[2*n],e.depth[i]=(e.depth[r]>=e.depth[n]?e.depth[r]:e.depth[n])+1,s[2*r+1]=s[2*n+1]=i,e.heap[1]=i++,G(e,s,1),2<=e.heap_len;);e.heap[--e.heap_max]=e.heap[1],function(e,t){var r,n,i,s,a,o,h=t.dyn_tree,u=t.max_code,l=t.stat_desc.static_tree,f=t.stat_desc.has_stree,c=t.stat_desc.extra_bits,d=t.stat_desc.extra_base,p=t.stat_desc.max_length,m=0;for(s=0;s<=g;s++)e.bl_count[s]=0;for(h[2*e.heap[e.heap_max]+1]=0,r=e.heap_max+1;r<_;r++)p<(s=h[2*h[2*(n=e.heap[r])+1]+1]+1)&&(s=p,m++),h[2*n+1]=s,u>=7;n>>=1)if(1&r&&0!==e.dyn_ltree[2*t])return o;if(0!==e.dyn_ltree[18]||0!==e.dyn_ltree[20]||0!==e.dyn_ltree[26])return h;for(t=32;t>>3,(s=e.static_len+3+7>>>3)<=i&&(i=s)):i=s=r+5,r+4<=i&&-1!==t?J(e,t,r,n):4===e.strategy||s===i?(P(e,2+(n?1:0),3),K(e,z,C)):(P(e,4+(n?1:0),3),function(e,t,r,n){var i;for(P(e,t-257,5),P(e,r-1,5),P(e,n-4,4),i=0;i>>8&255,e.pending_buf[e.d_buf+2*e.last_lit+1]=255&t,e.pending_buf[e.l_buf+e.last_lit]=255&r,e.last_lit++,0===t?e.dyn_ltree[2*r]++:(e.matches++,t--,e.dyn_ltree[2*(A[r]+u+1)]++,e.dyn_dtree[2*N(t)]++),e.last_lit===e.lit_bufsize-1},r._tr_align=function(e){P(e,2,3),L(e,m,z),function(e){16===e.bi_valid?(U(e,e.bi_buf),e.bi_buf=0,e.bi_valid=0):8<=e.bi_valid&&(e.pending_buf[e.pending++]=255&e.bi_buf,e.bi_buf>>=8,e.bi_valid-=8)}(e)}},{"../utils/common":41}],53:[function(e,t,r){"use strict";t.exports=function(){this.input=null,this.next_in=0,this.avail_in=0,this.total_in=0,this.output=null,this.next_out=0,this.avail_out=0,this.total_out=0,this.msg="",this.state=null,this.data_type=2,this.adler=0}},{}],54:[function(e,t,r){(function(e){!function(r,n){"use strict";if(!r.setImmediate){var i,s,t,a,o=1,h={},u=!1,l=r.document,e=Object.getPrototypeOf&&Object.getPrototypeOf(r);e=e&&e.setTimeout?e:r,i="[object process]"==={}.toString.call(r.process)?function(e){process.nextTick(function(){c(e)})}:function(){if(r.postMessage&&!r.importScripts){var e=!0,t=r.onmessage;return r.onmessage=function(){e=!1},r.postMessage("","*"),r.onmessage=t,e}}()?(a="setImmediate$"+Math.random()+"$",r.addEventListener?r.addEventListener("message",d,!1):r.attachEvent("onmessage",d),function(e){r.postMessage(a+e,"*")}):r.MessageChannel?((t=new MessageChannel).port1.onmessage=function(e){c(e.data)},function(e){t.port2.postMessage(e)}):l&&"onreadystatechange"in l.createElement("script")?(s=l.documentElement,function(e){var t=l.createElement("script");t.onreadystatechange=function(){c(e),t.onreadystatechange=null,s.removeChild(t),t=null},s.appendChild(t)}):function(e){setTimeout(c,0,e)},e.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),r=0;r{if(e instanceof DOMException&&"UnknownError"===e.name&&!n.recursive){if(!(await t.call(this).next()).done)throw new DOMException(...MOD_ERR)}throw e}))}}export default FileSystemDirectoryHandle;export{FileSystemDirectoryHandle}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/FileSystemFileHandle.js b/core/static/core/js/native-file-system-adapter/src/FileSystemFileHandle.js new file mode 100644 index 00000000..565e0a5a --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/FileSystemFileHandle.js @@ -0,0 +1 @@ +import FileSystemHandle from"./FileSystemHandle.js";import FileSystemWritableFileStream from"./FileSystemWritableFileStream.js";import{errors}from"./util.js";const{INVALID:INVALID,SYNTAX:SYNTAX,GONE:GONE}=errors,kAdapter=Symbol("adapter");class FileSystemFileHandle extends FileSystemHandle{[kAdapter];constructor(e){super(e),this[kAdapter]=e}async createWritable(e={}){return new FileSystemWritableFileStream(await this[kAdapter].createWritable(e))}async getFile(){return this[kAdapter].getFile()}}if(Object.defineProperty(FileSystemFileHandle.prototype,Symbol.toStringTag,{value:"FileSystemFileHandle",writable:!1,enumerable:!1,configurable:!0}),Object.defineProperties(FileSystemFileHandle.prototype,{createWritable:{enumerable:!0},getFile:{enumerable:!0}}),globalThis.FileSystemFileHandle&&!globalThis.FileSystemFileHandle.prototype.createWritable){const e=new WeakMap;let t;const a=()=>{let e,t;onmessage=async a=>{const i=a.ports[0],r=a.data;switch(r.type){case"open":const a=r.name;let i=await navigator.storage.getDirectory();for(const e of r.path)i=await i.getDirectoryHandle(e);e=await i.getFileHandle(a),t=await e.createSyncAccessHandle();break;case"write":t.write(r.data,{at:r.position}),t.flush();break;case"truncate":t.truncate(r.size);break;case"abort":case"close":t.close()}i.postMessage(0)}};globalThis.FileSystemFileHandle.prototype.createWritable=async function(i){if(!t){const e=`(${a.toString()})()`,i=new Blob([e],{type:"text/javascript"});t=URL.createObjectURL(i)}const r=new Worker(t,{type:"module"});let n=0;const s=new TextEncoder;let o=await this.getFile().then((e=>e.size));const l=e=>new Promise(((t,a)=>{const i=new MessageChannel;i.port1.onmessage=e=>{e.data instanceof Error?a(e.data):t(e.data),i.port1.close(),i.port2.close(),i.port1.onmessage=null},r.postMessage(e,[i.port2])})),c=await navigator.storage.getDirectory(),p=await e.get(this),y=await c.resolve(p);if(null===y)throw new DOMException(...GONE);let d;await l({type:"open",path:y,name:this.name}),!1===i?.keepExistingData&&(await l({type:"truncate",size:0}),o=0);return new FileSystemWritableFileStream({start:e=>{d=e},async write(e){if("write"===(e=e?.constructor===Object?{...e}:{type:"write",data:e,position:n}).type){if(!("data"in e))throw await l({type:"close"}),new DOMException(...SYNTAX("write requires a data argument"));if(e.position??=n,"string"==typeof e.data)e.data=s.encode(e.data);else if(e.data instanceof ArrayBuffer)e.data=new Uint8Array(e.data);else if(e.data instanceof Uint8Array||!ArrayBuffer.isView(e.data)){if(!(e.data instanceof Uint8Array)){const t=await new Response(e.data).arrayBuffer();e.data=new Uint8Array(t)}}else e.data=new Uint8Array(e.data.buffer,e.data.byteOffset,e.data.byteLength);Number.isInteger(e.position)&&e.position>=0&&(n=e.position),n+=e.data.byteLength,o+=e.data.byteLength}else{if("seek"===e.type){if(Number.isInteger(e.position)&&e.position>=0){if(o=0))throw await l({type:"close"}),new DOMException(...SYNTAX("truncate requires a size argument"));o=e.size,n>o&&(n=o)}}await l(e)},async close(){await l({type:"close"}),r.terminate()},async abort(e){await l({type:"abort",reason:e}),r.terminate()}})};const i=FileSystemDirectoryHandle.prototype.getFileHandle;FileSystemDirectoryHandle.prototype.getFileHandle=async function(...t){const a=await i.call(this,...t);return e.set(a,this),a}}export default FileSystemFileHandle;export{FileSystemFileHandle}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/FileSystemHandle.js b/core/static/core/js/native-file-system-adapter/src/FileSystemHandle.js new file mode 100644 index 00000000..990045a6 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/FileSystemHandle.js @@ -0,0 +1 @@ +const kAdapter=Symbol("adapter");class FileSystemHandle{[kAdapter];name;kind;constructor(e){this.kind=e.kind,this.name=e.name,this[kAdapter]=e}async queryPermission(e={}){const{mode:r="read"}=e,t=this[kAdapter];if(t.queryPermission)return t.queryPermission({mode:r});if("read"===r)return"granted";if("readwrite"===r)return t.writable?"granted":"denied";throw new TypeError(`Mode ${r} must be 'read' or 'readwrite'`)}async requestPermission({mode:e="read"}={}){const r=this[kAdapter];if(r.requestPermission)return r.requestPermission({mode:e});if("read"===e)return"granted";if("readwrite"===e)return r.writable?"granted":"denied";throw new TypeError(`Mode ${e} must be 'read' or 'readwrite'`)}async remove(e={}){await this[kAdapter].remove(e)}async isSameEntry(e){return this===e||!(!e||"object"!=typeof e||this.kind!==e.kind||!e[kAdapter])&&this[kAdapter].isSameEntry(e[kAdapter])}}Object.defineProperty(FileSystemHandle.prototype,Symbol.toStringTag,{value:"FileSystemHandle",writable:!1,enumerable:!1,configurable:!0}),globalThis.FileSystemHandle&&(globalThis.FileSystemHandle.prototype.queryPermission??=function(e){return"granted"});export default FileSystemHandle;export{FileSystemHandle}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/FileSystemWritableFileStream.js b/core/static/core/js/native-file-system-adapter/src/FileSystemWritableFileStream.js new file mode 100644 index 00000000..dd8794f9 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/FileSystemWritableFileStream.js @@ -0,0 +1 @@ +import config from"./config.js";const{WritableStream:WritableStream}=config;class FileSystemWritableFileStream extends WritableStream{#e;constructor(e){super(e),this.#e=e,Object.setPrototypeOf(this,FileSystemWritableFileStream.prototype),this._closed=!1}async close(){this._closed=!0;const e=this.getWriter(),t=e.close();return e.releaseLock(),t}seek(e){return this.write({type:"seek",position:e})}truncate(e){return this.write({type:"truncate",size:e})}write(e){if(this._closed)return Promise.reject(new TypeError("Cannot write to a CLOSED writable stream"));const t=this.getWriter(),r=t.write(e);return t.releaseLock(),r}}Object.defineProperty(FileSystemWritableFileStream.prototype,Symbol.toStringTag,{value:"FileSystemWritableFileStream",writable:!1,enumerable:!1,configurable:!0}),Object.defineProperties(FileSystemWritableFileStream.prototype,{close:{enumerable:!0},seek:{enumerable:!0},truncate:{enumerable:!0},write:{enumerable:!0}}),!globalThis.FileSystemFileHandle||globalThis.FileSystemFileHandle.prototype.createWritable||globalThis.FileSystemWritableFileStream||(globalThis.FileSystemWritableFileStream=FileSystemWritableFileStream);export default FileSystemWritableFileStream;export{FileSystemWritableFileStream}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/_template.js b/core/static/core/js/native-file-system-adapter/src/adapters/_template.js new file mode 100644 index 00000000..0a50fbd2 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/_template.js @@ -0,0 +1 @@ +import{errors}from"../util.js";const{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX,SECURITY:SECURITY,DISALLOWED:DISALLOWED}=errors;export class Sink{constructor(){}write(e){}close(){}}export class FileHandle{constructor(){this._path=""}async getFile(){return new File([],"")}async createWritable(){}async isSameEntry(e){return e._path===this._path}}export class FolderHandle{constructor(){this._path=""}async*entries(){yield}async isSameEntry(e){return e._path===this._path}async getDirectoryHandle(e,r){return new FolderHandle}async getFileHandle(e,r){return new FileHandle}async removeEntry(e,r){}}const fs=new FolderHandle("");export default()=>fs; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/cache.js b/core/static/core/js/native-file-system-adapter/src/adapters/cache.js new file mode 100644 index 00000000..ad9394a3 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/cache.js @@ -0,0 +1 @@ +import{errors}from"../util.js";const{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX}=errors,DIR={headers:{"content-type":"dir"}},FILE=()=>({headers:{"content-type":"file","last-modified":Date.now()}}),hasOwn=Object.prototype.hasOwnProperty;class Sink{constructor(e,t,i){this._cache=e,this.path=t,this.size=i.size,this.position=0,this.file=i}write(e,t){if("object"==typeof e)if("write"===e.type){if(Number.isInteger(e.position)&&e.position>=0&&(this.size=0){if(this.size=0){let t=this.file;return t=e.sizet.size&&(this.position=t.size),void(this.file=t)}throw new DOMException(...SYNTAX("truncate requires a size argument"))}}e=new Blob([e]);let i=this.file;const s=i.slice(0,this.position),n=i.slice(this.position+e.size);let a=this.position-s.size;a<0&&(a=0),i=new File([s,new Uint8Array(a),e,n],i.name),this.size=i.size,this.position+=e.size,this.file=i}async close(){const[e]=await this._cache.keys(this.path);if(!e)throw new DOMException(...GONE);return this._cache.put(this.path,new Response(this.file,FILE()))}}export class FileHandle{constructor(e,t){this._cache=t,this.path=e,this.kind="file",this.writable=!0,this.readable=!0}get name(){return this.path.split("/").pop()}async isSameEntry(e){return this.path===e.path}async getFile(){const e=await this._cache.match(this.path);if(!e)throw new DOMException(...GONE);const t=await e.blob();return new File([t],this.name,{lastModified:+e.headers.get("last-modified")})}async createWritable(e){const[t]=await this._cache.keys(this.path);if(!t)throw new DOMException(...GONE);return new Sink(this._cache,this.path,e.keepExistingData?await this.getFile():new File([],this.name))}}export class FolderHandle{constructor(e,t){this._dir=e,this.writable=!0,this.readable=!0,this._cache=t,this.kind="directory",this.name=e.split("/").pop()}async*entries(){for(const[e,t]of Object.entries(await this._tree))yield[e.split("/").pop(),t?new FileHandle(e,this._cache):new FolderHandle(e,this._cache)]}async isSameEntry(e){return this._dir===e._dir}async getDirectoryHandle(e,t){const i=this._dir.endsWith("/")?this._dir+e:`${this._dir}/${e}`,s=await this._tree;if(hasOwn.call(s,i)){if(s[i])throw new DOMException(...MISMATCH);return new FolderHandle(i,this._cache)}if(t.create)return s[i]=!1,await this._cache.put(i,new Response("{}",DIR)),await this._save(s),new FolderHandle(i,this._cache);throw new DOMException(...GONE)}get _tree(){return this._cache.match(this._dir).then((e=>e.json())).catch((e=>{throw new DOMException(...GONE)}))}_save(e){return this._cache.put(this._dir,new Response(JSON.stringify(e),DIR))}async getFileHandle(e,t){const i=this._dir.endsWith("/")?this._dir+e:`${this._dir}/${e}`,s=await this._tree;if(hasOwn.call(s,i)){if(!s[i])throw new DOMException(...MISMATCH);return new FileHandle(i,this._cache)}if(t.create){const e=await this._tree;return e[i]=!0,await this._cache.put(i,new Response("",FILE())),await this._save(e),new FileHandle(i,this._cache)}throw new DOMException(...GONE)}async removeEntry(e,t){const i=await this._tree,s=this._dir.endsWith("/")?this._dir+e:`${this._dir}/${e}`;if(!hasOwn.call(i,s))throw new DOMException(...GONE);if(t.recursive){const e=[...Object.entries(i)];for(;e.length;){const[t,i]=e.pop();if(i)await this._cache.delete(t);else{const i=await this._cache.match(t).then((e=>e.json()));e.push(...Object.entries(i))}}delete i[s]}else{const e=i[s];if(delete i[s],e)await this._cache.delete(s);else{const e=await this._cache.match(s).then((e=>e.json()));if(Object.keys(e).length)throw new DOMException(...MOD_ERR);await this._cache.delete(s)}}await this._save(i)}}export default async function(){const e=await caches.open("sandboxed-fs");return await e.match("/")||await e.put("/",new Response("{}",DIR)),new FolderHandle(location.origin+"/",e)} \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/deno.js b/core/static/core/js/native-file-system-adapter/src/adapters/deno.js new file mode 100644 index 00000000..bd2320aa --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/deno.js @@ -0,0 +1 @@ +import{join,basename}from"https://deno.land/std@0.108.0/path/mod.ts";import{errors}from"../util.js";const{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX}=errors;async function fileFrom(t){const e=Deno.readFileSync(t),i=await Deno.stat(t);return new File([e],basename(t),{lastModified:Number(i.mtime)})}export class Sink{constructor(t,e){this.fileHandle=t,this.size=e,this.position=0}async abort(){await this.fileHandle.close()}async write(t){if("object"==typeof t)if("write"===t.type){if(Number.isInteger(t.position)&&t.position>=0&&(this.position=t.position),!("data"in t))throw await this.fileHandle.close(),new DOMException(...SYNTAX("write requires a data argument"));t=t.data}else{if("seek"===t.type){if(Number.isInteger(t.position)&&t.position>=0){if(this.size=0)return await this.fileHandle.truncate(t.size),this.size=t.size,void(this.position>this.size&&(this.position=this.size));throw await this.fileHandle.close(),new DOMException(...SYNTAX("truncate requires a size argument"))}}if(t instanceof ArrayBuffer)t=new Uint8Array(t);else if("string"==typeof t)t=(new TextEncoder).encode(t);else if(t instanceof Blob){await this.fileHandle.seek(this.position,Deno.SeekMode.Start);for await(const e of t.stream()){const t=await this.fileHandle.write(e);this.position+=t,this.size+=t}return}await this.fileHandle.seek(this.position,Deno.SeekMode.Start);const e=await this.fileHandle.write(t);this.position+=e,this.size+=e}async close(){await this.fileHandle.close()}}export class FileHandle{#t;constructor(t,e){this.#t=t,this.name=e,this.kind="file"}async getFile(){return await Deno.stat(this.#t).catch((t=>{if("NotFound"===t.name)throw new DOMException(...GONE)})),fileFrom(this.#t)}async isSameEntry(t){return this.#t===this.#e.apply(t)}#e(){return this.#t}async createWritable(t){const e=await Deno.open(this.#t,{write:!0,truncate:!t.keepExistingData}).catch((t=>{if("NotFound"===t.name)throw new DOMException(...GONE);throw t})),{size:i}=await e.stat();return new Sink(e,i)}}export class FolderHandle{#t="";constructor(t,e=""){this.name=e,this.kind="directory",this.#t=join(t)}async isSameEntry(t){return this.#t===this.#e.apply(t)}#e(){return this.#t}async*entries(){const t=this.#t;try{for await(const e of Deno.readDir(t)){const{name:i}=e,n=join(t,i),o=await Deno.lstat(n);o.isFile?yield[i,new FileHandle(n,i)]:o.isDirectory&&(yield[i,new FolderHandle(n,i)])}}catch(t){throw"NotFound"===t.name?new DOMException(...GONE):t}}async getDirectoryHandle(t,e){const i=join(this.#t,t),n=await Deno.lstat(i).catch((t=>{if("NotFound"!==t.name)throw t})),o=n?.isDirectory;if(n&&o)return new FolderHandle(i,t);if(n&&!o)throw new DOMException(...MISMATCH);if(!e.create)throw new DOMException(...GONE);return await Deno.mkdir(i),new FolderHandle(i,t)}async getFileHandle(t,e){const i=join(this.#t,t),n=await Deno.lstat(i).catch((t=>{if("NotFound"!==t.name)throw t})),o=n?.isFile;if(n&&o)return new FileHandle(i,t);if(n&&!o)throw new DOMException(...MISMATCH);if(!e.create)throw new DOMException(...GONE);return(await Deno.open(i,{create:!0,write:!0})).close(),new FileHandle(i,t)}async queryPermission(){return"granted"}async removeEntry(t,e){const i=join(this.#t,t);(await Deno.lstat(i).catch((t=>{if("NotFound"===t.name)throw new DOMException(...GONE);throw t}))).isDirectory?e.recursive?await Deno.remove(i,{recursive:!0}).catch((t=>{if("ENOTEMPTY"===t.code)throw new DOMException(...MOD_ERR);throw t})):await Deno.remove(i).catch((()=>{throw new DOMException(...MOD_ERR)})):await Deno.remove(i)}}export default t=>new FolderHandle(join(Deno.cwd(),t)); \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/downloader.js b/core/static/core/js/native-file-system-adapter/src/adapters/downloader.js new file mode 100644 index 00000000..aca88970 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/downloader.js @@ -0,0 +1 @@ +import{errors}from"../util.js";import config from"../config.js";const{WritableStream:WritableStream,TransformStream:TransformStream,DOMException:DOMException,Blob:Blob}=config,{GONE:GONE}=errors,isOldSafari=/constructor/i.test(window.HTMLElement);export class FileHandle{constructor(e="unkown"){this.name=e,this.kind="file"}async getFile(){throw new DOMException(...GONE)}async isSameEntry(e){return this===e}async createWritable(e={}){const t=await(navigator.serviceWorker?.getRegistration()),r=document.createElement("a"),s=new TransformStream,a=s.writable;if(r.download=this.name,isOldSafari||!t){let e=[];s.readable.pipeTo(new WritableStream({write(t){e.push(new Blob([t]))},close(){const t=new Blob(e,{type:"application/octet-stream; charset=utf-8"});e=[],r.href=URL.createObjectURL(t),r.click(),setTimeout((()=>URL.revokeObjectURL(r.href)),1e4)}}))}else{const{writable:r,readablePort:a}=new RemoteWritableStream(WritableStream),o=encodeURIComponent(this.name).replace(/['()]/g,escape).replace(/\*/g,"%2A"),n={"content-disposition":"attachment; filename*=UTF-8''"+o,"content-type":"application/octet-stream; charset=utf-8",...e.size?{"content-length":e.size}:{}},i=setTimeout((()=>t.active.postMessage(0)),1e4);s.readable.pipeThrough(new TransformStream({transform(e,t){if(e instanceof Uint8Array)return t.enqueue(e);const r=new Response(e).body.getReader(),s=e=>r.read().then((e=>e.done?0:s(t.enqueue(e.value))));return s()}})).pipeTo(r).finally((()=>{clearInterval(i)})),t.active.postMessage({url:t.scope+o,headers:n,readablePort:a},[a]);const c=document.createElement("iframe");c.hidden=!0,c.src=t.scope+o,document.body.appendChild(c)}return a.getWriter()}}const WRITE=0,PULL=0,ERROR=1,ABORT=1,CLOSE=2;class MessagePortSink{constructor(e){e.onmessage=e=>this._onMessage(e.data),this._port=e,this._resetReady()}start(e){return this._controller=e,this._readyPromise}write(e){const t={type:0,chunk:e};return this._port.postMessage(t,[e.buffer]),this._resetReady(),this._readyPromise}close(){this._port.postMessage({type:2}),this._port.close()}abort(e){this._port.postMessage({type:1,reason:e}),this._port.close()}_onMessage(e){0===e.type&&this._resolveReady(),1===e.type&&this._onError(e.reason)}_onError(e){this._controller.error(e),this._rejectReady(e),this._port.close()}_resetReady(){this._readyPromise=new Promise(((e,t)=>{this._readyResolve=e,this._readyReject=t})),this._readyPending=!0}_resolveReady(){this._readyResolve(),this._readyPending=!1}_rejectReady(e){this._readyPending||this._resetReady(),this._readyPromise.catch((()=>{})),this._readyReject(e),this._readyPending=!1}}class RemoteWritableStream{constructor(e){const t=new MessageChannel;this.readablePort=t.port1,this.writable=new e(new MessagePortSink(t.port2))}} \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/indexeddb.js b/core/static/core/js/native-file-system-adapter/src/adapters/indexeddb.js new file mode 100644 index 00000000..a8c3a18f --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/indexeddb.js @@ -0,0 +1 @@ +import{errors}from"../util.js";const{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX,ABORT:ABORT}=errors;function setupTxErrorHandler(e,t){e.onerror=()=>t(e.error),e.onabort=()=>t(e.error||new DOMException(...ABORT))}class Sink{constructor(e,t,i,s){this.db=e,this.id=t,this.size=i,this.position=0,this.file=s}write(e){if("object"==typeof e)if("write"===e.type){if(Number.isInteger(e.position)&&e.position>=0&&(this.size=0){if(this.size=0){let t=this.file;return t=e.sizet.size&&(this.position=t.size),void(this.file=t)}throw new DOMException(...SYNTAX("truncate requires a size argument"))}}e=new Blob([e]);let t=this.file;const i=t.slice(0,this.position),s=t.slice(this.position+e.size);let n=this.position-i.size;n<0&&(n=0),t=new File([i,new Uint8Array(n),e,s],t.name),this.size=t.size,this.position+=e.size,this.file=t}close(){return new Promise(((e,t)=>{const[i,s]=store(this.db);s.get(this.id).onsuccess=e=>{e.target.result?s.put(this.file,this.id):t(new DOMException(...GONE))},i.oncomplete=()=>e(),i.onerror=t,i.onabort=t}))}}class FileHandle{constructor(e,t,i){this._db=e,this._id=t,this.name=i,this.kind="file",this.readable=!0,this.writable=!0}async isSameEntry(e){return this._id===e._id}async getFile(){const e=await new Promise(((e,t)=>{const i=store(this._db)[1].get(this._id);i.onsuccess=t=>e(t.target.result),i.onerror=e=>t(e.target.error)}));if(!e)throw new DOMException(...GONE);return e}async createWritable(e){let t=await this.getFile();return t=e.keepExistingData?t:new File([],this.name),new Sink(this._db,this._id,t.size,t)}}function store(e){const t=e.transaction("entries","readwrite",{durability:"relaxed"});return[t,t.objectStore("entries")]}function rimraf(e,t,i=!0){const{source:s,result:n}=e.target;for(const[e,r]of Object.values(t||n))r?s.delete(e):i?(s.get(e).onsuccess=rimraf,s.delete(e)):s.get(e).onsuccess=t=>{0!==Object.keys(t.target.result).length?t.target.transaction.abort():s.delete(e)}}class FolderHandle{constructor(e,t,i){this._db=e,this._id=t,this.kind="directory",this.name=i,this.readable=!0,this.writable=!0}async*entries(){const e=store(this._db)[1].get(this._id);await new Promise(((t,i)=>{e.onsuccess=()=>t(),e.onerror=()=>i(e.error)}));const t=e.result;if(!t)throw new DOMException(...GONE);for(const[e,[i,s]]of Object.entries(t))yield[e,s?new FileHandle(this._db,i,e):new FolderHandle(this._db,i,e)]}isSameEntry(e){return this._id===e._id}getDirectoryHandle(e,t){return new Promise(((i,s)=>{const n=store(this._db)[1],r=n.get(this._id);r.onsuccess=()=>{const o=r.result,c=o[e];c?c[1]?s(new DOMException(...MISMATCH)):i(new FolderHandle(this._db,c[0],e)):t.create?n.add({}).onsuccess=t=>{const s=t.target.result;o[e]=[s,!1],n.put(o,this._id).onsuccess=()=>i(new FolderHandle(this._db,s,e))}:s(new DOMException(...GONE))}}))}getFileHandle(e,t){return new Promise(((i,s)=>{const n=store(this._db)[1],r=n.get(this._id);r.onsuccess=()=>{const o=r.result,c=o[e];if(c&&c[1]&&i(new FileHandle(this._db,c[0],e)),c&&!c[1]&&s(new DOMException(...MISMATCH)),c||t.create||s(new DOMException(...GONE)),!c&&t.create){const t=n.put(new File([],e));t.onsuccess=()=>{const s=t.result;o[e]=[s,!0];n.put(o,this._id).onsuccess=()=>{i(new FileHandle(this._db,s,e))}}}}}))}async removeEntry(e,t){return new Promise(((i,s)=>{const[n,r]=store(this._db),o=r.get(this._id);o.onsuccess=i=>{const n=o.result,c={_:n[e]};if(!c._)return s(new DOMException(...GONE));delete n[e],r.put(n,this._id),rimraf(i,c,!!t.recursive)},n.oncomplete=i,n.onerror=s,n.onabort=()=>{s(new DOMException(...MOD_ERR))}}))}}export default(e={persistent:!1})=>new Promise((e=>{const t=indexedDB.open("fileSystem");t.onupgradeneeded=()=>{const e=t.result;e.createObjectStore("entries",{autoIncrement:!0}).transaction.oncomplete=t=>{e.transaction("entries","readwrite").objectStore("entries").add({})}},t.onsuccess=()=>{e(new FolderHandle(t.result,1,""))}})); \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/jsdelivr.js b/core/static/core/js/native-file-system-adapter/src/adapters/jsdelivr.js new file mode 100644 index 00000000..ad1b66b2 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/jsdelivr.js @@ -0,0 +1 @@ +import{errors}from"../util.js";const{GONE:GONE,MISMATCH:MISMATCH,SYNTAX:SYNTAX,DISALLOWED:DISALLOWED}=errors;export class FileHandle{constructor(e,t){this.name=e.name,this.kind="file",this._deleted=!1,this._root=t,this._entry=e,this.writable=!1,this.readable=!0}async getFile(){const e=await fetch(`https://cdn.jsdelivr.net/${this._root}/${this.name}`),t=await e.blob();return new File([t],this.name,{type:t.type,lastModified:this._entry.time})}async createWritable(){throw new DOMException(...DISALLOWED)}async isSameEntry(e){return this===e}}function toDic(e,t){const n={};for(const i of e)i.time=+new Date(i.time),"file"===i.type?n[i.name]=new FileHandle(i,t):n[i.name]=new FolderHandle(i.files,`${t}/${i.name}`,i.name);return n}export class FolderHandle{constructor(e,t,n=""){this.name=n,this.kind="directory",this._deleted=!1,this._entries=toDic(e,t),this.writable=!1,this.readable=!0}async*entries(){yield*Object.entries(this._entries)}async isSameEntry(e){return this===e}async getDirectoryHandle(e,t){if(this._deleted)throw new DOMException(...GONE);const n=this._entries[e];if(n){if(n instanceof FileHandle)throw new DOMException(...MISMATCH);return n}throw t.create?new DOMException(...DISALLOWED):new DOMException(...GONE)}async getFileHandle(e,t){const n=this._entries[e],i=n instanceof FileHandle;if(n&&i)return n;if(n&&!i)throw new DOMException(...MISMATCH);if(!n&&!t.create)throw new DOMException(...GONE);if(!n&&t.create)throw new DOMException(...DISALLOWED)}async removeEntry(e,t){throw new DOMException(...DISALLOWED)}}export default async e=>{const t=await fetch(`https://data.jsdelivr.com/v1/package/${e}`),{files:n}=await t.json();return new FolderHandle(n,e)}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/memory.js b/core/static/core/js/native-file-system-adapter/src/adapters/memory.js new file mode 100644 index 00000000..7c08f6e7 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/memory.js @@ -0,0 +1 @@ +import{errors}from"../util.js";import config from"../config.js";const{File:File,Blob:Blob,DOMException:DOMException}=config,{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX,SECURITY:SECURITY,DISALLOWED:DISALLOWED}=errors;export class Sink{constructor(e,i){this.fileHandle=e,this.file=i,this.size=i.size,this.position=0}write(e){let i=this.file;if("object"==typeof e)if("write"===e.type){if(Number.isInteger(e.position)&&e.position>=0&&(this.position=e.position,this.size=0){if(this.size=0)return i=e.sizei.size&&(this.position=i.size),void(this.file=i);throw new DOMException(...SYNTAX("truncate requires a size argument"))}}e=new Blob([e]);let t=this.file;const s=t.slice(0,this.position),n=t.slice(this.position+e.size);let o=this.position-s.size;o<0&&(o=0),t=new File([s,new Uint8Array(o),e,n],t.name),this.size=t.size,this.position+=e.size,this.file=t}close(){if(this.fileHandle._deleted)throw new DOMException(...GONE);this.fileHandle._file=this.file,this.file=this.position=this.size=null,this.fileHandle.onclose&&this.fileHandle.onclose(this.fileHandle)}}export class FileHandle{constructor(e="",i=new File([],e),t=!0){this._file=i,this.name=e,this.kind="file",this._deleted=!1,this.writable=t,this.readable=!0}async getFile(){if(this._deleted)throw new DOMException(...GONE);return this._file}async createWritable(e){if(!this.writable)throw new DOMException(...DISALLOWED);if(this._deleted)throw new DOMException(...GONE);const i=e.keepExistingData?await this.getFile():new File([],this.name);return new Sink(this,i)}async isSameEntry(e){return this===e}async _destroy(){this._deleted=!0,this._file=null}}export class FolderHandle{constructor(e,i=!0){this.name=e,this.kind="directory",this._deleted=!1,this._entries={},this.writable=i,this.readable=!0}async*entries(){if(this._deleted)throw new DOMException(...GONE);yield*Object.entries(this._entries)}async isSameEntry(e){return this===e}async getDirectoryHandle(e,i){if(this._deleted)throw new DOMException(...GONE);const t=this._entries[e];if(t){if(t instanceof FileHandle)throw new DOMException(...MISMATCH);return t}if(i.create)return this._entries[e]=new FolderHandle(e);throw new DOMException(...GONE)}async getFileHandle(e,i){const t=this._entries[e],s=t instanceof FileHandle;if(t&&s)return t;if(t&&!s)throw new DOMException(...MISMATCH);if(!t&&!i.create)throw new DOMException(...GONE);return!t&&i.create?this._entries[e]=new FileHandle(e):void 0}async removeEntry(e,i){const t=this._entries[e];if(!t)throw new DOMException(...GONE);await t._destroy(i.recursive),delete this._entries[e]}async _destroy(e){for(let i of Object.values(this._entries)){if(!e)throw new DOMException(...MOD_ERR);await i._destroy(e)}this._entries={},this._deleted=!0}}const fs=new FolderHandle("");export default()=>fs; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/node.js b/core/static/core/js/native-file-system-adapter/src/adapters/node.js new file mode 100644 index 00000000..4f1018d1 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/node.js @@ -0,0 +1 @@ +import fs from"node:fs/promises";import{join}from"node:path";import{errors}from"../util.js";import config from"../config.js";const{DOMException:DOMException}=config,{INVALID:INVALID,GONE:GONE,MISMATCH:MISMATCH,MOD_ERR:MOD_ERR,SYNTAX:SYNTAX}=errors;function isBlob(t){return t&&"object"==typeof t&&"function"==typeof t.constructor&&("function"==typeof t.stream||"function"==typeof t.arrayBuffer)&&/^(Blob|File)$/.test(t[Symbol.toStringTag])}export class Sink{constructor(t,i){this._fileHandle=t,this._size=i,this._position=0}async abort(){await this._fileHandle.close()}async write(t){if("object"==typeof t)if("write"===t.type){if(Number.isInteger(t.position)&&t.position>=0&&(this._position=t.position),!("data"in t))throw await this._fileHandle.close(),new DOMException(...SYNTAX("write requires a data argument"));t=t.data}else{if("seek"===t.type){if(Number.isInteger(t.position)&&t.position>=0){if(this._size=0)return await this._fileHandle.truncate(t.size),this._size=t.size,void(this._position>this._size&&(this._position=this._size));throw await this._fileHandle.close(),new DOMException(...SYNTAX("truncate requires a size argument"))}}if(t instanceof ArrayBuffer)t=new Uint8Array(t);else if("string"==typeof t)t=Buffer.from(t);else if(isBlob(t)){for await(const i of t.stream()){const t=await this._fileHandle.writev([i],this._position);this._position+=t.bytesWritten,this._size+=t.bytesWritten}return}const i=await this._fileHandle.writev([t],this._position);this._position+=i.bytesWritten,this._size+=i.bytesWritten}async close(){await this._fileHandle.close()}}export class FileHandle{constructor(t,i){this._path=t,this.name=i,this.kind="file"}async getFile(){await fs.stat(this._path).catch((t=>{if("ENOENT"===t.code)throw new DOMException(...GONE)}));const{fileFrom:t}=await import("fetch-blob/from.js");return t(this._path)}async isSameEntry(t){return this._path===this._getPath.apply(t)}_getPath(){return this._path}async createWritable(t){const i=await fs.open(this._path,t.keepExistingData?"r+":"w+").catch((t=>{if("ENOENT"===t.code)throw new DOMException(...GONE);throw t})),{size:e}=await i.stat();return new Sink(i,e)}}export class FolderHandle{_path="";constructor(t="",i=""){this.name=i,this.kind="directory",this._path=t}async isSameEntry(t){return this._path===t._path}async*entries(){const t=this._path,i=await fs.readdir(t).catch((t=>{if("ENOENT"===t.code)throw new DOMException(...GONE);throw t}));for(let e of i){const i=join(t,e),o=await fs.lstat(i);o.isFile()?yield[e,new FileHandle(i,e)]:o.isDirectory()&&(yield[e,new FolderHandle(i,e)])}}async getDirectoryHandle(t,i){const e=join(this._path,t),o=await fs.lstat(e).catch((t=>{if("ENOENT"!==t.code)throw t})),s=o?.isDirectory();if(o&&s)return new FolderHandle(e,t);if(o&&!s)throw new DOMException(...MISMATCH);if(!i.create)throw new DOMException(...GONE);return await fs.mkdir(e),new FolderHandle(e,t)}async getFileHandle(t,i){const e=join(this._path,t),o=await fs.lstat(e).catch((t=>{if("ENOENT"!==t.code)throw t})),s=o?.isFile();if(o&&s)return new FileHandle(e,t);if(o&&!s)throw new DOMException(...MISMATCH);if(!i.create)throw new DOMException(...GONE);return await(await fs.open(e,"w")).close(),new FileHandle(e,t)}async queryPermission(){return"granted"}async removeEntry(t,i){const e=join(this._path,t);(await fs.lstat(e).catch((t=>{if("ENOENT"===t.code)throw new DOMException(...GONE);throw t}))).isDirectory()?i.recursive?await fs.rm(e,{recursive:!0}).catch((t=>{if("ENOTEMPTY"===t.code)throw new DOMException(...MOD_ERR);throw t})):await fs.rmdir(e).catch((t=>{if("ENOTEMPTY"===t.code)throw new DOMException(...MOD_ERR);throw t})):await fs.unlink(e)}}export default t=>new FolderHandle(t); \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/adapters/sandbox.js b/core/static/core/js/native-file-system-adapter/src/adapters/sandbox.js new file mode 100644 index 00000000..e6110eba --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/adapters/sandbox.js @@ -0,0 +1 @@ +import{errors}from"../util.js";const{DISALLOWED:DISALLOWED}=errors;class Sink{constructor(e,i){this.writer=e,this.fileEntry=i}async write(e){if("object"==typeof e)if("write"===e.type){if(Number.isInteger(e.position)&&e.position>=0&&(this.writer.seek(e.position),this.writer.position!==e.position&&(await new Promise(((i,t)=>{this.writer.onwriteend=i,this.writer.onerror=t,this.writer.truncate(e.position)})),this.writer.seek(e.position))),!("data"in e))throw new DOMException("Failed to execute 'write' on 'UnderlyingSinkBase': Invalid params passed. write requires a data argument","SyntaxError");e=e.data}else{if("seek"===e.type){if(Number.isInteger(e.position)&&e.position>=0){if(this.writer.seek(e.position),this.writer.position!==e.position)throw new DOMException("seeking position failed","InvalidStateError");return}throw new DOMException("Failed to execute 'write' on 'UnderlyingSinkBase': Invalid params passed. seek requires a position argument","SyntaxError")}if("truncate"===e.type)return new Promise((i=>{if(!(Number.isInteger(e.size)&&e.size>=0))throw new DOMException("Failed to execute 'write' on 'UnderlyingSinkBase': Invalid params passed. truncate requires a size argument","SyntaxError");this.writer.onwriteend=e=>i(),this.writer.truncate(e.size)}))}await new Promise(((i,t)=>{this.writer.onwriteend=i,this.writer.onerror=t,this.writer.write(new Blob([e]))}))}close(){return new Promise(this.fileEntry.file.bind(this.fileEntry))}}export class FileHandle{constructor(e,i=!0){this.file=e,this.kind="file",this.writable=i,this.readable=!0}get name(){return this.file.name}isSameEntry(e){return this.file.toURL()===e.file.toURL()}getFile(){return new Promise(this.file.file.bind(this.file))}createWritable(e){if(!this.writable)throw new DOMException(...DISALLOWED);return new Promise(((i,t)=>this.file.createWriter((t=>{!1===e.keepExistingData?(t.onwriteend=e=>i(new Sink(t,this.file)),t.truncate(0)):i(new Sink(t,this.file))}),t)))}}export class FolderHandle{constructor(e,i=!0){this.dir=e,this.writable=i,this.readable=!0,this.kind="directory",this.name=e.name}isSameEntry(e){return this.dir.fullPath===e.dir.fullPath}async*entries(){const e=this.dir.createReader(),i=await new Promise(e.readEntries.bind(e));for(const e of i)yield[e.name,e.isFile?new FileHandle(e,this.writable):new FolderHandle(e,this.writable)]}getDirectoryHandle(e,i){return new Promise(((t,r)=>{this.dir.getDirectory(e,i,(e=>{t(new FolderHandle(e))}),r)}))}getFileHandle(e,i){return new Promise(((t,r)=>this.dir.getFile(e,i,(e=>t(new FileHandle(e))),r)))}async removeEntry(e,i){const t=await this.getDirectoryHandle(e,{create:!1}).catch((i=>"TypeMismatchError"===i.name?this.getFileHandle(e,{create:!1}):i));if(t instanceof Error)throw t;return new Promise(((e,r)=>{t instanceof FolderHandle?i.recursive?t.dir.removeRecursively((()=>e()),r):t.dir.remove((()=>e()),r):t.file&&t.file.remove((()=>e()),r)}))}}export default(e={})=>new Promise(((i,t)=>window.webkitRequestFileSystem(e._persistent,0,(e=>i(new FolderHandle(e.root))),t))); \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/config.js b/core/static/core/js/native-file-system-adapter/src/config.js new file mode 100644 index 00000000..ffa0159d --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/config.js @@ -0,0 +1 @@ +const config={ReadableStream:globalThis.ReadableStream,WritableStream:globalThis.WritableStream,TransformStream:globalThis.TransformStream,DOMException:globalThis.DOMException,Blob:globalThis.Blob,File:globalThis.File};export default config; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/es6.js b/core/static/core/js/native-file-system-adapter/src/es6.js new file mode 100644 index 00000000..2f336005 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/es6.js @@ -0,0 +1 @@ +import showDirectoryPicker from"./showDirectoryPicker.js";import showOpenFilePicker from"./showOpenFilePicker.js";import showSaveFilePicker from"./showSaveFilePicker.js";import getOriginPrivateDirectory from"./getOriginPrivateDirectory.js";import FileSystemWritableFileStream from"./FileSystemWritableFileStream.js";import FileSystemDirectoryHandle from"./FileSystemDirectoryHandle.js";import FileSystemFileHandle from"./FileSystemFileHandle.js";import FileSystemHandle from"./FileSystemHandle.js";export{FileSystemDirectoryHandle,FileSystemFileHandle,FileSystemHandle,FileSystemWritableFileStream,getOriginPrivateDirectory,showDirectoryPicker,showOpenFilePicker,showSaveFilePicker}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/getOriginPrivateDirectory.js b/core/static/core/js/native-file-system-adapter/src/getOriginPrivateDirectory.js new file mode 100644 index 00000000..c4b5531d --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/getOriginPrivateDirectory.js @@ -0,0 +1 @@ +async function getOriginPrivateDirectory(e,t={}){if(!e)return globalThis.navigator?.storage?.getDirectory()||globalThis.getOriginPrivateDirectory();const{FileSystemDirectoryHandle:i}=await import("./FileSystemDirectoryHandle.js"),r=await e;return new i(await(r.default?r.default(t):r(t)))}globalThis.DataTransferItem&&!DataTransferItem.prototype.getAsFileSystemHandle&&(DataTransferItem.prototype.getAsFileSystemHandle=async function(){const e=this.webkitGetAsEntry(),[{FileHandle:t,FolderHandle:i},{FileSystemDirectoryHandle:r},{FileSystemFileHandle:a}]=await Promise.all([import("./adapters/sandbox.js"),import("./FileSystemDirectoryHandle.js"),import("./FileSystemFileHandle.js")]);return e.isFile?new a(new t(e,!1)):new r(new i(e,!1))});export default getOriginPrivateDirectory; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/showDirectoryPicker.js b/core/static/core/js/native-file-system-adapter/src/showDirectoryPicker.js new file mode 100644 index 00000000..6e102a09 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/showDirectoryPicker.js @@ -0,0 +1 @@ +const native=globalThis.showDirectoryPicker;async function showDirectoryPicker(e={}){if(native&&!e._preferPolyfill)return native(e);const t=document.createElement("input");t.type="file",t.webkitdirectory=!0,t.multiple=!0,t.style.position="fixed",t.style.top="-100000px",t.style.left="-100000px",document.body.appendChild(t);const i=import("./util.js");return await new Promise((e=>{t.addEventListener("change",e),t.click()})),i.then((e=>e.getDirHandlesFromInput(t)))}export default showDirectoryPicker;export{showDirectoryPicker}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/showOpenFilePicker.js b/core/static/core/js/native-file-system-adapter/src/showOpenFilePicker.js new file mode 100644 index 00000000..493994cd --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/showOpenFilePicker.js @@ -0,0 +1 @@ +const def={accepts:[]},native=globalThis.showOpenFilePicker;async function showOpenFilePicker(e={}){const t={...def,...e};if(native&&!e._preferPolyfill)return native(t);const i=document.createElement("input");i.type="file",i.multiple=t.multiple,i.accept=(t.accepts||[]).map((e=>[...(e.extensions||[]).map((e=>"."+e)),...e.mimeTypes||[]])).flat().join(","),Object.assign(i.style,{position:"fixed",top:"-100000px",left:"-100000px"}),document.body.appendChild(i);const n=import("./util.js");return await new Promise((e=>{i.addEventListener("change",e,{once:!0}),i.click()})),i.remove(),n.then((e=>e.getFileHandlesFromInput(i)))}export default showOpenFilePicker;export{showOpenFilePicker}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/showSaveFilePicker.js b/core/static/core/js/native-file-system-adapter/src/showSaveFilePicker.js new file mode 100644 index 00000000..4889f44f --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/showSaveFilePicker.js @@ -0,0 +1 @@ +const native=globalThis.showSaveFilePicker;async function showSaveFilePicker(e={}){if(native&&!e._preferPolyfill)return native(e);e._name&&(console.warn("deprecated _name, spec now have `suggestedName`"),e.suggestedName=e._name);const{FileSystemFileHandle:a}=await import("./FileSystemFileHandle.js"),{FileHandle:i}=await import("./adapters/downloader.js");return new a(new i(e.suggestedName))}export default showSaveFilePicker;export{showSaveFilePicker}; \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/src/util.js b/core/static/core/js/native-file-system-adapter/src/util.js new file mode 100644 index 00000000..da9ef546 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/src/util.js @@ -0,0 +1 @@ +export const errors={INVALID:["seeking position failed.","InvalidStateError"],GONE:["A requested file or directory could not be found at the time an operation was processed.","NotFoundError"],MISMATCH:["The path supplied exists, but was not an entry of requested type.","TypeMismatchError"],MOD_ERR:["The object can not be modified in this way.","InvalidModificationError"],SYNTAX:e=>[`Failed to execute 'write' on 'UnderlyingSinkBase': Invalid params passed. ${e}`,"SyntaxError"],SECURITY:["It was determined that certain files are unsafe for access within a Web application, or that too many calls are being made on file resources.","SecurityError"],DISALLOWED:["The request is not allowed by the user agent or the platform in the current context.","NotAllowedError"]};export const config={writable:globalThis.WritableStream};export async function fromDataTransfer(e){console.warn("deprecated fromDataTransfer - use `dt.items[0].getAsFileSystemHandle()` instead");const[t,r,a]=await Promise.all([import("./adapters/memory.js"),import("./adapters/sandbox.js"),import("./FileSystemDirectoryHandle.js")]),n=new t.FolderHandle("",!1);return n._entries=e.map((e=>e.isFile?new r.FileHandle(e,!1):new r.FolderHandle(e,!1))),new a.FileSystemDirectoryHandle(n)}export async function getDirHandlesFromInput(e){const{FolderHandle:t,FileHandle:r}=await import("./adapters/memory.js"),{FileSystemDirectoryHandle:a}=await import("./FileSystemDirectoryHandle.js"),n=Array.from(e.files),i=n[0].webkitRelativePath.split("/",1)[0],o=new t(i,!1);return n.forEach((e=>{const a=e.webkitRelativePath.split("/");a.shift();const n=a.pop();a.reduce(((e,r)=>(e._entries[r]||(e._entries[r]=new t(r,!1)),e._entries[r])),o)._entries[n]=new r(e.name,e,!1)})),new a(o)}export async function getFileHandlesFromInput(e){const{FileHandle:t}=await import("./adapters/memory.js"),{FileSystemFileHandle:r}=await import("./FileSystemFileHandle.js");return Array.from(e.files).map((e=>new r(new t(e.name,e,!1))))} \ No newline at end of file diff --git a/core/static/core/js/native-file-system-adapter/sw.js b/core/static/core/js/native-file-system-adapter/sw.js new file mode 100644 index 00000000..f7847503 --- /dev/null +++ b/core/static/core/js/native-file-system-adapter/sw.js @@ -0,0 +1 @@ +const WRITE=0,PULL=0,ERROR=1,ABORT=1,CLOSE=2,PING=3;class MessagePortSource{controller;constructor(e){this.port=e,this.port.onmessage=e=>this.onMessage(e.data)}start(e){this.controller=e}pull(){this.port.postMessage({type:0})}cancel(e){this.port.postMessage({type:1,reason:e.message}),this.port.close()}onMessage(e){0===e.type&&this.controller.enqueue(e.chunk),1===e.type&&(this.controller.error(e.reason),this.port.close()),2===e.type&&(this.controller.close(),this.port.close())}}self.addEventListener("install",(()=>{self.skipWaiting()})),self.addEventListener("activate",(e=>{e.waitUntil(self.clients.claim())}));const map=new Map;globalThis.addEventListener("message",(e=>{const t=e.data;t.url&&t.readablePort&&(t.rs=new ReadableStream(new MessagePortSource(e.data.readablePort),new CountQueuingStrategy({highWaterMark:4})),map.set(t.url,t))})),globalThis.addEventListener("fetch",(e=>{const t=e.request.url,s=map.get(t);if(!s)return null;map.delete(t),e.respondWith(new Response(s.rs,{headers:s.headers}))})); \ No newline at end of file diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja index de3f2af0..992d326f 100644 --- a/core/templates/core/user_pictures.jinja +++ b/core/templates/core/user_pictures.jinja @@ -1,111 +1,102 @@ {% extends "core/base.jinja" %} {%- block additional_css -%} - + {%- endblock -%} +{% block additional_js %} + + + +{% endblock %} + {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s pictures{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s pictures{% endtrans %} {% endblock %} {% block content %} -
+
{% if can_edit(profile, user) %} - + {% endif %} {% for a in albums %} -

{{ a.name }}

-
- {% for p in pictures[a.id] %} - {% if p.can_be_viewed_by(user) %} - -
- {% if not p.is_moderated %} -
 
-
{% trans %}To be moderated{% endtrans %}
- {% else %} -
 
- {% endif %} -
- +

{{ a.name }}

+
+ {% for p in pictures[a.id] %} + {% if p.can_be_viewed_by(user) %} + +
+ {% if not p.is_moderated %} +
 
+
{% trans %}To be moderated{% endtrans %}
{% else %} -
-
-
{% trans %}Picture Unavailable{% endtrans %}
-
-
+
 
{% endif %} - {% endfor %} -
-
+
+ + {% else %} +
+
+
{% trans %}Picture Unavailable{% endtrans %}
+
+
+ {% endif %} + {% endfor %} +
+
{% endfor %} -
-{% endblock %} + -{% endblock %} + resolve(data); + }) + }), + { binary: true } + ); + }); + let fileHandle = await window.showSaveFilePicker({ + _preferPolyfill: false, + suggestedName: "{%- trans -%} pictures {%- endtrans -%}.zip", + types: {}, + excludeAcceptAllOption: false, + }) + let writeStream = await fileHandle.createWritable(); + + await zip.generateInternalStream({ + type: "uint8array", + streamFiles: true, + compression: "DEFLATE", + compressionOptions: { level: 9 } + }) + .on("data", (data) => writeStream.write(data)) + .on("error", (err) => console.error(err)) + .on("end", () => writeStream.close()) + .resume(); + } + +
+{% endblock %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 1c3a693e..c50d72c1 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2,11 +2,11 @@ # Copyright (C) 2016 # This file is distributed under the same license as the Sith package. # Skia , 2016 -# +# msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-10 16:10+0200\n" +"POT-Creation-Date: 2024-07-24 14:33+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -16,166 +16,166 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: accounting/models.py:52 accounting/models.py:101 accounting/models.py:136 -#: accounting/models.py:211 club/models.py:54 com/models.py:286 -#: com/models.py:305 counter/models.py:212 counter/models.py:247 -#: counter/models.py:363 forum/models.py:60 launderette/models.py:29 -#: launderette/models.py:86 launderette/models.py:126 stock/models.py:38 -#: stock/models.py:61 stock/models.py:103 stock/models.py:131 +#: accounting/models.py:50 accounting/models.py:91 accounting/models.py:124 +#: accounting/models.py:191 club/models.py:52 com/models.py:276 +#: com/models.py:295 counter/models.py:208 counter/models.py:239 +#: counter/models.py:355 forum/models.py:59 launderette/models.py:29 +#: launderette/models.py:84 launderette/models.py:122 stock/models.py:36 +#: stock/models.py:57 stock/models.py:97 stock/models.py:125 msgid "name" msgstr "nom" -#: accounting/models.py:53 +#: accounting/models.py:51 msgid "street" msgstr "rue" -#: accounting/models.py:54 +#: accounting/models.py:52 msgid "city" msgstr "ville" -#: accounting/models.py:55 +#: accounting/models.py:53 msgid "postcode" msgstr "code postal" -#: accounting/models.py:56 +#: accounting/models.py:54 msgid "country" msgstr "pays" -#: accounting/models.py:57 core/models.py:360 +#: accounting/models.py:55 core/models.py:364 msgid "phone" msgstr "téléphone" -#: accounting/models.py:58 +#: accounting/models.py:56 msgid "email" msgstr "email" -#: accounting/models.py:59 +#: accounting/models.py:57 msgid "website" msgstr "site internet" -#: accounting/models.py:62 +#: accounting/models.py:60 msgid "company" msgstr "entreprise" -#: accounting/models.py:102 +#: accounting/models.py:92 msgid "iban" msgstr "IBAN" -#: accounting/models.py:103 +#: accounting/models.py:93 msgid "account number" msgstr "numéro de compte" -#: accounting/models.py:107 accounting/models.py:140 club/models.py:356 -#: com/models.py:76 com/models.py:271 com/models.py:311 counter/models.py:265 -#: counter/models.py:365 trombi/models.py:215 +#: accounting/models.py:97 accounting/models.py:128 club/models.py:344 +#: com/models.py:76 com/models.py:261 com/models.py:301 counter/models.py:257 +#: counter/models.py:357 trombi/models.py:210 msgid "club" msgstr "club" -#: accounting/models.py:112 +#: accounting/models.py:102 msgid "Bank account" msgstr "Compte en banque" -#: accounting/models.py:146 +#: accounting/models.py:134 msgid "bank account" msgstr "compte en banque" -#: accounting/models.py:151 +#: accounting/models.py:139 msgid "Club account" msgstr "Compte club" -#: accounting/models.py:198 +#: accounting/models.py:180 #, python-format msgid "%(club_account)s on %(bank_account)s" msgstr "%(club_account)s sur %(bank_account)s" -#: accounting/models.py:209 club/models.py:362 counter/models.py:883 -#: election/models.py:18 launderette/models.py:185 +#: accounting/models.py:189 club/models.py:350 counter/models.py:841 +#: election/models.py:16 launderette/models.py:179 msgid "start date" msgstr "date de début" -#: accounting/models.py:210 club/models.py:363 counter/models.py:884 -#: election/models.py:19 +#: accounting/models.py:190 club/models.py:351 counter/models.py:842 +#: election/models.py:17 msgid "end date" msgstr "date de fin" -#: accounting/models.py:212 +#: accounting/models.py:192 msgid "is closed" msgstr "est fermé" -#: accounting/models.py:217 accounting/models.py:542 +#: accounting/models.py:197 accounting/models.py:507 msgid "club account" msgstr "compte club" -#: accounting/models.py:220 accounting/models.py:286 counter/models.py:54 -#: counter/models.py:601 +#: accounting/models.py:200 accounting/models.py:260 counter/models.py:55 +#: counter/models.py:561 msgid "amount" msgstr "montant" -#: accounting/models.py:221 +#: accounting/models.py:201 msgid "effective_amount" msgstr "montant effectif" -#: accounting/models.py:224 +#: accounting/models.py:204 msgid "General journal" msgstr "Classeur" -#: accounting/models.py:278 +#: accounting/models.py:252 msgid "number" msgstr "numéro" -#: accounting/models.py:283 +#: accounting/models.py:257 msgid "journal" msgstr "classeur" -#: accounting/models.py:287 core/models.py:916 core/models.py:1477 -#: core/models.py:1525 core/models.py:1554 core/models.py:1580 -#: counter/models.py:611 counter/models.py:706 counter/models.py:919 -#: eboutic/models.py:57 eboutic/models.py:226 forum/models.py:314 -#: forum/models.py:413 stock/models.py:102 +#: accounting/models.py:261 core/models.py:902 core/models.py:1438 +#: core/models.py:1483 core/models.py:1512 core/models.py:1536 +#: counter/models.py:571 counter/models.py:664 counter/models.py:877 +#: eboutic/models.py:55 eboutic/models.py:214 forum/models.py:311 +#: forum/models.py:412 stock/models.py:96 msgid "date" msgstr "date" -#: accounting/models.py:288 counter/models.py:214 counter/models.py:920 -#: pedagogy/models.py:217 stock/models.py:105 +#: accounting/models.py:262 counter/models.py:210 counter/models.py:878 +#: pedagogy/models.py:207 stock/models.py:99 msgid "comment" msgstr "commentaire" -#: accounting/models.py:290 counter/models.py:613 counter/models.py:708 +#: accounting/models.py:264 counter/models.py:573 counter/models.py:666 #: subscription/models.py:56 msgid "payment method" msgstr "méthode de paiement" -#: accounting/models.py:295 +#: accounting/models.py:269 msgid "cheque number" msgstr "numéro de chèque" -#: accounting/models.py:300 eboutic/models.py:319 +#: accounting/models.py:274 eboutic/models.py:308 msgid "invoice" msgstr "facture" -#: accounting/models.py:305 +#: accounting/models.py:279 msgid "is done" msgstr "est fait" -#: accounting/models.py:309 +#: accounting/models.py:283 msgid "simple type" msgstr "type simplifié" -#: accounting/models.py:317 accounting/models.py:481 +#: accounting/models.py:291 accounting/models.py:450 msgid "accounting type" msgstr "type comptable" -#: accounting/models.py:325 accounting/models.py:469 accounting/models.py:506 -#: accounting/models.py:538 core/models.py:1553 core/models.py:1581 -#: counter/models.py:672 +#: accounting/models.py:299 accounting/models.py:438 accounting/models.py:471 +#: accounting/models.py:503 core/models.py:1511 core/models.py:1537 +#: counter/models.py:630 msgid "label" msgstr "étiquette" -#: accounting/models.py:331 +#: accounting/models.py:305 msgid "target type" msgstr "type de cible" -#: accounting/models.py:334 club/models.py:525 +#: accounting/models.py:308 club/models.py:506 #: club/templates/club/club_members.jinja:17 #: club/templates/club/club_old_members.jinja:8 #: club/templates/club/mailing.jinja:41 @@ -187,7 +187,7 @@ msgstr "type de cible" msgid "User" msgstr "Utilisateur" -#: accounting/models.py:335 club/models.py:424 +#: accounting/models.py:309 club/models.py:409 #: club/templates/club/club_detail.jinja:12 #: com/templates/com/mailing_admin.jinja:11 #: com/templates/com/news_admin_list.jinja:23 @@ -211,36 +211,36 @@ msgstr "Utilisateur" msgid "Club" msgstr "Club" -#: accounting/models.py:336 core/views/user.py:297 +#: accounting/models.py:310 core/views/user.py:278 msgid "Account" msgstr "Compte" -#: accounting/models.py:337 +#: accounting/models.py:311 msgid "Company" msgstr "Entreprise" -#: accounting/models.py:338 core/models.py:307 sith/settings.py:403 +#: accounting/models.py:312 core/models.py:311 sith/settings.py:405 #: stock/templates/stock/shopping_list_items.jinja:37 msgid "Other" msgstr "Autre" -#: accounting/models.py:341 +#: accounting/models.py:315 msgid "target id" msgstr "id de la cible" -#: accounting/models.py:343 +#: accounting/models.py:317 msgid "target label" msgstr "nom de la cible" -#: accounting/models.py:348 +#: accounting/models.py:322 msgid "linked operation" msgstr "opération liée" -#: accounting/models.py:380 +#: accounting/models.py:354 msgid "The date must be set." msgstr "La date doit être indiquée." -#: accounting/models.py:384 +#: accounting/models.py:358 #, python-format msgid "" "The date can not be before the start date of the journal, which is\n" @@ -249,16 +249,16 @@ msgstr "" "La date ne peut pas être avant la date de début du journal, qui est\n" "%(start_date)s." -#: accounting/models.py:394 +#: accounting/models.py:368 msgid "Target does not exists" msgstr "La cible n'existe pas." -#: accounting/models.py:397 +#: accounting/models.py:371 msgid "Please add a target label if you set no existing target" msgstr "" "Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante" -#: accounting/models.py:402 +#: accounting/models.py:376 msgid "" "You need to provide ether a simplified accounting type or a standard " "accounting type" @@ -266,41 +266,41 @@ msgstr "" "Vous devez fournir soit un type comptable simplifié ou un type comptable " "standard" -#: accounting/models.py:461 counter/models.py:257 pedagogy/models.py:44 +#: accounting/models.py:430 counter/models.py:249 pedagogy/models.py:41 msgid "code" msgstr "code" -#: accounting/models.py:465 +#: accounting/models.py:434 msgid "An accounting type code contains only numbers" msgstr "Un code comptable ne contient que des numéros" -#: accounting/models.py:471 +#: accounting/models.py:440 msgid "movement type" msgstr "type de mouvement" -#: accounting/models.py:473 +#: accounting/models.py:442 #: accounting/templates/accounting/journal_statement_nature.jinja:9 #: accounting/templates/accounting/journal_statement_person.jinja:12 -#: accounting/views.py:593 +#: accounting/views.py:549 msgid "Credit" msgstr "Crédit" -#: accounting/models.py:474 +#: accounting/models.py:443 #: accounting/templates/accounting/journal_statement_nature.jinja:28 #: accounting/templates/accounting/journal_statement_person.jinja:40 -#: accounting/views.py:593 +#: accounting/views.py:549 msgid "Debit" msgstr "Débit" -#: accounting/models.py:475 +#: accounting/models.py:444 msgid "Neutral" msgstr "Neutre" -#: accounting/models.py:510 +#: accounting/models.py:475 msgid "simplified accounting types" msgstr "type simplifié" -#: accounting/models.py:515 +#: accounting/models.py:480 msgid "simplified type" msgstr "type simplifié" @@ -379,9 +379,8 @@ msgstr "Compte en banque : " #: election/templates/election/election_detail.jinja:187 #: forum/templates/forum/macros.jinja:21 forum/templates/forum/macros.jinja:134 #: launderette/templates/launderette/launderette_admin.jinja:16 -#: launderette/views.py:217 pedagogy/templates/pedagogy/guide.jinja:67 -#: pedagogy/templates/pedagogy/guide.jinja:90 -#: pedagogy/templates/pedagogy/guide.jinja:126 +#: launderette/views.py:217 pedagogy/templates/pedagogy/guide.jinja:94 +#: pedagogy/templates/pedagogy/guide.jinja:109 #: pedagogy/templates/pedagogy/uv_detail.jinja:185 #: sas/templates/sas/album.jinja:37 sas/templates/sas/main.jinja:63 #: sas/templates/sas/moderation.jinja:18 sas/templates/sas/picture.jinja:64 @@ -393,7 +392,7 @@ msgid "Delete" msgstr "Supprimer" #: accounting/templates/accounting/bank_account_details.jinja:18 -#: club/views.py:79 core/views/user.py:216 sas/templates/sas/picture.jinja:79 +#: club/views.py:79 core/views/user.py:197 sas/templates/sas/picture.jinja:79 msgid "Infos" msgstr "Infos" @@ -427,7 +426,7 @@ msgstr "Nouveau compte club" #: com/templates/com/weekmail.jinja:61 core/templates/core/file.jinja:38 #: core/templates/core/group_list.jinja:24 core/templates/core/page.jinja:35 #: core/templates/core/poster_list.jinja:40 -#: core/templates/core/user_tools.jinja:71 core/views/user.py:246 +#: core/templates/core/user_tools.jinja:71 core/views/user.py:227 #: counter/templates/counter/cash_summary_list.jinja:53 #: counter/templates/counter/counter_list.jinja:17 #: counter/templates/counter/counter_list.jinja:33 @@ -436,9 +435,8 @@ msgstr "Nouveau compte club" #: forum/templates/forum/macros.jinja:20 forum/templates/forum/macros.jinja:62 #: forum/templates/forum/macros.jinja:128 #: launderette/templates/launderette/launderette_list.jinja:16 -#: pedagogy/templates/pedagogy/guide.jinja:66 -#: pedagogy/templates/pedagogy/guide.jinja:89 -#: pedagogy/templates/pedagogy/guide.jinja:125 +#: pedagogy/templates/pedagogy/guide.jinja:93 +#: pedagogy/templates/pedagogy/guide.jinja:108 #: pedagogy/templates/pedagogy/uv_detail.jinja:184 #: sas/templates/sas/album.jinja:36 trombi/templates/trombi/detail.jinja:9 #: trombi/templates/trombi/edit_profile.jinja:34 @@ -530,7 +528,7 @@ msgid "Effective amount" msgstr "Montant effectif" #: accounting/templates/accounting/club_account_details.jinja:36 -#: sith/settings.py:449 +#: sith/settings.py:451 msgid "Closed" msgstr "Fermé" @@ -667,7 +665,7 @@ msgid "Done" msgstr "Effectuées" #: accounting/templates/accounting/journal_details.jinja:41 -#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1077 +#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1002 #: pedagogy/templates/pedagogy/moderation.jinja:13 #: pedagogy/templates/pedagogy/uv_detail.jinja:138 #: trombi/templates/trombi/comment.jinja:4 @@ -789,7 +787,7 @@ msgstr "Opération liée : " #: core/templates/core/user_preferences.jinja:27 #: core/templates/core/user_preferences.jinja:65 #: counter/templates/counter/cash_register_summary.jinja:28 -#: forum/templates/forum/reply.jinja:33 +#: forum/templates/forum/reply.jinja:34 #: subscription/templates/subscription/subscription.jinja:25 #: trombi/templates/trombi/comment.jinja:26 #: trombi/templates/trombi/edit_profile.jinja:13 @@ -799,7 +797,7 @@ msgstr "Sauver" #: accounting/templates/accounting/refound_account.jinja:4 #: accounting/templates/accounting/refound_account.jinja:9 -#: accounting/views.py:924 +#: accounting/views.py:868 msgid "Refound account" msgstr "Remboursement de compte" @@ -820,189 +818,189 @@ msgstr "Types simplifiés" msgid "New simplified type" msgstr "Nouveau type simplifié" -#: accounting/views.py:238 accounting/views.py:248 accounting/views.py:568 +#: accounting/views.py:208 accounting/views.py:218 accounting/views.py:524 msgid "Journal" msgstr "Classeur" -#: accounting/views.py:258 +#: accounting/views.py:228 msgid "Statement by nature" msgstr "Bilan par nature" -#: accounting/views.py:268 +#: accounting/views.py:238 msgid "Statement by person" msgstr "Bilan par personne" -#: accounting/views.py:278 +#: accounting/views.py:248 msgid "Accounting statement" msgstr "Bilan comptable" -#: accounting/views.py:382 +#: accounting/views.py:344 msgid "Link this operation to the target account" msgstr "Lier cette opération au compte cible" -#: accounting/views.py:412 +#: accounting/views.py:374 msgid "The target must be set." msgstr "La cible doit être indiquée." -#: accounting/views.py:427 +#: accounting/views.py:389 msgid "The amount must be set." msgstr "Le montant doit être indiqué." -#: accounting/views.py:562 accounting/views.py:568 +#: accounting/views.py:518 accounting/views.py:524 msgid "Operation" msgstr "Opération" -#: accounting/views.py:577 +#: accounting/views.py:533 msgid "Financial proof: " msgstr "Justificatif de libellé : " -#: accounting/views.py:580 +#: accounting/views.py:536 #, python-format msgid "Club: %(club_name)s" msgstr "Club : %(club_name)s" -#: accounting/views.py:585 +#: accounting/views.py:541 #, python-format msgid "Label: %(op_label)s" msgstr "Libellé : %(op_label)s" -#: accounting/views.py:588 +#: accounting/views.py:544 #, python-format msgid "Date: %(date)s" msgstr "Date : %(date)s" -#: accounting/views.py:596 +#: accounting/views.py:552 #, python-format msgid "Amount: %(amount).2f €" msgstr "Montant : %(amount).2f €" -#: accounting/views.py:611 +#: accounting/views.py:567 msgid "Debtor" msgstr "Débiteur" -#: accounting/views.py:611 +#: accounting/views.py:567 msgid "Creditor" msgstr "Créditeur" -#: accounting/views.py:616 +#: accounting/views.py:572 msgid "Comment:" msgstr "Commentaire :" -#: accounting/views.py:641 +#: accounting/views.py:597 msgid "Signature:" msgstr "Signature :" -#: accounting/views.py:709 +#: accounting/views.py:663 msgid "General statement" msgstr "Bilan général" -#: accounting/views.py:716 +#: accounting/views.py:670 msgid "No label operations" msgstr "Opérations sans étiquette" -#: accounting/views.py:880 +#: accounting/views.py:826 msgid "Refound this account" msgstr "Rembourser ce compte" -#: club/forms.py:57 club/forms.py:189 +#: club/forms.py:55 club/forms.py:181 msgid "Users to add" msgstr "Utilisateurs à ajouter" -#: club/forms.py:58 club/forms.py:190 core/views/group.py:51 +#: club/forms.py:56 club/forms.py:182 core/views/group.py:47 msgid "Search users to add (one or more)." msgstr "Recherche les utilisateurs à ajouter (un ou plus)." -#: club/forms.py:67 +#: club/forms.py:65 msgid "New Mailing" msgstr "Nouvelle mailing liste" -#: club/forms.py:68 +#: club/forms.py:66 msgid "Subscribe" msgstr "S'abonner" -#: club/forms.py:69 club/forms.py:82 com/templates/com/news_admin_list.jinja:40 +#: club/forms.py:67 club/forms.py:80 com/templates/com/news_admin_list.jinja:40 #: com/templates/com/news_admin_list.jinja:116 #: com/templates/com/news_admin_list.jinja:198 #: com/templates/com/news_admin_list.jinja:274 msgid "Remove" msgstr "Retirer" -#: club/forms.py:72 launderette/views.py:219 +#: club/forms.py:70 launderette/views.py:219 #: pedagogy/templates/pedagogy/moderation.jinja:15 msgid "Action" msgstr "Action" -#: club/forms.py:112 club/tests.py:741 +#: club/forms.py:108 club/tests.py:699 msgid "This field is required" msgstr "Ce champ est obligatoire" -#: club/forms.py:124 club/forms.py:249 club/tests.py:754 +#: club/forms.py:118 club/forms.py:241 club/tests.py:712 msgid "One of the selected users doesn't exist" msgstr "Un des utilisateurs sélectionné n'existe pas" -#: club/forms.py:128 club/tests.py:771 +#: club/forms.py:122 club/tests.py:729 msgid "One of the selected users doesn't have an email address" msgstr "Un des utilisateurs sélectionnés n'a pas d'adresse email" -#: club/forms.py:139 +#: club/forms.py:133 msgid "An action is required" msgstr "Une action est requise" -#: club/forms.py:150 club/tests.py:728 +#: club/forms.py:144 club/tests.py:686 msgid "You must specify at least an user or an email address" msgstr "vous devez spécifier au moins un utilisateur ou une adresse email" -#: club/forms.py:158 counter/forms.py:173 +#: club/forms.py:152 counter/forms.py:171 msgid "Begin date" msgstr "Date de début" -#: club/forms.py:159 com/views.py:80 com/views.py:195 counter/forms.py:174 -#: election/views.py:167 subscription/views.py:38 +#: club/forms.py:153 com/views.py:80 com/views.py:195 counter/forms.py:172 +#: election/views.py:164 subscription/views.py:38 msgid "End date" msgstr "Date de fin" -#: club/forms.py:162 club/templates/club/club_sellings.jinja:21 +#: club/forms.py:156 club/templates/club/club_sellings.jinja:21 #: core/templates/core/user_account_detail.jinja:18 #: core/templates/core/user_account_detail.jinja:51 -#: counter/templates/counter/cash_summary_list.jinja:33 counter/views.py:148 +#: counter/templates/counter/cash_summary_list.jinja:33 counter/views.py:151 msgid "Counter" msgstr "Comptoir" -#: club/forms.py:169 counter/views.py:775 +#: club/forms.py:163 counter/views.py:734 msgid "Products" msgstr "Produits" -#: club/forms.py:174 counter/views.py:780 +#: club/forms.py:168 counter/views.py:739 msgid "Archived products" msgstr "Produits archivés" -#: club/forms.py:231 club/templates/club/club_members.jinja:22 +#: club/forms.py:223 club/templates/club/club_members.jinja:22 #: club/templates/club/club_members.jinja:48 #: core/templates/core/user_clubs.jinja:31 msgid "Mark as old" msgstr "Marquer comme ancien" -#: club/forms.py:253 +#: club/forms.py:245 msgid "User must be subscriber to take part to a club" msgstr "L'utilisateur doit être cotisant pour faire partie d'un club" -#: club/forms.py:257 core/views/group.py:70 +#: club/forms.py:249 core/views/group.py:64 msgid "You can not add the same user twice" msgstr "Vous ne pouvez pas ajouter deux fois le même utilisateur" -#: club/forms.py:278 +#: club/forms.py:268 msgid "You should specify a role" msgstr "Vous devez choisir un rôle" -#: club/forms.py:289 sas/views.py:118 sas/views.py:185 sas/views.py:284 +#: club/forms.py:279 sas/views.py:118 sas/views.py:185 sas/views.py:284 msgid "You do not have the permission to do that" msgstr "Vous n'avez pas la permission de faire cela" -#: club/models.py:59 +#: club/models.py:57 msgid "unix name" msgstr "nom unix" -#: club/models.py:66 +#: club/models.py:64 msgid "" "Enter a valid unix name. This value may contain only letters, numbers ./-/_ " "characters." @@ -1010,90 +1008,90 @@ msgstr "" "Entrez un nom UNIX valide. Cette valeur peut contenir uniquement des " "lettres, des nombres, et les caractères ./-/_" -#: club/models.py:71 +#: club/models.py:69 msgid "A club with that unix name already exists." msgstr "Un club avec ce nom UNIX existe déjà." -#: club/models.py:74 +#: club/models.py:72 msgid "logo" msgstr "logo" -#: club/models.py:76 +#: club/models.py:74 msgid "is active" msgstr "actif" -#: club/models.py:78 +#: club/models.py:76 msgid "short description" msgstr "description courte" -#: club/models.py:80 core/models.py:362 +#: club/models.py:78 core/models.py:366 msgid "address" msgstr "Adresse" -#: club/models.py:97 core/models.py:273 +#: club/models.py:95 core/models.py:277 msgid "home" msgstr "home" -#: club/models.py:149 +#: club/models.py:147 msgid "You can not make loops in clubs" msgstr "Vous ne pouvez pas faire de boucles dans les clubs" -#: club/models.py:173 +#: club/models.py:171 msgid "A club with that unix_name already exists" msgstr "Un club avec ce nom UNIX existe déjà." -#: club/models.py:348 counter/models.py:874 counter/models.py:910 -#: eboutic/models.py:53 eboutic/models.py:222 election/models.py:191 -#: launderette/models.py:140 launderette/models.py:204 sas/models.py:231 -#: trombi/models.py:211 +#: club/models.py:336 counter/models.py:832 counter/models.py:868 +#: eboutic/models.py:51 eboutic/models.py:210 election/models.py:183 +#: launderette/models.py:136 launderette/models.py:198 sas/models.py:228 +#: trombi/models.py:206 msgid "user" msgstr "nom d'utilisateur" -#: club/models.py:365 core/models.py:326 election/models.py:186 -#: election/models.py:222 trombi/models.py:216 +#: club/models.py:353 core/models.py:330 election/models.py:178 +#: election/models.py:212 trombi/models.py:211 msgid "role" msgstr "rôle" -#: club/models.py:370 core/models.py:84 counter/models.py:213 -#: counter/models.py:248 election/models.py:15 election/models.py:119 -#: election/models.py:196 forum/models.py:61 forum/models.py:245 +#: club/models.py:358 core/models.py:88 counter/models.py:209 +#: counter/models.py:240 election/models.py:13 election/models.py:115 +#: election/models.py:188 forum/models.py:60 forum/models.py:244 msgid "description" msgstr "description" -#: club/models.py:431 club/models.py:531 +#: club/models.py:416 club/models.py:512 msgid "Email address" msgstr "Adresse email" -#: club/models.py:439 +#: club/models.py:424 msgid "Enter a valid address. Only the root of the address is needed." msgstr "" "Entrez une adresse valide. Seule la racine de l'adresse est nécessaire." -#: club/models.py:443 com/models.py:84 com/models.py:321 core/models.py:917 +#: club/models.py:428 com/models.py:84 com/models.py:311 core/models.py:903 msgid "is moderated" msgstr "est modéré" -#: club/models.py:447 com/models.py:88 com/models.py:325 +#: club/models.py:432 com/models.py:88 com/models.py:315 msgid "moderator" msgstr "modérateur" -#: club/models.py:474 +#: club/models.py:459 msgid "This mailing list already exists." msgstr "Cette liste de diffusion existe déjà." -#: club/models.py:517 club/templates/club/mailing.jinja:23 +#: club/models.py:498 club/templates/club/mailing.jinja:23 msgid "Mailing" msgstr "Liste de diffusion" -#: club/models.py:541 +#: club/models.py:522 msgid "At least user or email is required" msgstr "Au moins un utilisateur ou un email est nécessaire" -#: club/models.py:549 club/tests.py:799 +#: club/models.py:530 club/tests.py:757 msgid "This email is already suscribed in this mailing" msgstr "Cet email est déjà abonné à cette mailing" -#: club/models.py:577 +#: club/models.py:558 msgid "Unregistered user" msgstr "Utilisateur non enregistré" @@ -1147,7 +1145,7 @@ msgid "There are no members in this club." msgstr "Il n'y a pas de membres dans ce club." #: club/templates/club/club_members.jinja:80 -#: core/templates/core/file_detail.jinja:19 core/views/forms.py:334 +#: core/templates/core/file_detail.jinja:19 core/views/forms.py:333 #: launderette/views.py:217 trombi/templates/trombi/detail.jinja:19 msgid "Add" msgstr "Ajouter" @@ -1355,8 +1353,8 @@ msgstr "Anciens membres" msgid "History" msgstr "Historique" -#: club/views.py:116 core/templates/core/base.jinja:96 core/views/user.py:239 -#: sas/templates/sas/picture.jinja:100 trombi/views.py:62 +#: club/views.py:116 core/templates/core/base.jinja:96 core/views/user.py:220 +#: sas/templates/sas/picture.jinja:100 trombi/views.py:61 msgid "Tools" msgstr "Outils" @@ -1364,7 +1362,7 @@ msgstr "Outils" msgid "Edit club page" msgstr "Éditer la page de club" -#: club/views.py:145 club/views.py:471 +#: club/views.py:145 club/views.py:451 #, fuzzy #| msgid "Selling" msgid "Sellings" @@ -1412,9 +1410,9 @@ msgstr "Hebdomadaire" msgid "Call" msgstr "Appel" -#: com/models.py:69 com/models.py:178 com/models.py:260 election/models.py:14 -#: election/models.py:118 election/models.py:158 forum/models.py:256 -#: forum/models.py:312 pedagogy/models.py:99 +#: com/models.py:69 com/models.py:176 com/models.py:250 election/models.py:12 +#: election/models.py:114 election/models.py:152 forum/models.py:255 +#: forum/models.py:309 pedagogy/models.py:96 msgid "title" msgstr "titre" @@ -1422,70 +1420,70 @@ msgstr "titre" msgid "summary" msgstr "résumé" -#: com/models.py:71 com/models.py:261 trombi/models.py:192 +#: com/models.py:71 com/models.py:251 trombi/models.py:189 msgid "content" msgstr "contenu" -#: com/models.py:73 core/models.py:1523 launderette/models.py:94 -#: launderette/models.py:134 launderette/models.py:187 stock/models.py:78 -#: stock/models.py:135 +#: com/models.py:73 core/models.py:1481 launderette/models.py:92 +#: launderette/models.py:130 launderette/models.py:181 stock/models.py:74 +#: stock/models.py:129 msgid "type" msgstr "type" -#: com/models.py:81 com/models.py:265 pedagogy/models.py:59 -#: pedagogy/models.py:209 trombi/models.py:182 +#: com/models.py:81 com/models.py:255 pedagogy/models.py:56 +#: pedagogy/models.py:199 trombi/models.py:179 msgid "author" msgstr "auteur" -#: com/models.py:156 +#: com/models.py:155 msgid "news_date" msgstr "date de la nouvelle" -#: com/models.py:159 +#: com/models.py:158 msgid "start_date" msgstr "date de début" -#: com/models.py:160 +#: com/models.py:159 msgid "end_date" msgstr "date de fin" -#: com/models.py:179 +#: com/models.py:177 msgid "intro" msgstr "intro" -#: com/models.py:180 +#: com/models.py:178 msgid "joke" msgstr "blague" -#: com/models.py:181 +#: com/models.py:179 msgid "protip" msgstr "astuce" -#: com/models.py:182 +#: com/models.py:180 msgid "conclusion" msgstr "conclusion" -#: com/models.py:183 +#: com/models.py:181 msgid "sent" msgstr "envoyé" -#: com/models.py:256 +#: com/models.py:246 msgid "weekmail" msgstr "weekmail" -#: com/models.py:274 +#: com/models.py:264 msgid "rank" msgstr "rang" -#: com/models.py:307 core/models.py:882 core/models.py:932 +#: com/models.py:297 core/models.py:868 core/models.py:918 msgid "file" msgstr "fichier" -#: com/models.py:319 +#: com/models.py:309 msgid "display time" msgstr "temps d'affichage" -#: com/models.py:350 +#: com/models.py:340 msgid "Begin date should be before end date" msgstr "La date de début doit être avant celle de fin" @@ -1573,8 +1571,8 @@ msgstr "Type" #: com/templates/com/news_admin_list.jinja:286 #: com/templates/com/weekmail.jinja:19 com/templates/com/weekmail.jinja:48 #: forum/templates/forum/forum.jinja:28 forum/templates/forum/forum.jinja:47 -#: forum/templates/forum/main.jinja:30 forum/views.py:242 -#: pedagogy/templates/pedagogy/guide.jinja:60 +#: forum/templates/forum/main.jinja:30 forum/views.py:245 +#: pedagogy/templates/pedagogy/guide.jinja:87 msgid "Title" msgstr "Titre" @@ -1906,7 +1904,7 @@ msgstr "Le mot de la fin" msgid "Format: 16:9 | Resolution: 1920x1080" msgstr "Format : 16:9 | Résolution : 1920x1080" -#: com/views.py:76 com/views.py:194 election/views.py:166 +#: com/views.py:76 com/views.py:194 election/views.py:163 #: subscription/views.py:35 msgid "Start date" msgstr "Date de début" @@ -1962,30 +1960,30 @@ msgstr "" "Vous devez êtres un membre du bureau du club sélectionné pour poster dans le " "Weekmail." -#: core/models.py:79 +#: core/models.py:83 msgid "meta group status" msgstr "status du meta-groupe" -#: core/models.py:81 +#: core/models.py:85 msgid "Whether a group is a meta group or not" msgstr "Si un groupe est un meta-groupe ou pas" -#: core/models.py:170 +#: core/models.py:171 #, python-format msgid "%(value)s is not a valid promo (between 0 and %(end)s)" msgstr "%(value)s n'est pas une promo valide (doit être entre 0 et %(end)s)" -#: core/models.py:226 +#: core/models.py:230 msgid "username" msgstr "nom d'utilisateur" -#: core/models.py:230 +#: core/models.py:234 msgid "Required. 254 characters or fewer. Letters, digits and ./+/-/_ only." msgstr "" "Requis. Pas plus de 254 caractères. Uniquement des lettres, numéros, et ./" "+/-/_" -#: core/models.py:236 +#: core/models.py:240 msgid "" "Enter a valid username. This value may contain only letters, numbers and ./" "+/-/_ characters." @@ -1993,43 +1991,43 @@ msgstr "" "Entrez un nom d'utilisateur correct. Uniquement des lettres, numéros, et ./" "+/-/_" -#: core/models.py:242 +#: core/models.py:246 msgid "A user with that username already exists." msgstr "Un utilisateur de ce nom existe déjà" -#: core/models.py:244 +#: core/models.py:248 msgid "first name" msgstr "Prénom" -#: core/models.py:245 +#: core/models.py:249 msgid "last name" msgstr "Nom" -#: core/models.py:246 +#: core/models.py:250 msgid "email address" msgstr "adresse email" -#: core/models.py:247 +#: core/models.py:251 msgid "date of birth" msgstr "date de naissance" -#: core/models.py:248 +#: core/models.py:252 msgid "nick name" msgstr "surnom" -#: core/models.py:250 +#: core/models.py:254 msgid "staff status" msgstr "status \"staff\"" -#: core/models.py:252 +#: core/models.py:256 msgid "Designates whether the user can log into this admin site." msgstr "Est-ce que l'utilisateur peut se logger à la partie admin du site." -#: core/models.py:255 +#: core/models.py:259 msgid "active" msgstr "actif" -#: core/models.py:258 +#: core/models.py:262 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -2037,163 +2035,163 @@ msgstr "" "Est-ce que l'utilisateur doit être traité comme actif. Désélectionnez au " "lieu de supprimer les comptes." -#: core/models.py:262 +#: core/models.py:266 msgid "date joined" msgstr "date d'inscription" -#: core/models.py:263 +#: core/models.py:267 msgid "last update" msgstr "dernière mise à jour" -#: core/models.py:265 +#: core/models.py:269 msgid "superuser" msgstr "super-utilisateur" -#: core/models.py:267 +#: core/models.py:271 msgid "Designates whether this user is a superuser. " msgstr "Est-ce que l'utilisateur est super-utilisateur." -#: core/models.py:281 +#: core/models.py:285 msgid "profile" msgstr "profil" -#: core/models.py:289 +#: core/models.py:293 msgid "avatar" msgstr "avatar" -#: core/models.py:297 +#: core/models.py:301 msgid "scrub" msgstr "blouse" -#: core/models.py:303 +#: core/models.py:307 msgid "sex" msgstr "Genre" -#: core/models.py:307 +#: core/models.py:311 msgid "Man" msgstr "Homme" -#: core/models.py:307 +#: core/models.py:311 msgid "Woman" msgstr "Femme" -#: core/models.py:309 +#: core/models.py:313 msgid "pronouns" msgstr "pronoms" -#: core/models.py:311 +#: core/models.py:315 msgid "tshirt size" msgstr "taille de t-shirt" -#: core/models.py:314 +#: core/models.py:318 msgid "-" msgstr "-" -#: core/models.py:315 +#: core/models.py:319 msgid "XS" msgstr "XS" -#: core/models.py:316 +#: core/models.py:320 msgid "S" msgstr "S" -#: core/models.py:317 +#: core/models.py:321 msgid "M" msgstr "M" -#: core/models.py:318 +#: core/models.py:322 msgid "L" msgstr "L" -#: core/models.py:319 +#: core/models.py:323 msgid "XL" msgstr "XL" -#: core/models.py:320 +#: core/models.py:324 msgid "XXL" msgstr "XXL" -#: core/models.py:321 +#: core/models.py:325 msgid "XXXL" msgstr "XXXL" -#: core/models.py:329 +#: core/models.py:333 msgid "Student" msgstr "Étudiant" -#: core/models.py:330 +#: core/models.py:334 msgid "Administrative agent" msgstr "Personnel administratif" -#: core/models.py:331 +#: core/models.py:335 msgid "Teacher" msgstr "Enseignant" -#: core/models.py:332 +#: core/models.py:336 msgid "Agent" msgstr "Personnel" -#: core/models.py:333 +#: core/models.py:337 msgid "Doctor" msgstr "Doctorant" -#: core/models.py:334 +#: core/models.py:338 msgid "Former student" msgstr "Ancien étudiant" -#: core/models.py:335 +#: core/models.py:339 msgid "Service" msgstr "Service" -#: core/models.py:341 +#: core/models.py:345 msgid "department" msgstr "département" -#: core/models.py:348 +#: core/models.py:352 msgid "dpt option" msgstr "Filière" -#: core/models.py:350 pedagogy/models.py:72 pedagogy/models.py:301 +#: core/models.py:354 pedagogy/models.py:69 pedagogy/models.py:293 msgid "semester" msgstr "semestre" -#: core/models.py:351 +#: core/models.py:355 msgid "quote" msgstr "citation" -#: core/models.py:352 +#: core/models.py:356 msgid "school" msgstr "école" -#: core/models.py:354 +#: core/models.py:358 msgid "promo" msgstr "promo" -#: core/models.py:357 +#: core/models.py:361 msgid "forum signature" msgstr "signature du forum" -#: core/models.py:359 +#: core/models.py:363 msgid "second email address" msgstr "adresse email secondaire" -#: core/models.py:361 +#: core/models.py:365 msgid "parent phone" msgstr "téléphone des parents" -#: core/models.py:364 +#: core/models.py:368 msgid "parent address" msgstr "adresse des parents" -#: core/models.py:367 +#: core/models.py:371 msgid "is subscriber viewable" msgstr "profil visible par les cotisants" -#: core/models.py:568 +#: core/models.py:569 msgid "A user with that username already exists" msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" -#: core/models.py:708 core/templates/core/macros.jinja:75 +#: core/models.py:699 core/templates/core/macros.jinja:75 #: core/templates/core/macros.jinja:77 core/templates/core/macros.jinja:78 #: core/templates/core/user_detail.jinja:104 #: core/templates/core/user_detail.jinja:105 @@ -2222,101 +2220,101 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" msgid "Profile" msgstr "Profil" -#: core/models.py:832 +#: core/models.py:818 msgid "Visitor" msgstr "Visiteur" -#: core/models.py:839 +#: core/models.py:825 msgid "receive the Weekmail" msgstr "recevoir le Weekmail" -#: core/models.py:840 +#: core/models.py:826 msgid "show your stats to others" msgstr "montrez vos statistiques aux autres" -#: core/models.py:842 +#: core/models.py:828 msgid "get a notification for every click" msgstr "avoir une notification pour chaque click" -#: core/models.py:845 +#: core/models.py:831 msgid "get a notification for every refilling" msgstr "avoir une notification pour chaque rechargement" -#: core/models.py:871 +#: core/models.py:857 msgid "file name" msgstr "nom du fichier" -#: core/models.py:875 core/models.py:1252 +#: core/models.py:861 core/models.py:1230 msgid "parent" msgstr "parent" -#: core/models.py:889 +#: core/models.py:875 msgid "compressed file" msgstr "version allégée" -#: core/models.py:896 +#: core/models.py:882 msgid "thumbnail" msgstr "miniature" -#: core/models.py:904 core/models.py:921 +#: core/models.py:890 core/models.py:907 msgid "owner" msgstr "propriétaire" -#: core/models.py:908 core/models.py:1269 core/views/files.py:223 +#: core/models.py:894 core/models.py:1247 core/views/files.py:222 msgid "edit group" msgstr "groupe d'édition" -#: core/models.py:911 core/models.py:1272 core/views/files.py:226 +#: core/models.py:897 core/models.py:1250 core/views/files.py:225 msgid "view group" msgstr "groupe de vue" -#: core/models.py:913 +#: core/models.py:899 msgid "is folder" msgstr "est un dossier" -#: core/models.py:914 +#: core/models.py:900 msgid "mime type" msgstr "type mime" -#: core/models.py:915 +#: core/models.py:901 msgid "size" msgstr "taille" -#: core/models.py:926 +#: core/models.py:912 msgid "asked for removal" msgstr "retrait demandé" -#: core/models.py:928 +#: core/models.py:914 msgid "is in the SAS" msgstr "est dans le SAS" -#: core/models.py:1025 +#: core/models.py:1008 msgid "Character '/' not authorized in name" msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier" -#: core/models.py:1027 core/models.py:1031 +#: core/models.py:1010 core/models.py:1014 msgid "Loop in folder tree" msgstr "Boucle dans l'arborescence des dossiers" -#: core/models.py:1034 +#: core/models.py:1017 msgid "You can not make a file be a children of a non folder file" msgstr "" "Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas " "un dossier" -#: core/models.py:1045 +#: core/models.py:1028 msgid "Duplicate file" msgstr "Un fichier de ce nom existe déjà" -#: core/models.py:1062 +#: core/models.py:1045 msgid "You must provide a file" msgstr "Vous devez fournir un fichier" -#: core/models.py:1235 +#: core/models.py:1213 msgid "page unix name" msgstr "nom unix de la page" -#: core/models.py:1241 +#: core/models.py:1219 msgid "" "Enter a valid page name. This value may contain only unaccented letters, " "numbers and ./+/-/_ characters." @@ -2324,55 +2322,55 @@ msgstr "" "Entrez un nom de page correct. Uniquement des lettres non accentuées, " "numéros, et ./+/-/_" -#: core/models.py:1259 +#: core/models.py:1237 msgid "page name" msgstr "nom de la page" -#: core/models.py:1264 +#: core/models.py:1242 msgid "owner group" msgstr "groupe propriétaire" -#: core/models.py:1277 +#: core/models.py:1255 msgid "lock user" msgstr "utilisateur bloquant" -#: core/models.py:1284 +#: core/models.py:1262 msgid "lock_timeout" msgstr "décompte du déblocage" -#: core/models.py:1343 +#: core/models.py:1312 msgid "Duplicate page" msgstr "Une page de ce nom existe déjà" -#: core/models.py:1346 +#: core/models.py:1315 msgid "Loop in page tree" msgstr "Boucle dans l'arborescence des pages" -#: core/models.py:1474 +#: core/models.py:1435 msgid "revision" msgstr "révision" -#: core/models.py:1475 +#: core/models.py:1436 msgid "page title" msgstr "titre de la page" -#: core/models.py:1476 +#: core/models.py:1437 msgid "page content" msgstr "contenu de la page" -#: core/models.py:1520 +#: core/models.py:1478 msgid "url" msgstr "url" -#: core/models.py:1521 +#: core/models.py:1479 msgid "param" msgstr "param" -#: core/models.py:1526 +#: core/models.py:1484 msgid "viewed" msgstr "vue" -#: core/models.py:1586 +#: core/models.py:1542 msgid "operation type" msgstr "type d'opération" @@ -2409,7 +2407,6 @@ msgstr "Inscription" #: matmat/templates/matmat/search_form.jinja:37 #: matmat/templates/matmat/search_form.jinja:46 #: matmat/templates/matmat/search_form.jinja:56 -#: pedagogy/templates/pedagogy/guide.jinja:29 msgid "Search" msgstr "Recherche" @@ -2471,13 +2468,13 @@ msgstr "Forum" msgid "Gallery" msgstr "Photos" -#: core/templates/core/base.jinja:219 counter/models.py:373 +#: core/templates/core/base.jinja:219 counter/models.py:365 #: counter/templates/counter/counter_list.jinja:11 #: eboutic/templates/eboutic/eboutic_main.jinja:4 #: eboutic/templates/eboutic/eboutic_main.jinja:23 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:17 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:402 sith/settings.py:410 +#: sith/settings.py:404 sith/settings.py:412 msgid "Eboutic" msgstr "Eboutic" @@ -2497,7 +2494,7 @@ msgid "Launderette" msgstr "Laverie" #: core/templates/core/base.jinja:225 core/templates/core/file.jinja:20 -#: core/views/files.py:109 +#: core/views/files.py:108 msgid "Files" msgstr "Fichiers" @@ -2584,7 +2581,7 @@ msgstr "Confirmation" #: core/templates/core/delete_confirm.jinja:20 #: core/templates/core/file_delete_confirm.jinja:14 -#: counter/templates/counter/counter_click.jinja:121 +#: counter/templates/counter/counter_click.jinja:122 msgid "Cancel" msgstr "Annuler" @@ -2766,7 +2763,7 @@ msgstr "Cotisant jusqu'au %(subscription_end)s" msgid "Account number: " msgstr "Numéro de compte : " -#: core/templates/core/macros.jinja:91 launderette/models.py:208 +#: core/templates/core/macros.jinja:91 launderette/models.py:202 msgid "Slot" msgstr "Créneau" @@ -2776,6 +2773,7 @@ msgid "Tokens" msgstr "Jetons" #: core/templates/core/macros.jinja:123 core/templates/core/macros.jinja:125 +#: pedagogy/templates/pedagogy/guide.jinja:116 msgid "Previous" msgstr "Précédent" @@ -2784,6 +2782,7 @@ msgid "current" msgstr "actuel" #: core/templates/core/macros.jinja:135 core/templates/core/macros.jinja:137 +#: pedagogy/templates/pedagogy/guide.jinja:120 msgid "Next" msgstr "Suivant" @@ -2987,8 +2986,8 @@ msgstr "L'équipe de %(site_name)s" msgid "" "You're receiving this email because you created an account on the AE website." msgstr "" -"Vous avez reçu cet email parce que vous avez créé un compte sur " -"le site web de l'Association des Étudiants de l'UTBM." +"Vous avez reçu cet email parce que vous avez créé un compte sur le site web " +"de l'Association des Étudiants de l'UTBM." #: core/templates/core/register_confirm_mail.jinja:6 msgid "" @@ -3001,10 +3000,10 @@ msgid "" "directly or by email at ae@utbm.fr.\n" msgstr "" "\n" -"Ceci étant le site des étudiants de l'AE, par les étudiants de l'AE, " -"pour les étudiants de l'AE, vous n'aurez pas accès à tout sans être cotisant. " -"Pour cotiser, veuillez contacter un membre du bureau de l'AE, " -"soit en personne, soit par mail à l'adresse ae@utbm.fr.\n" +"Ceci étant le site des étudiants de l'AE, par les étudiants de l'AE, pour " +"les étudiants de l'AE, vous n'aurez pas accès à tout sans être cotisant. " +"Pour cotiser, veuillez contacter un membre du bureau de l'AE, soit en " +"personne, soit par mail à l'adresse ae@utbm.fr.\n" #: core/templates/core/register_confirm_mail.jinja:12 msgid "Wishing you a good experience among us! " @@ -3018,7 +3017,7 @@ msgstr "Résultat de la recherche" msgid "Users" msgstr "Utilisateurs" -#: core/templates/core/search.jinja:18 core/views/user.py:261 +#: core/templates/core/search.jinja:18 core/views/user.py:242 msgid "Clubs" msgstr "Clubs" @@ -3075,7 +3074,7 @@ msgid "Eboutic invoices" msgstr "Facture eboutic" #: core/templates/core/user_account.jinja:57 -#: core/templates/core/user_tools.jinja:58 counter/views.py:800 +#: core/templates/core/user_tools.jinja:58 counter/views.py:759 msgid "Etickets" msgstr "Etickets" @@ -3258,7 +3257,7 @@ msgstr "Voir l'arbre des ancêtres" msgid "No godfathers / godmothers" msgstr "Pas de famille" -#: core/templates/core/user_godfathers.jinja:38 core/views/user.py:483 +#: core/templates/core/user_godfathers.jinja:38 core/views/user.py:458 msgid "Godchildren" msgstr "Fillots / Fillotes" @@ -3313,30 +3312,30 @@ msgstr "Éditer les groupes pour %(user_name)s" msgid "User list" msgstr "Liste d'utilisateurs" -#: core/templates/core/user_pictures.jinja:8 +#: core/templates/core/user_pictures.jinja:17 #, python-format msgid "%(user_name)s's pictures" msgstr "Photos de %(user_name)s" -#: core/templates/core/user_pictures.jinja:14 +#: core/templates/core/user_pictures.jinja:23 msgid "Download all my pictures" msgstr "Télécharger toutes mes photos" -#: core/templates/core/user_pictures.jinja:28 sas/templates/sas/album.jinja:68 +#: core/templates/core/user_pictures.jinja:37 sas/templates/sas/album.jinja:68 #: sas/templates/sas/album.jinja:96 msgid "To be moderated" msgstr "A modérer" -#: core/templates/core/user_pictures.jinja:37 +#: core/templates/core/user_pictures.jinja:46 msgid "Picture Unavailable" msgstr "Photo Indisponible" -#: core/templates/core/user_pictures.jinja:105 -msgid "Error downloading your pictures" -msgstr "Erreur de téléchargement de vos photos" +#: core/templates/core/user_pictures.jinja:82 +msgid "pictures" +msgstr "photos" #: core/templates/core/user_preferences.jinja:8 -#: core/templates/core/user_preferences.jinja:13 core/views/user.py:253 +#: core/templates/core/user_preferences.jinja:13 core/views/user.py:234 msgid "Preferences" msgstr "Préférences" @@ -3346,7 +3345,7 @@ msgstr "Préférences" msgid "General" msgstr "Générer" -#: core/templates/core/user_preferences.jinja:21 trombi/views.py:57 +#: core/templates/core/user_preferences.jinja:21 trombi/views.py:56 msgid "Trombi" msgstr "Trombi" @@ -3401,7 +3400,7 @@ msgstr "Achats" msgid "Product top 10" msgstr "Top 10 produits" -#: core/templates/core/user_stats.jinja:43 counter/forms.py:184 +#: core/templates/core/user_stats.jinja:43 counter/forms.py:182 msgid "Product" msgstr "Produit" @@ -3418,7 +3417,7 @@ msgstr "Outils utilisateurs" msgid "Sith management" msgstr "Gestion de Sith" -#: core/templates/core/user_tools.jinja:21 core/views/user.py:269 +#: core/templates/core/user_tools.jinja:21 core/views/user.py:250 msgid "Groups" msgstr "Groupes" @@ -3446,8 +3445,8 @@ msgstr "Cotisations" msgid "Subscription stats" msgstr "Statistiques de cotisation" -#: core/templates/core/user_tools.jinja:48 counter/forms.py:147 -#: counter/views.py:770 +#: core/templates/core/user_tools.jinja:48 counter/forms.py:145 +#: counter/views.py:729 msgid "Counters" msgstr "Comptoirs" @@ -3464,16 +3463,16 @@ msgid "Product types management" msgstr "Gestion des types de produit" #: core/templates/core/user_tools.jinja:56 -#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:790 +#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:749 msgid "Cash register summaries" msgstr "Relevés de caisse" #: core/templates/core/user_tools.jinja:57 -#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:795 +#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:754 msgid "Invoices call" msgstr "Appels à facture" -#: core/templates/core/user_tools.jinja:72 core/views/user.py:288 +#: core/templates/core/user_tools.jinja:72 core/views/user.py:269 #: counter/templates/counter/counter_list.jinja:18 #: counter/templates/counter/counter_list.jinja:34 #: counter/templates/counter/counter_list.jinja:56 @@ -3533,12 +3532,12 @@ msgid "Moderate pictures" msgstr "Modérer les photos" #: core/templates/core/user_tools.jinja:173 -#: pedagogy/templates/pedagogy/guide.jinja:20 +#: pedagogy/templates/pedagogy/guide.jinja:21 msgid "Create UV" msgstr "Créer UV" #: core/templates/core/user_tools.jinja:174 -#: pedagogy/templates/pedagogy/guide.jinja:23 +#: pedagogy/templates/pedagogy/guide.jinja:24 #: trombi/templates/trombi/detail.jinja:10 msgid "Moderate comments" msgstr "Modérer les commentaires" @@ -3567,29 +3566,29 @@ msgstr "Convertir de la syntaxe dokuwiki/BBcode vers Markdown" msgid "Trombi tools" msgstr "Outils Trombi" -#: core/templatetags/renderer.py:78 +#: core/templatetags/renderer.py:82 #, python-format msgid "%(nb_days)d day, %(remainder)s" msgid_plural "%(nb_days)d days, %(remainder)s" msgstr[0] "" msgstr[1] "" -#: core/views/files.py:106 +#: core/views/files.py:105 msgid "Add a new folder" msgstr "Ajouter un nouveau dossier" -#: core/views/files.py:126 +#: core/views/files.py:125 #, python-format msgid "Error creating folder %(folder_name)s: %(msg)s" msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s" -#: core/views/files.py:146 core/views/forms.py:299 core/views/forms.py:306 +#: core/views/files.py:145 core/views/forms.py:298 core/views/forms.py:305 #: sas/views.py:82 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" msgstr "Erreur d'envoi du fichier %(file_name)s : %(msg)s" -#: core/views/files.py:228 sas/views.py:360 +#: core/views/files.py:227 sas/views.py:360 msgid "Apply rights recursively" msgstr "Appliquer les droits récursivement" @@ -3677,7 +3676,7 @@ msgstr "Choisir un utilisateur" msgid "Username, email, or account number" msgstr "Nom d'utilisateur, email, ou numéro de compte AE" -#: core/views/forms.py:245 +#: core/views/forms.py:244 msgid "" "Profile: you need to be visible on the picture, in order to be recognized (e." "g. by the barmen)" @@ -3685,88 +3684,88 @@ msgstr "" "Photo de profil: vous devez être visible sur la photo afin d'être reconnu " "(par exemple par les barmen)" -#: core/views/forms.py:247 +#: core/views/forms.py:246 msgid "Avatar: used on the forum" msgstr "Avatar : utilisé sur le forum" -#: core/views/forms.py:248 +#: core/views/forms.py:247 msgid "Scrub: let other know how your scrub looks like!" msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" -#: core/views/forms.py:310 +#: core/views/forms.py:309 msgid "Bad image format, only jpeg, png, and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés" -#: core/views/forms.py:331 +#: core/views/forms.py:330 msgid "Godfather / Godmother" msgstr "Parrain / Marraine" -#: core/views/forms.py:332 +#: core/views/forms.py:331 msgid "Godchild" msgstr "Fillot / Fillote" -#: core/views/forms.py:337 counter/forms.py:63 trombi/views.py:156 +#: core/views/forms.py:336 counter/forms.py:61 trombi/views.py:149 msgid "Select user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:350 core/views/forms.py:368 election/models.py:24 -#: election/views.py:150 +#: core/views/forms.py:349 core/views/forms.py:367 election/models.py:22 +#: election/views.py:147 msgid "edit groups" msgstr "groupe d'édition" -#: core/views/forms.py:353 core/views/forms.py:371 election/models.py:31 -#: election/views.py:153 +#: core/views/forms.py:352 core/views/forms.py:370 election/models.py:29 +#: election/views.py:150 msgid "view groups" msgstr "groupe de vue" -#: core/views/group.py:43 +#: core/views/group.py:39 msgid "Users to remove from group" msgstr "Utilisateurs à retirer du groupe" -#: core/views/group.py:50 +#: core/views/group.py:46 msgid "Users to add to group" msgstr "Utilisateurs à ajouter au groupe" -#: core/views/user.py:198 +#: core/views/user.py:179 msgid "We couldn't verify that this email actually exists" msgstr "Nous n'avons pas réussi à vérifier que cette adresse mail existe." -#: core/views/user.py:221 core/views/user.py:485 core/views/user.py:487 +#: core/views/user.py:202 core/views/user.py:460 core/views/user.py:462 msgid "Family" msgstr "Famille" -#: core/views/user.py:226 sas/templates/sas/album.jinja:84 +#: core/views/user.py:207 sas/templates/sas/album.jinja:84 #: trombi/templates/trombi/export.jinja:25 #: trombi/templates/trombi/user_profile.jinja:11 msgid "Pictures" msgstr "Photos" -#: core/views/user.py:234 +#: core/views/user.py:215 msgid "Galaxy" msgstr "Galaxie" -#: core/views/user.py:632 +#: core/views/user.py:599 msgid "User already has a profile picture" msgstr "L'utilisateur a déjà une photo de profil" -#: counter/app.py:30 counter/models.py:389 counter/models.py:880 -#: counter/models.py:916 launderette/models.py:32 stock/models.py:41 +#: counter/app.py:30 counter/models.py:381 counter/models.py:838 +#: counter/models.py:874 launderette/models.py:32 stock/models.py:39 msgid "counter" msgstr "comptoir" -#: counter/forms.py:46 +#: counter/forms.py:45 msgid "This UID is invalid" msgstr "Cet UID est invalide" -#: counter/forms.py:85 +#: counter/forms.py:83 msgid "User not found" msgstr "Utilisateur non trouvé" -#: counter/forms.py:133 +#: counter/forms.py:131 msgid "Parent product" msgstr "Produit parent" -#: counter/forms.py:139 +#: counter/forms.py:137 msgid "Buying groups" msgstr "Groupes d'achat" @@ -3774,165 +3773,165 @@ msgstr "Groupes d'achat" msgid "Ecocup regularization" msgstr "Régularization des ecocups" -#: counter/models.py:53 +#: counter/models.py:54 msgid "account id" msgstr "numéro de compte" -#: counter/models.py:55 +#: counter/models.py:56 msgid "recorded product" msgstr "produits consignés" -#: counter/models.py:58 +#: counter/models.py:59 msgid "customer" msgstr "client" -#: counter/models.py:59 +#: counter/models.py:60 msgid "customers" msgstr "clients" -#: counter/models.py:72 counter/views.py:315 +#: counter/models.py:72 counter/views.py:311 msgid "Not enough money" msgstr "Solde insuffisant" -#: counter/models.py:173 +#: counter/models.py:170 msgid "First name" msgstr "Prénom" -#: counter/models.py:174 +#: counter/models.py:171 msgid "Last name" msgstr "Nom de famille" -#: counter/models.py:175 +#: counter/models.py:172 msgid "Address 1" msgstr "Adresse 1" -#: counter/models.py:176 +#: counter/models.py:173 msgid "Address 2" msgstr "Adresse 2" -#: counter/models.py:177 +#: counter/models.py:174 msgid "Zip code" msgstr "Code postal" -#: counter/models.py:178 +#: counter/models.py:175 msgid "City" msgstr "Ville" -#: counter/models.py:179 +#: counter/models.py:176 msgid "Country" msgstr "Pays" -#: counter/models.py:222 counter/models.py:252 +#: counter/models.py:218 counter/models.py:244 msgid "product type" msgstr "type du produit" -#: counter/models.py:258 +#: counter/models.py:250 msgid "purchase price" msgstr "prix d'achat" -#: counter/models.py:259 +#: counter/models.py:251 msgid "selling price" msgstr "prix de vente" -#: counter/models.py:260 +#: counter/models.py:252 msgid "special selling price" msgstr "prix de vente spécial" -#: counter/models.py:262 +#: counter/models.py:254 msgid "icon" msgstr "icône" -#: counter/models.py:267 +#: counter/models.py:259 msgid "limit age" msgstr "âge limite" -#: counter/models.py:268 +#: counter/models.py:260 msgid "tray price" msgstr "prix plateau" -#: counter/models.py:272 +#: counter/models.py:264 msgid "parent product" msgstr "produit parent" -#: counter/models.py:278 +#: counter/models.py:270 msgid "buying groups" msgstr "groupe d'achat" -#: counter/models.py:280 election/models.py:52 +#: counter/models.py:272 election/models.py:50 msgid "archived" msgstr "archivé" -#: counter/models.py:283 counter/models.py:1020 +#: counter/models.py:275 counter/models.py:974 msgid "product" msgstr "produit" -#: counter/models.py:368 +#: counter/models.py:360 msgid "products" msgstr "produits" -#: counter/models.py:371 +#: counter/models.py:363 msgid "counter type" msgstr "type de comptoir" -#: counter/models.py:373 +#: counter/models.py:365 msgid "Bar" msgstr "Bar" -#: counter/models.py:373 +#: counter/models.py:365 msgid "Office" msgstr "Bureau" -#: counter/models.py:376 +#: counter/models.py:368 msgid "sellers" msgstr "vendeurs" -#: counter/models.py:384 launderette/models.py:198 +#: counter/models.py:376 launderette/models.py:192 msgid "token" msgstr "jeton" -#: counter/models.py:619 +#: counter/models.py:579 msgid "bank" msgstr "banque" -#: counter/models.py:621 counter/models.py:713 +#: counter/models.py:581 counter/models.py:671 msgid "is validated" msgstr "est validé" -#: counter/models.py:624 +#: counter/models.py:584 msgid "refilling" msgstr "rechargement" -#: counter/models.py:690 eboutic/models.py:279 +#: counter/models.py:648 eboutic/models.py:267 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:691 counter/models.py:998 eboutic/models.py:280 +#: counter/models.py:649 counter/models.py:954 eboutic/models.py:268 msgid "quantity" msgstr "quantité" -#: counter/models.py:710 +#: counter/models.py:668 msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:710 sith/settings.py:395 sith/settings.py:400 -#: sith/settings.py:420 +#: counter/models.py:668 sith/settings.py:397 sith/settings.py:402 +#: sith/settings.py:422 msgid "Credit card" msgstr "Carte bancaire" -#: counter/models.py:716 +#: counter/models.py:674 msgid "selling" msgstr "vente" -#: counter/models.py:827 +#: counter/models.py:783 msgid "Unknown event" msgstr "Événement inconnu" -#: counter/models.py:828 +#: counter/models.py:784 #, python-format msgid "Eticket bought for the event %(event)s" msgstr "Eticket acheté pour l'événement %(event)s" -#: counter/models.py:830 counter/models.py:853 +#: counter/models.py:786 counter/models.py:809 #, python-format msgid "" "You bought an eticket for the event %(event)s.\n" @@ -3944,63 +3943,63 @@ msgstr "" "Vous pouvez également retrouver tous vos e-tickets sur votre page de compte " "%(url)s." -#: counter/models.py:885 +#: counter/models.py:843 msgid "last activity date" msgstr "dernière activité" -#: counter/models.py:888 +#: counter/models.py:846 msgid "permanency" msgstr "permanence" -#: counter/models.py:921 +#: counter/models.py:879 msgid "emptied" msgstr "coffre vidée" -#: counter/models.py:924 +#: counter/models.py:882 msgid "cash register summary" msgstr "relevé de caisse" -#: counter/models.py:994 +#: counter/models.py:950 msgid "cash summary" msgstr "relevé" -#: counter/models.py:997 +#: counter/models.py:953 msgid "value" msgstr "valeur" -#: counter/models.py:1000 +#: counter/models.py:956 msgid "check" msgstr "chèque" -#: counter/models.py:1002 +#: counter/models.py:958 msgid "True if this is a bank check, else False" msgstr "Vrai si c'est un chèque, sinon Faux." -#: counter/models.py:1006 +#: counter/models.py:962 msgid "cash register summary item" msgstr "élément de relevé de caisse" -#: counter/models.py:1024 +#: counter/models.py:978 msgid "banner" msgstr "bannière" -#: counter/models.py:1026 +#: counter/models.py:980 msgid "event date" msgstr "date de l'événement" -#: counter/models.py:1028 +#: counter/models.py:982 msgid "event title" msgstr "titre de l'événement" -#: counter/models.py:1030 +#: counter/models.py:984 msgid "secret" msgstr "secret" -#: counter/models.py:1071 +#: counter/models.py:1023 msgid "uid" msgstr "uid" -#: counter/models.py:1076 +#: counter/models.py:1028 msgid "student cards" msgstr "cartes étudiante" @@ -4014,19 +4013,19 @@ msgstr "Activité sur %(counter_name)s" msgid "Barmen list" msgstr "Barmans" -#: counter/templates/counter/activity.jinja:23 +#: counter/templates/counter/activity.jinja:22 msgid "There is currently no barman connected." msgstr "Il n'y a actuellement aucun barman connecté." -#: counter/templates/counter/activity.jinja:28 +#: counter/templates/counter/activity.jinja:27 msgid "Legend" msgstr "Légende" -#: counter/templates/counter/activity.jinja:32 +#: counter/templates/counter/activity.jinja:31 msgid "counter is open, there's at least one barman connected" msgstr "Le comptoir est ouvert, et il y a au moins un barman connecté" -#: counter/templates/counter/activity.jinja:36 +#: counter/templates/counter/activity.jinja:35 #, python-format msgid "" "counter is open but not active, the last sale was done at least %(minutes)s " @@ -4035,7 +4034,7 @@ msgstr "" "Le comptoir est ouvert, mais inactif. La dernière vente a eu lieu il y a " "%(minutes)s minutes." -#: counter/templates/counter/activity.jinja:40 +#: counter/templates/counter/activity.jinja:39 msgid "counter is not open : no one is connected" msgstr "Le comptoir est fermé" @@ -4056,7 +4055,7 @@ msgstr "Liste des relevés de caisse" msgid "Theoric sums" msgstr "Sommes théoriques" -#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1078 +#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1003 msgid "Emptied" msgstr "Coffre vidé" @@ -4077,8 +4076,8 @@ msgid "This is not a valid student card UID" msgstr "Ce n'est pas un UID de carte étudiante valide" #: counter/templates/counter/counter_click.jinja:41 -#: counter/templates/counter/counter_click.jinja:67 -#: counter/templates/counter/counter_click.jinja:132 +#: counter/templates/counter/counter_click.jinja:68 +#: counter/templates/counter/counter_click.jinja:133 #: counter/templates/counter/invoices_call.jinja:16 #: launderette/templates/launderette/launderette_admin.jinja:35 #: launderette/templates/launderette/launderette_click.jinja:13 @@ -4091,25 +4090,25 @@ msgstr "Valider" msgid "Registered cards" msgstr "Cartes enregistrées" -#: counter/templates/counter/counter_click.jinja:51 +#: counter/templates/counter/counter_click.jinja:52 msgid "No card registered" msgstr "Aucune carte enregistrée" -#: counter/templates/counter/counter_click.jinja:56 +#: counter/templates/counter/counter_click.jinja:57 #: launderette/templates/launderette/launderette_admin.jinja:8 msgid "Selling" msgstr "Vente" -#: counter/templates/counter/counter_click.jinja:74 +#: counter/templates/counter/counter_click.jinja:75 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:20 msgid "Basket: " msgstr "Panier : " -#: counter/templates/counter/counter_click.jinja:115 +#: counter/templates/counter/counter_click.jinja:116 msgid "Finish" msgstr "Terminer" -#: counter/templates/counter/counter_click.jinja:125 +#: counter/templates/counter/counter_click.jinja:126 #: counter/templates/counter/refilling_list.jinja:9 msgid "Refilling" msgstr "Rechargement" @@ -4282,109 +4281,109 @@ msgstr "Temps" msgid "Top 100 barman %(counter_name)s (all semesters)" msgstr "Top 100 barman %(counter_name)s (tous les semestres)" -#: counter/views.py:169 +#: counter/views.py:172 msgid "Cash summary" msgstr "Relevé de caisse" -#: counter/views.py:185 +#: counter/views.py:188 msgid "Last operations" msgstr "Dernières opérations" -#: counter/views.py:202 +#: counter/views.py:205 msgid "Take items from stock" msgstr "Prendre des éléments du stock" -#: counter/views.py:255 +#: counter/views.py:254 msgid "Bad credentials" msgstr "Mauvais identifiants" -#: counter/views.py:257 +#: counter/views.py:256 msgid "User is not barman" msgstr "L'utilisateur n'est pas barman." -#: counter/views.py:262 +#: counter/views.py:261 msgid "Bad location, someone is already logged in somewhere else" msgstr "Mauvais comptoir, quelqu'un est déjà connecté ailleurs" -#: counter/views.py:306 +#: counter/views.py:302 msgid "Too young for that product" msgstr "Trop jeune pour ce produit" -#: counter/views.py:309 +#: counter/views.py:305 msgid "Not allowed for that product" msgstr "Non autorisé pour ce produit" -#: counter/views.py:312 +#: counter/views.py:308 msgid "No date of birth provided" msgstr "Pas de date de naissance renseignée" -#: counter/views.py:612 +#: counter/views.py:597 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:764 +#: counter/views.py:723 msgid "Counter administration" msgstr "Administration des comptoirs" -#: counter/views.py:766 +#: counter/views.py:725 msgid "Stocks" msgstr "Stocks" -#: counter/views.py:785 +#: counter/views.py:744 msgid "Product types" msgstr "Types de produit" -#: counter/views.py:1035 +#: counter/views.py:960 msgid "10 cents" msgstr "10 centimes" -#: counter/views.py:1036 +#: counter/views.py:961 msgid "20 cents" msgstr "20 centimes" -#: counter/views.py:1037 +#: counter/views.py:962 msgid "50 cents" msgstr "50 centimes" -#: counter/views.py:1038 +#: counter/views.py:963 msgid "1 euro" msgstr "1 €" -#: counter/views.py:1039 +#: counter/views.py:964 msgid "2 euros" msgstr "2 €" -#: counter/views.py:1040 +#: counter/views.py:965 msgid "5 euros" msgstr "5 €" -#: counter/views.py:1041 +#: counter/views.py:966 msgid "10 euros" msgstr "10 €" -#: counter/views.py:1042 +#: counter/views.py:967 msgid "20 euros" msgstr "20 €" -#: counter/views.py:1043 +#: counter/views.py:968 msgid "50 euros" msgstr "50 €" -#: counter/views.py:1045 +#: counter/views.py:970 msgid "100 euros" msgstr "100 €" -#: counter/views.py:1048 counter/views.py:1054 counter/views.py:1060 -#: counter/views.py:1066 counter/views.py:1072 +#: counter/views.py:973 counter/views.py:979 counter/views.py:985 +#: counter/views.py:991 counter/views.py:997 msgid "Check amount" msgstr "Montant du chèque" -#: counter/views.py:1051 counter/views.py:1057 counter/views.py:1063 -#: counter/views.py:1069 counter/views.py:1075 +#: counter/views.py:976 counter/views.py:982 counter/views.py:988 +#: counter/views.py:994 counter/views.py:1000 msgid "Check quantity" msgstr "Nombre de chèque" -#: counter/views.py:1627 +#: counter/views.py:1530 msgid "people(s)" msgstr "personne(s)" @@ -4419,27 +4418,27 @@ msgstr "%(name)s : ce produit n'existe pas ou n'est peut-être plus disponible." msgid "You cannot buy %(nbr)d %(name)s." msgstr "Vous ne pouvez pas acheter %(nbr)d %(name)s." -#: eboutic/models.py:227 +#: eboutic/models.py:215 msgid "validated" msgstr "validé" -#: eboutic/models.py:240 +#: eboutic/models.py:228 msgid "Invoice already validated" msgstr "Facture déjà validée" -#: eboutic/models.py:276 +#: eboutic/models.py:264 msgid "product id" msgstr "ID du produit" -#: eboutic/models.py:277 +#: eboutic/models.py:265 msgid "product name" msgstr "nom du produit" -#: eboutic/models.py:278 +#: eboutic/models.py:266 msgid "product type id" msgstr "id du type du produit" -#: eboutic/models.py:295 +#: eboutic/models.py:283 msgid "basket" msgstr "panier" @@ -4532,35 +4531,35 @@ msgstr "Le paiement a échoué" msgid "Return to eboutic" msgstr "Retourner à l'eboutic" -#: election/models.py:16 +#: election/models.py:14 msgid "start candidature" msgstr "début des candidatures" -#: election/models.py:17 +#: election/models.py:15 msgid "end candidature" msgstr "fin des candidatures" -#: election/models.py:38 election/views.py:156 +#: election/models.py:36 election/views.py:153 msgid "vote groups" msgstr "groupe de vote" -#: election/models.py:45 election/views.py:163 +#: election/models.py:43 election/views.py:160 msgid "candidature groups" msgstr "groupe de candidature" -#: election/models.py:115 election/models.py:162 +#: election/models.py:111 election/models.py:156 msgid "election" msgstr "élection" -#: election/models.py:120 +#: election/models.py:116 msgid "max choice" msgstr "nombre de choix maxi" -#: election/models.py:200 +#: election/models.py:192 msgid "election list" msgstr "liste électorale" -#: election/models.py:225 +#: election/models.py:215 msgid "candidature" msgstr "candidature" @@ -4608,7 +4607,7 @@ msgstr "Vous avez déjà soumis votre vote." msgid "You have voted in this election." msgstr "Vous avez déjà voté pour cette élection." -#: election/templates/election/election_detail.jinja:49 election/views.py:89 +#: election/templates/election/election_detail.jinja:49 election/views.py:86 msgid "Blank vote" msgstr "Vote blanc" @@ -4680,83 +4679,83 @@ msgstr "au" msgid "Polls open from" msgstr "Votes ouverts du" -#: election/views.py:40 +#: election/views.py:37 msgid "You have selected too much candidates." msgstr "Vous avez sélectionné trop de candidats." -#: election/views.py:56 +#: election/views.py:53 msgid "User to candidate" msgstr "Utilisateur se présentant" -#: election/views.py:114 +#: election/views.py:111 msgid "This role already exists for this election" msgstr "Ce rôle existe déjà pour cette élection" -#: election/views.py:169 +#: election/views.py:166 msgid "Start candidature" msgstr "Début des candidatures" -#: election/views.py:171 +#: election/views.py:168 msgid "End candidature" msgstr "Fin des candidatures" -#: forum/models.py:62 +#: forum/models.py:61 msgid "is a category" msgstr "est une catégorie" -#: forum/models.py:73 +#: forum/models.py:72 msgid "owner club" msgstr "club propriétaire" -#: forum/models.py:90 +#: forum/models.py:89 msgid "number to choose a specific forum ordering" msgstr "numéro spécifiant l'ordre d'affichage" -#: forum/models.py:95 forum/models.py:252 +#: forum/models.py:94 forum/models.py:251 msgid "the last message" msgstr "le dernier message" -#: forum/models.py:99 +#: forum/models.py:98 msgid "number of topics" msgstr "nombre de sujets" -#: forum/models.py:195 +#: forum/models.py:194 msgid "You can not make loops in forums" msgstr "Vous ne pouvez pas faire de boucles dans les forums" -#: forum/models.py:247 +#: forum/models.py:246 msgid "subscribed users" msgstr "utilisateurs abonnés" -#: forum/models.py:257 +#: forum/models.py:256 msgid "number of messages" msgstr "nombre de messages" -#: forum/models.py:313 +#: forum/models.py:310 msgid "message" msgstr "message" -#: forum/models.py:316 +#: forum/models.py:313 msgid "readers" msgstr "lecteurs" -#: forum/models.py:318 +#: forum/models.py:315 msgid "is deleted" msgstr "est supprimé" -#: forum/models.py:400 +#: forum/models.py:399 msgid "Message edited by" msgstr "Message édité par" -#: forum/models.py:401 +#: forum/models.py:400 msgid "Message deleted by" msgstr "Message supprimé par" -#: forum/models.py:402 +#: forum/models.py:401 msgid "Message undeleted by" msgstr "Message restauré par" -#: forum/models.py:414 +#: forum/models.py:413 msgid "action" msgstr "action" @@ -4844,11 +4843,11 @@ msgstr "Enlever des favoris" msgid "Mark as favorite" msgstr "Ajouter aux favoris" -#: forum/views.py:188 +#: forum/views.py:191 msgid "Apply rights and club owner recursively" msgstr "Appliquer les droits et le club propriétaire récursivement" -#: forum/views.py:408 +#: forum/views.py:420 #, python-format msgid "%(author)s said" msgstr "Citation de %(author)s" @@ -4906,31 +4905,31 @@ msgstr "Galaxie de %(user_name)s" msgid "This citizen has not yet joined the galaxy" msgstr "Ce citoyen n'a pas encore rejoint la galaxie" -#: launderette/models.py:90 launderette/models.py:130 +#: launderette/models.py:88 launderette/models.py:126 msgid "launderette" msgstr "laverie" -#: launderette/models.py:96 +#: launderette/models.py:94 msgid "is working" msgstr "fonctionne" -#: launderette/models.py:99 +#: launderette/models.py:97 msgid "Machine" msgstr "Machine" -#: launderette/models.py:136 +#: launderette/models.py:132 msgid "borrow date" msgstr "date d'emprunt" -#: launderette/models.py:147 +#: launderette/models.py:143 msgid "Token" msgstr "Jeton" -#: launderette/models.py:159 +#: launderette/models.py:155 msgid "Token name can not be blank" msgstr "Le nom du jeton ne peut pas être vide" -#: launderette/models.py:192 +#: launderette/models.py:186 msgid "machine" msgstr "machine" @@ -4959,12 +4958,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:631 +#: sith/settings.py:633 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:631 +#: sith/settings.py:633 msgid "Drying" msgstr "Séchage" @@ -5003,11 +5002,11 @@ msgstr "Le jeton %(token_name)s n'existe pas" msgid "Token %(token_name)s already exists" msgstr "Un jeton %(token_name)s existe déjà" -#: launderette/views.py:329 +#: launderette/views.py:325 msgid "User has booked no slot" msgstr "L'utilisateur n'a pas réservé de créneau" -#: launderette/views.py:441 +#: launderette/views.py:433 msgid "Token not found" msgstr "Jeton non trouvé" @@ -5036,23 +5035,23 @@ msgstr "Recherche rapide" msgid "Last/First name or nickname" msgstr "Nom de famille, prénom ou surnom" -#: pedagogy/forms.py:83 +#: pedagogy/forms.py:81 msgid "Do not vote" msgstr "Ne pas voter" -#: pedagogy/forms.py:132 +#: pedagogy/forms.py:128 msgid "This user has already commented on this UV" msgstr "Cet utilisateur a déjà commenté cette UV" -#: pedagogy/forms.py:168 +#: pedagogy/forms.py:160 msgid "Accepted reports" msgstr "Signalements acceptés" -#: pedagogy/forms.py:175 +#: pedagogy/forms.py:167 msgid "Denied reports" msgstr "Signalements refusés" -#: pedagogy/models.py:51 +#: pedagogy/models.py:48 msgid "" "The code of an UV must only contains uppercase characters without accent and " "numbers" @@ -5060,103 +5059,103 @@ msgstr "" "Le code d'une UV doit seulement contenir des caractères majuscule sans " "accents et nombres" -#: pedagogy/models.py:65 +#: pedagogy/models.py:62 msgid "credit type" msgstr "type de crédit" -#: pedagogy/models.py:70 pedagogy/models.py:100 +#: pedagogy/models.py:67 pedagogy/models.py:97 msgid "uv manager" msgstr "gestionnaire d'uv" -#: pedagogy/models.py:78 +#: pedagogy/models.py:75 msgid "language" msgstr "langue" -#: pedagogy/models.py:84 +#: pedagogy/models.py:81 msgid "credits" msgstr "crédits" -#: pedagogy/models.py:92 +#: pedagogy/models.py:89 msgid "departmenmt" msgstr "département" -#: pedagogy/models.py:101 +#: pedagogy/models.py:98 msgid "objectives" msgstr "objectifs" -#: pedagogy/models.py:102 +#: pedagogy/models.py:99 msgid "program" msgstr "programme" -#: pedagogy/models.py:103 +#: pedagogy/models.py:100 msgid "skills" msgstr "compétences" -#: pedagogy/models.py:104 +#: pedagogy/models.py:101 msgid "key concepts" msgstr "concepts clefs" -#: pedagogy/models.py:109 +#: pedagogy/models.py:106 msgid "hours CM" msgstr "heures CM" -#: pedagogy/models.py:116 +#: pedagogy/models.py:113 msgid "hours TD" msgstr "heures TD" -#: pedagogy/models.py:123 +#: pedagogy/models.py:120 msgid "hours TP" msgstr "heures TP" -#: pedagogy/models.py:130 +#: pedagogy/models.py:127 msgid "hours THE" msgstr "heures THE" -#: pedagogy/models.py:137 +#: pedagogy/models.py:134 msgid "hours TE" msgstr "heures TE" -#: pedagogy/models.py:215 pedagogy/models.py:289 +#: pedagogy/models.py:205 pedagogy/models.py:281 msgid "uv" msgstr "UE" -#: pedagogy/models.py:219 +#: pedagogy/models.py:209 msgid "global grade" msgstr "note globale" -#: pedagogy/models.py:226 +#: pedagogy/models.py:216 msgid "utility grade" msgstr "note d'utilité" -#: pedagogy/models.py:233 +#: pedagogy/models.py:223 msgid "interest grade" msgstr "note d'intérêt" -#: pedagogy/models.py:240 +#: pedagogy/models.py:230 msgid "teaching grade" msgstr "note d'enseignement" -#: pedagogy/models.py:247 +#: pedagogy/models.py:237 msgid "work load grade" msgstr "note de charge de travail" -#: pedagogy/models.py:253 +#: pedagogy/models.py:243 msgid "publish date" msgstr "date de publication" -#: pedagogy/models.py:295 +#: pedagogy/models.py:287 msgid "grade" msgstr "note" -#: pedagogy/models.py:318 +#: pedagogy/models.py:308 msgid "report" msgstr "signaler" -#: pedagogy/models.py:324 +#: pedagogy/models.py:314 msgid "reporter" msgstr "signalant" -#: pedagogy/models.py:327 +#: pedagogy/models.py:317 msgid "reason" msgstr "raison" @@ -5164,33 +5163,29 @@ msgstr "raison" msgid "UV Guide" msgstr "Guide des UVs" -#: pedagogy/templates/pedagogy/guide.jinja:34 +#: pedagogy/templates/pedagogy/guide.jinja:54 #, python-format msgid "%(display_name)s" msgstr "%(display_name)s" -#: pedagogy/templates/pedagogy/guide.jinja:41 +#: pedagogy/templates/pedagogy/guide.jinja:68 #, python-format msgid "%(credit_type)s" msgstr "%(credit_type)s" -#: pedagogy/templates/pedagogy/guide.jinja:59 +#: pedagogy/templates/pedagogy/guide.jinja:86 #: pedagogy/templates/pedagogy/moderation.jinja:12 msgid "UV" msgstr "UE" -#: pedagogy/templates/pedagogy/guide.jinja:61 +#: pedagogy/templates/pedagogy/guide.jinja:88 msgid "Department" msgstr "Département" -#: pedagogy/templates/pedagogy/guide.jinja:62 +#: pedagogy/templates/pedagogy/guide.jinja:89 msgid "Credit type" msgstr "Type de crédit" -#: pedagogy/templates/pedagogy/guide.jinja:229 -msgid "Error connecting to the server" -msgstr "Erreur lors de la connection au serveur" - #: pedagogy/templates/pedagogy/macros.jinja:13 msgid " not rated " msgstr "non noté" @@ -5280,7 +5275,7 @@ msgstr "Concepts clefs" msgid "UE manager: " msgstr "Gestionnaire d'UE : " -#: pedagogy/templates/pedagogy/uv_detail.jinja:86 pedagogy/tests.py:404 +#: pedagogy/templates/pedagogy/uv_detail.jinja:86 pedagogy/tests/tests.py:384 msgid "" "You already posted a comment on this UV. If you want to comment again, " "please modify or delete your previous comment." @@ -5293,7 +5288,7 @@ msgid "Leave comment" msgstr "Laisser un commentaire" #: pedagogy/templates/pedagogy/uv_detail.jinja:146 -#: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:262 +#: stock/templates/stock/shopping_list_items.jinja:42 stock/views.py:244 #: trombi/templates/trombi/export.jinja:70 msgid "Comments" msgstr "Commentaires" @@ -5319,11 +5314,11 @@ msgstr "Importer depuis l'UTBM" msgid "Unknown UE code" msgstr "Code d'UE inconnu" -#: pedagogy/templates/pedagogy/uv_edit.jinja:77 +#: pedagogy/templates/pedagogy/uv_edit.jinja:79 msgid "Successful autocomplete" msgstr "Autocomplétion réussite" -#: pedagogy/templates/pedagogy/uv_edit.jinja:80 +#: pedagogy/templates/pedagogy/uv_edit.jinja:82 msgid "An error occurred: " msgstr "Une erreur est survenue : " @@ -5356,19 +5351,19 @@ msgstr "Fusionner deux utilisateurs" msgid "Merge" msgstr "Fusion" -#: rootplace/views.py:154 +#: rootplace/views.py:155 msgid "User that will be kept" msgstr "Utilisateur qui sera conservé" -#: rootplace/views.py:157 +#: rootplace/views.py:158 msgid "User that will be deleted" msgstr "Utilisateur qui sera supprimé" -#: rootplace/views.py:163 +#: rootplace/views.py:164 msgid "User to be selected" msgstr "Utilisateur à sélectionner" -#: sas/models.py:239 +#: sas/models.py:236 msgid "picture" msgstr "photo" @@ -5442,404 +5437,404 @@ msgstr "Erreur de création de l'album %(album)s : %(msg)s" msgid "Add user" msgstr "Ajouter une personne" -#: sith/settings.py:251 sith/settings.py:457 +#: sith/settings.py:247 sith/settings.py:459 msgid "English" msgstr "Anglais" -#: sith/settings.py:251 sith/settings.py:456 +#: sith/settings.py:247 sith/settings.py:458 msgid "French" msgstr "Français" -#: sith/settings.py:376 +#: sith/settings.py:378 msgid "TC" msgstr "TC" -#: sith/settings.py:377 +#: sith/settings.py:379 msgid "IMSI" msgstr "IMSI" -#: sith/settings.py:378 +#: sith/settings.py:380 msgid "IMAP" msgstr "IMAP" -#: sith/settings.py:379 +#: sith/settings.py:381 msgid "INFO" msgstr "INFO" -#: sith/settings.py:380 +#: sith/settings.py:382 msgid "GI" msgstr "GI" -#: sith/settings.py:381 sith/settings.py:467 +#: sith/settings.py:383 sith/settings.py:469 msgid "E" msgstr "E" -#: sith/settings.py:382 +#: sith/settings.py:384 msgid "EE" msgstr "EE" -#: sith/settings.py:383 +#: sith/settings.py:385 msgid "GESC" msgstr "GESC" -#: sith/settings.py:384 +#: sith/settings.py:386 msgid "GMC" msgstr "GMC" -#: sith/settings.py:385 +#: sith/settings.py:387 msgid "MC" msgstr "MC" -#: sith/settings.py:386 +#: sith/settings.py:388 msgid "EDIM" msgstr "EDIM" -#: sith/settings.py:387 +#: sith/settings.py:389 msgid "Humanities" msgstr "Humanités" -#: sith/settings.py:388 +#: sith/settings.py:390 msgid "N/A" msgstr "N/A" -#: sith/settings.py:392 sith/settings.py:399 sith/settings.py:418 +#: sith/settings.py:394 sith/settings.py:401 sith/settings.py:420 msgid "Check" msgstr "Chèque" -#: sith/settings.py:393 sith/settings.py:401 sith/settings.py:419 +#: sith/settings.py:395 sith/settings.py:403 sith/settings.py:421 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:394 +#: sith/settings.py:396 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:407 +#: sith/settings.py:409 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:408 +#: sith/settings.py:410 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:409 +#: sith/settings.py:411 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:437 +#: sith/settings.py:439 msgid "Free" msgstr "Libre" -#: sith/settings.py:438 +#: sith/settings.py:440 msgid "CS" msgstr "CS" -#: sith/settings.py:439 +#: sith/settings.py:441 msgid "TM" msgstr "TM" -#: sith/settings.py:440 +#: sith/settings.py:442 msgid "OM" msgstr "OM" -#: sith/settings.py:441 +#: sith/settings.py:443 msgid "QC" msgstr "QC" -#: sith/settings.py:442 +#: sith/settings.py:444 msgid "EC" msgstr "EC" -#: sith/settings.py:443 +#: sith/settings.py:445 msgid "RN" msgstr "RN" -#: sith/settings.py:444 +#: sith/settings.py:446 msgid "ST" msgstr "ST" -#: sith/settings.py:445 +#: sith/settings.py:447 msgid "EXT" msgstr "EXT" -#: sith/settings.py:450 +#: sith/settings.py:452 msgid "Autumn" msgstr "Automne" -#: sith/settings.py:451 +#: sith/settings.py:453 msgid "Spring" msgstr "Printemps" -#: sith/settings.py:452 +#: sith/settings.py:454 msgid "Autumn and spring" msgstr "Automne et printemps" -#: sith/settings.py:458 +#: sith/settings.py:460 msgid "German" msgstr "Allemand" -#: sith/settings.py:459 +#: sith/settings.py:461 msgid "Spanish" msgstr "Espagnol" -#: sith/settings.py:463 +#: sith/settings.py:465 msgid "A" msgstr "A" -#: sith/settings.py:464 +#: sith/settings.py:466 msgid "B" msgstr "B" -#: sith/settings.py:465 +#: sith/settings.py:467 msgid "C" msgstr "C" -#: sith/settings.py:466 +#: sith/settings.py:468 msgid "D" msgstr "D" -#: sith/settings.py:468 +#: sith/settings.py:470 msgid "FX" msgstr "FX" -#: sith/settings.py:469 +#: sith/settings.py:471 msgid "F" msgstr "F" -#: sith/settings.py:470 +#: sith/settings.py:472 msgid "Abs" msgstr "Abs" -#: sith/settings.py:474 +#: sith/settings.py:476 msgid "Selling deletion" msgstr "Suppression de vente" -#: sith/settings.py:475 +#: sith/settings.py:477 msgid "Refilling deletion" msgstr "Suppression de rechargement" -#: sith/settings.py:512 +#: sith/settings.py:514 msgid "One semester" msgstr "Un semestre, 20 €" -#: sith/settings.py:513 +#: sith/settings.py:515 msgid "Two semesters" msgstr "Deux semestres, 35 €" -#: sith/settings.py:515 +#: sith/settings.py:517 msgid "Common core cursus" msgstr "Cursus tronc commun, 60 €" -#: sith/settings.py:519 +#: sith/settings.py:521 msgid "Branch cursus" msgstr "Cursus branche, 60 €" -#: sith/settings.py:520 +#: sith/settings.py:522 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:521 +#: sith/settings.py:523 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:522 +#: sith/settings.py:524 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:523 +#: sith/settings.py:525 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:524 +#: sith/settings.py:526 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:525 +#: sith/settings.py:527 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:526 +#: sith/settings.py:528 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 20 €" -#: sith/settings.py:528 +#: sith/settings.py:530 msgid "One semester Welcome Week" msgstr "Un semestre Welcome Week" -#: sith/settings.py:532 +#: sith/settings.py:534 msgid "One month for free" msgstr "Un mois gratuit" -#: sith/settings.py:533 +#: sith/settings.py:535 msgid "Two months for free" msgstr "Deux mois gratuits" -#: sith/settings.py:534 +#: sith/settings.py:536 msgid "Eurok's volunteer" msgstr "Bénévole Eurockéennes" -#: sith/settings.py:536 +#: sith/settings.py:538 msgid "Six weeks for free" msgstr "6 semaines gratuites" -#: sith/settings.py:540 +#: sith/settings.py:542 msgid "One day" msgstr "Un jour" -#: sith/settings.py:541 +#: sith/settings.py:543 msgid "GA staff member" msgstr "Membre staff GA (2 semaines), 1 €" -#: sith/settings.py:544 +#: sith/settings.py:546 msgid "One semester (-20%)" msgstr "Un semestre (-20%), 12 €" -#: sith/settings.py:549 +#: sith/settings.py:551 msgid "Two semesters (-20%)" msgstr "Deux semestres (-20%), 22 €" -#: sith/settings.py:554 +#: sith/settings.py:556 msgid "Common core cursus (-20%)" msgstr "Cursus tronc commun (-20%), 36 €" -#: sith/settings.py:559 +#: sith/settings.py:561 msgid "Branch cursus (-20%)" msgstr "Cursus branche (-20%), 36 €" -#: sith/settings.py:564 +#: sith/settings.py:566 msgid "Alternating cursus (-20%)" msgstr "Cursus alternant (-20%), 24 €" -#: sith/settings.py:570 +#: sith/settings.py:572 msgid "One year for free(CA offer)" msgstr "Une année offerte (Offre CA)" -#: sith/settings.py:590 +#: sith/settings.py:592 msgid "President" msgstr "Président⸱e" -#: sith/settings.py:591 +#: sith/settings.py:593 msgid "Vice-President" msgstr "Vice-Président⸱e" -#: sith/settings.py:592 +#: sith/settings.py:594 msgid "Treasurer" msgstr "Trésorier⸱e" -#: sith/settings.py:593 +#: sith/settings.py:595 msgid "Communication supervisor" msgstr "Responsable communication" -#: sith/settings.py:594 +#: sith/settings.py:596 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:595 +#: sith/settings.py:597 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:596 +#: sith/settings.py:598 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:597 +#: sith/settings.py:599 msgid "Active member" msgstr "Membre actif⸱ve" -#: sith/settings.py:598 +#: sith/settings.py:600 msgid "Curious" msgstr "Curieux⸱euse" -#: sith/settings.py:635 +#: sith/settings.py:637 msgid "A new poster needs to be moderated" msgstr "Une nouvelle affiche a besoin d'être modérée" -#: sith/settings.py:636 +#: sith/settings.py:638 msgid "A new mailing list needs to be moderated" msgstr "Une nouvelle mailing list a besoin d'être modérée" -#: sith/settings.py:639 +#: sith/settings.py:641 msgid "A new pedagogy comment has been signaled for moderation" msgstr "" "Un nouveau commentaire de la pédagogie a été signalé pour la modération" -#: sith/settings.py:641 +#: sith/settings.py:643 #, python-format msgid "There are %s fresh news to be moderated" msgstr "Il y a %s nouvelles toutes fraîches à modérer" -#: sith/settings.py:642 +#: sith/settings.py:644 msgid "New files to be moderated" msgstr "Nouveaux fichiers à modérer" -#: sith/settings.py:643 +#: sith/settings.py:645 #, python-format msgid "There are %s pictures to be moderated in the SAS" msgstr "Il y a %s photos à modérer dans le SAS" -#: sith/settings.py:644 +#: sith/settings.py:646 msgid "You've been identified on some pictures" msgstr "Vous avez été identifié sur des photos" -#: sith/settings.py:645 +#: sith/settings.py:647 #, python-format msgid "You just refilled of %s €" msgstr "Vous avez rechargé votre compte de %s€" -#: sith/settings.py:646 +#: sith/settings.py:648 #, python-format msgid "You just bought %s" msgstr "Vous avez acheté %s" -#: sith/settings.py:647 +#: sith/settings.py:649 msgid "You have a notification" msgstr "Vous avez une notification" -#: sith/settings.py:659 +#: sith/settings.py:661 msgid "Success!" msgstr "Succès !" -#: sith/settings.py:660 +#: sith/settings.py:662 msgid "Fail!" msgstr "Échec !" -#: sith/settings.py:661 +#: sith/settings.py:663 msgid "You successfully posted an article in the Weekmail" msgstr "Article posté avec succès dans le Weekmail" -#: sith/settings.py:662 +#: sith/settings.py:664 msgid "You successfully edited an article in the Weekmail" msgstr "Article édité avec succès dans le Weekmail" -#: sith/settings.py:663 +#: sith/settings.py:665 msgid "You successfully sent the Weekmail" msgstr "Weekmail envoyé avec succès" -#: sith/settings.py:671 +#: sith/settings.py:673 msgid "AE tee-shirt" msgstr "Tee-shirt AE" -#: stock/models.py:63 +#: stock/models.py:59 msgid "unit quantity" msgstr "quantité unitaire" -#: stock/models.py:63 +#: stock/models.py:59 msgid "number of element in one box" msgstr "nombre d'éléments par boîte" -#: stock/models.py:66 +#: stock/models.py:62 msgid "effective quantity" msgstr "quantité effective" -#: stock/models.py:66 +#: stock/models.py:62 msgid "number of box" msgstr "nombre de boîtes" -#: stock/models.py:69 +#: stock/models.py:65 msgid "minimal quantity" msgstr "quantité minimale" -#: stock/models.py:72 +#: stock/models.py:68 msgid "" "if the effective quantity is less than the minimal, item is added to the " "shopping list" @@ -5847,27 +5842,27 @@ msgstr "" "si la quantité effective est en dessous du minima, l'item est ajouté àla " "liste de courses" -#: stock/models.py:104 +#: stock/models.py:98 msgid "todo" msgstr "à faire" -#: stock/models.py:125 +#: stock/models.py:119 msgid "shopping lists" msgstr "listes de courses" -#: stock/models.py:141 +#: stock/models.py:135 msgid "quantity to buy" msgstr "quantité à acheter" -#: stock/models.py:143 +#: stock/models.py:137 msgid "quantity to buy during the next shopping session" msgstr "quantité à acheter pendant les prochaines courses" -#: stock/models.py:146 +#: stock/models.py:140 msgid "quantity bought" msgstr "quantité achetée" -#: stock/models.py:148 +#: stock/models.py:142 msgid "quantity bought during the last shopping session" msgstr "quantité achetée pendant les dernières courses" @@ -5988,15 +5983,15 @@ msgstr "Mettre à jour les quantités de %(s)s après les courses" msgid "Update stock quantities" msgstr "Mettre à jour les quantités en stock" -#: stock/views.py:241 +#: stock/views.py:223 msgid "Shopping list name" msgstr "Nom de la liste de courses" -#: stock/views.py:251 +#: stock/views.py:233 msgid " left" msgstr " restant" -#: stock/views.py:257 +#: stock/views.py:239 msgid "" "Add here, items to buy that are not reference as a stock item (example : " "sponge, knife, mugs ...)" @@ -6004,11 +5999,11 @@ msgstr "" "Ajouter ici les éléments non référencé comme élément de stock (example : " "éponge, couteau, mugs ...)" -#: stock/views.py:441 +#: stock/views.py:411 msgid " asked" msgstr " demandé" -#: stock/views.py:527 +#: stock/views.py:489 #, python-format msgid "%(effective_quantity)s left" msgstr "%(effective_quantity)s restant" @@ -6135,19 +6130,19 @@ msgstr "" "La photo de blouse que vous souhaitez voir dans le Trombi (attention: cette " "photo risque d'être publiée)" -#: trombi/models.py:188 +#: trombi/models.py:185 msgid "target" msgstr "cible" -#: trombi/models.py:193 +#: trombi/models.py:190 msgid "is the comment moderated" msgstr "le commentaire est modéré" -#: trombi/models.py:217 +#: trombi/models.py:212 msgid "start" msgstr "début" -#: trombi/models.py:218 +#: trombi/models.py:213 msgid "end" msgstr "fin" @@ -6278,27 +6273,27 @@ msgstr "" msgid "Edit comment" msgstr "Éditer le commentaire" -#: trombi/views.py:69 +#: trombi/views.py:68 msgid "My profile" msgstr "Mon profil" -#: trombi/views.py:76 +#: trombi/views.py:75 msgid "My pictures" msgstr "Mes photos" -#: trombi/views.py:88 +#: trombi/views.py:87 msgid "Admin tools" msgstr "Admin Trombi" -#: trombi/views.py:220 +#: trombi/views.py:213 msgid "Explain why you rejected the comment" msgstr "Expliquez pourquoi vous refusez le commentaire" -#: trombi/views.py:251 +#: trombi/views.py:244 msgid "Rejected comment" msgstr "Commentaire rejeté" -#: trombi/views.py:253 +#: trombi/views.py:246 #, python-format msgid "" "Your comment to %(target)s on the Trombi \"%(trombi)s\" was rejected for the " @@ -6315,16 +6310,16 @@ msgstr "" "\n" "%(content)s" -#: trombi/views.py:285 +#: trombi/views.py:278 #, python-format msgid "%(name)s (deadline: %(date)s)" msgstr "%(name)s (date limite: %(date)s)" -#: trombi/views.py:295 +#: trombi/views.py:288 msgid "Select trombi" msgstr "Choisir un trombi" -#: trombi/views.py:297 +#: trombi/views.py:290 msgid "" "This allows you to subscribe to a Trombi. Be aware that you can subscribe " "only once, so don't play with that, or you will expose yourself to the " @@ -6334,19 +6329,19 @@ msgstr "" "pouvez vous inscrire qu'à un seul Trombi, donc ne jouez pas avec cet option " "ou vous encourerez la colère des admins!" -#: trombi/views.py:370 +#: trombi/views.py:361 msgid "Personal email (not UTBM)" msgstr "Email personnel (pas UTBM)" -#: trombi/views.py:371 +#: trombi/views.py:362 msgid "Phone" msgstr "Téléphone" -#: trombi/views.py:372 +#: trombi/views.py:363 msgid "Native town" msgstr "Ville d'origine" -#: trombi/views.py:482 +#: trombi/views.py:471 msgid "" "You can not yet write comment, you must wait for the subscription deadline " "to be passed." @@ -6354,15 +6349,21 @@ msgstr "" "Vous ne pouvez pas encore écrire de commentaires, vous devez attendre la fin " "des inscriptions" -#: trombi/views.py:489 +#: trombi/views.py:478 msgid "You can not write comment anymore, the deadline is already passed." msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée." -#: trombi/views.py:502 +#: trombi/views.py:491 #, python-format msgid "Maximum characters: %(max_length)s" msgstr "Nombre de caractères max: %(max_length)s" +#~ msgid "Error downloading your pictures" +#~ msgstr "Erreur de téléchargement de vos photos" + +#~ msgid "Error connecting to the server" +#~ msgstr "Erreur lors de la connection au serveur" + #~ msgid "past member" #~ msgstr "Anciens membres" diff --git a/sith/settings.py b/sith/settings.py index 239720a4..19cec809 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -727,6 +727,9 @@ if SENTRY_DSN: SITH_FRONT_DEP_VERSIONS = { + "https://github.com/Stuk/jszip-utils": "0.1.0", + "https://github.com/Stuk/jszip": "3.10.1", + "https://github.com/jimmywarting/native-file-system-adapter": "3.0.1", "https://github.com/chartjs/Chart.js/": "2.6.0", "https://github.com/xdan/datetimepicker/": "2.5.21", "https://github.com/Ionaru/easy-markdown-editor/": "2.18.0", @@ -736,7 +739,6 @@ SITH_FRONT_DEP_VERSIONS = { "https://github.com/viralpatel/jquery.shorten/": "", "https://github.com/getsentry/sentry-javascript/": "4.0.6", "https://github.com/jhuckaby/webcamjs/": "1.0.0", - "https://github.com/vuejs/vue-next": "3.2.18", "https://github.com/alpinejs/alpine": "3.10.5", "https://github.com/mrdoob/three.js/": "r148", "https://github.com/vasturiano/three-spritetext": "1.6.5", From 15f51fb03fd9727ad99843e534df7cbc72d55e8c Mon Sep 17 00:00:00 2001 From: Sli Date: Wed, 24 Jul 2024 17:42:02 +0200 Subject: [PATCH 03/20] Create an NFC button for browser supporting NFC API --- .../{ => widgets}/markdown_textarea.jinja | 0 core/templates/core/widgets/nfc.jinja | 33 ++ core/views/forms.py | 11 +- counter/forms.py | 18 +- counter/templates/counter/counter_click.jinja | 325 +++++++++--------- counter/views.py | 2 + locale/fr/LC_MESSAGES/django.po | 312 ++++++++--------- 7 files changed, 381 insertions(+), 320 deletions(-) rename core/templates/core/{ => widgets}/markdown_textarea.jinja (100%) create mode 100644 core/templates/core/widgets/nfc.jinja diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/widgets/markdown_textarea.jinja similarity index 100% rename from core/templates/core/markdown_textarea.jinja rename to core/templates/core/widgets/markdown_textarea.jinja diff --git a/core/templates/core/widgets/nfc.jinja b/core/templates/core/widgets/nfc.jinja new file mode 100644 index 00000000..04dc288d --- /dev/null +++ b/core/templates/core/widgets/nfc.jinja @@ -0,0 +1,33 @@ + + + + + + \ No newline at end of file diff --git a/core/views/forms.py b/core/views/forms.py index 5f950da0..90d24b7a 100644 --- a/core/views/forms.py +++ b/core/views/forms.py @@ -66,7 +66,7 @@ class SelectDate(DateInput): class MarkdownInput(Textarea): - template_name = "core/markdown_textarea.jinja" + template_name = "core/widgets/markdown_textarea.jinja" def get_context(self, name, value, attrs): context = super().get_context(name, value, attrs) @@ -100,6 +100,15 @@ class MarkdownInput(Textarea): return context +class NFCTextInput(TextInput): + template_name = "core/widgets/nfc.jinja" + + def get_context(self, name, value, attrs): + context = super().get_context(name, value, attrs) + context["translations"] = {"unsupported": _("Unsupported NFC card")} + return context + + class SelectFile(TextInput): def render(self, name, value, attrs=None, renderer=None): if attrs: diff --git a/counter/forms.py b/counter/forms.py index ce13568f..734cfcf6 100644 --- a/counter/forms.py +++ b/counter/forms.py @@ -3,7 +3,7 @@ from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultip from django import forms from django.utils.translation import gettext_lazy as _ -from core.views.forms import SelectDate, SelectDateTime +from core.views.forms import NFCTextInput, SelectDate, SelectDateTime from counter.models import ( BillingInfo, Counter, @@ -37,6 +37,9 @@ class StudentCardForm(forms.ModelForm): class Meta: model = StudentCard fields = ["uid"] + widgets = { + "uid": NFCTextInput, + } def clean(self): cleaned_data = super().clean() @@ -55,7 +58,10 @@ class GetUserForm(forms.Form): """ code = forms.CharField( - label="Code", max_length=StudentCard.UID_SIZE, required=False + label="Code", + max_length=StudentCard.UID_SIZE, + required=False, + widget=NFCTextInput, ) id = AutoCompleteSelectField( "users", required=False, label=_("Select user"), help_text=None @@ -86,6 +92,14 @@ class GetUserForm(forms.Form): return cleaned_data +class NFCCardForm(forms.Form): + student_card_uid = forms.CharField( + max_length=StudentCard.UID_SIZE, + required=False, + widget=NFCTextInput, + ) + + class RefillForm(forms.ModelForm): error_css_class = "error" required_css_class = "required" diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja index ec018fe8..15de8ac7 100644 --- a/counter/templates/counter/counter_click.jinja +++ b/counter/templates/counter/counter_click.jinja @@ -2,12 +2,12 @@ {% from "core/macros.jinja" import user_mini_profile, user_subscription %} {% block title %} - {{ counter }} + {{ counter }} {% endblock %} {% block additional_js %} - - + + {% endblock %} {% block info_boxes %} @@ -18,180 +18,179 @@ {% endblock %} {% block content %} -

{{ counter }}

+

{{ counter }}

-
- +
+ -
-
{% trans %}Customer{% endtrans %}
- {{ user_mini_profile(customer.user) }} - {{ user_subscription(customer.user) }} -

{% trans %}Amount: {% endtrans %}{{ customer.amount }} €

-
- {% csrf_token %} - - {% trans %}Add a student card{% endtrans %} - - {% if request.session['not_valid_student_card_uid'] %} -

{% trans %}This is not a valid student card UID{% endtrans %}

- {% endif %} - -
-
{% trans %}Registered cards{% endtrans %}
- {% if student_cards %} -

{{ student_cards }}

-
    - {% for card in student_cards %} -
  • {{ card.uid }}
    • - {% endfor %} -
- {% else %} - {% trans %}No card registered{% endtrans %} - {% endif %} -
+
+
{% trans %}Customer{% endtrans %}
+ {{ user_mini_profile(customer.user) }} + {{ user_subscription(customer.user) }} +

{% trans %}Amount: {% endtrans %}{{ customer.amount }} €

+
+ {% csrf_token %} + + {% trans %}Add a student card{% endtrans %} + {{ student_card_input.student_card_uid }} + {% if request.session['not_valid_student_card_uid'] %} +

{% trans %}This is not a valid student card UID{% endtrans %}

+ {% endif %} + +
+
{% trans %}Registered cards{% endtrans %}
+ {% if student_cards %} +
    + {% for card in student_cards %} +
  • {{ card.uid }}
    • + {% endfor %} +
+ {% else %} + {% trans %}No card registered{% endtrans %} + {% endif %} +
-
-
{% trans %}Selling{% endtrans %}
-
- {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %} +
+
{% trans %}Selling{% endtrans %}
+
+ {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %} {# Formulaire pour rechercher un produit en tapant son code dans une barre de recherche #} -
- {% csrf_token %} - - - - -
+
+ {% csrf_token %} + + + + +
- -

{% trans %}Basket: {% endtrans %}

+ +

{% trans %}Basket: {% endtrans %}

-
    - +
+

+ Total: + + € +

-
-
    - {% for category in categories.keys() -%} -
  • {{ category }}
    • - {%- endfor %} -
- {% for category in categories.keys() -%} -
-
{{ category }}
- {% for p in categories[category] -%} -
- {% csrf_token %} - - - -
- {%- endfor %} -
- {%- endfor %} +
+ {% csrf_token %} + + +
+
+ {% csrf_token %} + + +
+
+ {% if (counter.type == 'BAR' and barmens_can_refill) %} +
{% trans %}Refilling{% endtrans %}
+
+
+ {% csrf_token %} + {{ refill_form.as_p() }} + + +
+ {% endif %}
+ +
+
    + {% for category in categories.keys() -%} +
  • {{ category }}
    • + {%- endfor %} +
+ {% for category in categories.keys() -%} +
+
{{ category }}
+ {% for p in categories[category] -%} +
+ {% csrf_token %} + + + +
+ {%- endfor %} +
+ {%- endfor %} +
+
{% endblock content %} {% block script %} - {{ super() }} - -{% endblock script %} + {{ super() }} + +{% endblock script %} \ No newline at end of file diff --git a/counter/views.py b/counter/views.py index ed060426..187d0c4a 100644 --- a/counter/views.py +++ b/counter/views.py @@ -61,6 +61,7 @@ from counter.forms import ( CounterEditForm, EticketForm, GetUserForm, + NFCCardForm, ProductEditForm, RefillForm, StudentCardForm, @@ -679,6 +680,7 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView): ) kwargs["customer"] = self.customer kwargs["student_cards"] = self.customer.student_cards.all() + kwargs["student_card_input"] = NFCCardForm() kwargs["basket_total"] = self.sum_basket(self.request) kwargs["refill_form"] = self.refill_form or RefillForm() kwargs["student_card_max_uid_size"] = StudentCard.UID_SIZE diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c50d72c1..def786ea 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-24 14:33+0200\n" +"POT-Creation-Date: 2024-07-25 07:16+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -651,7 +651,7 @@ msgid "Target" msgstr "Cible" #: accounting/templates/accounting/journal_details.jinja:38 -#: core/views/forms.py:94 +#: core/views/forms.py:86 msgid "Code" msgstr "Code" @@ -665,7 +665,7 @@ msgid "Done" msgstr "Effectuées" #: accounting/templates/accounting/journal_details.jinja:41 -#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1002 +#: counter/templates/counter/cash_summary_list.jinja:37 counter/views.py:1004 #: pedagogy/templates/pedagogy/moderation.jinja:13 #: pedagogy/templates/pedagogy/uv_detail.jinja:138 #: trombi/templates/trombi/comment.jinja:4 @@ -902,11 +902,11 @@ msgstr "Opérations sans étiquette" msgid "Refound this account" msgstr "Rembourser ce compte" -#: club/forms.py:55 club/forms.py:181 +#: club/forms.py:55 club/forms.py:185 msgid "Users to add" msgstr "Utilisateurs à ajouter" -#: club/forms.py:56 club/forms.py:182 core/views/group.py:47 +#: club/forms.py:56 club/forms.py:186 core/views/group.py:47 msgid "Search users to add (one or more)." msgstr "Recherche les utilisateurs à ajouter (un ou plus)." @@ -934,7 +934,7 @@ msgstr "Action" msgid "This field is required" msgstr "Ce champ est obligatoire" -#: club/forms.py:118 club/forms.py:241 club/tests.py:712 +#: club/forms.py:118 club/forms.py:245 club/tests.py:712 msgid "One of the selected users doesn't exist" msgstr "Un des utilisateurs sélectionné n'existe pas" @@ -950,49 +950,49 @@ msgstr "Une action est requise" msgid "You must specify at least an user or an email address" msgstr "vous devez spécifier au moins un utilisateur ou une adresse email" -#: club/forms.py:152 counter/forms.py:171 +#: club/forms.py:153 counter/forms.py:186 msgid "Begin date" msgstr "Date de début" -#: club/forms.py:153 com/views.py:80 com/views.py:195 counter/forms.py:172 -#: election/views.py:164 subscription/views.py:38 +#: club/forms.py:156 com/views.py:82 com/views.py:201 counter/forms.py:189 +#: election/views.py:167 subscription/views.py:38 msgid "End date" msgstr "Date de fin" -#: club/forms.py:156 club/templates/club/club_sellings.jinja:21 +#: club/forms.py:160 club/templates/club/club_sellings.jinja:21 #: core/templates/core/user_account_detail.jinja:18 #: core/templates/core/user_account_detail.jinja:51 -#: counter/templates/counter/cash_summary_list.jinja:33 counter/views.py:151 +#: counter/templates/counter/cash_summary_list.jinja:33 counter/views.py:152 msgid "Counter" msgstr "Comptoir" -#: club/forms.py:163 counter/views.py:734 +#: club/forms.py:167 counter/views.py:736 msgid "Products" msgstr "Produits" -#: club/forms.py:168 counter/views.py:739 +#: club/forms.py:172 counter/views.py:741 msgid "Archived products" msgstr "Produits archivés" -#: club/forms.py:223 club/templates/club/club_members.jinja:22 +#: club/forms.py:227 club/templates/club/club_members.jinja:22 #: club/templates/club/club_members.jinja:48 #: core/templates/core/user_clubs.jinja:31 msgid "Mark as old" msgstr "Marquer comme ancien" -#: club/forms.py:245 +#: club/forms.py:249 msgid "User must be subscriber to take part to a club" msgstr "L'utilisateur doit être cotisant pour faire partie d'un club" -#: club/forms.py:249 core/views/group.py:64 +#: club/forms.py:253 core/views/group.py:64 msgid "You can not add the same user twice" msgstr "Vous ne pouvez pas ajouter deux fois le même utilisateur" -#: club/forms.py:268 +#: club/forms.py:272 msgid "You should specify a role" msgstr "Vous devez choisir un rôle" -#: club/forms.py:279 sas/views.py:118 sas/views.py:185 sas/views.py:284 +#: club/forms.py:283 sas/views.py:118 sas/views.py:185 sas/views.py:284 msgid "You do not have the permission to do that" msgstr "Vous n'avez pas la permission de faire cela" @@ -1145,7 +1145,7 @@ msgid "There are no members in this club." msgstr "Il n'y a pas de membres dans ce club." #: club/templates/club/club_members.jinja:80 -#: core/templates/core/file_detail.jinja:19 core/views/forms.py:333 +#: core/templates/core/file_detail.jinja:19 core/views/forms.py:328 #: launderette/views.py:217 trombi/templates/trombi/detail.jinja:19 msgid "Add" msgstr "Ajouter" @@ -1353,7 +1353,7 @@ msgstr "Anciens membres" msgid "History" msgstr "Historique" -#: club/views.py:116 core/templates/core/base.jinja:96 core/views/user.py:220 +#: club/views.py:116 core/templates/core/base.jinja:95 core/views/user.py:220 #: sas/templates/sas/picture.jinja:100 trombi/views.py:61 msgid "Tools" msgstr "Outils" @@ -1372,7 +1372,7 @@ msgstr "Vente" msgid "Mailing list" msgstr "Listes de diffusion" -#: club/views.py:161 com/views.py:130 +#: club/views.py:161 com/views.py:133 msgid "Posters list" msgstr "Liste d'affiches" @@ -1487,7 +1487,7 @@ msgstr "temps d'affichage" msgid "Begin date should be before end date" msgstr "La date de début doit être avant celle de fin" -#: com/templates/com/mailing_admin.jinja:4 com/views.py:123 +#: com/templates/com/mailing_admin.jinja:4 com/views.py:126 #: core/templates/core/user_tools.jinja:144 msgid "Mailing lists administration" msgstr "Administration des mailing listes" @@ -1642,7 +1642,7 @@ msgid "Calls to moderate" msgstr "Appels à modérer" #: com/templates/com/news_admin_list.jinja:242 -#: core/templates/core/base.jinja:211 +#: core/templates/core/base.jinja:210 msgid "Events" msgstr "Événements" @@ -1803,7 +1803,7 @@ msgid "Slideshow" msgstr "Diaporama" #: com/templates/com/weekmail.jinja:5 com/templates/com/weekmail.jinja:9 -#: com/views.py:100 core/templates/core/user_tools.jinja:137 +#: com/views.py:103 core/templates/core/user_tools.jinja:137 msgid "Weekmail" msgstr "Weekmail" @@ -1904,56 +1904,56 @@ msgstr "Le mot de la fin" msgid "Format: 16:9 | Resolution: 1920x1080" msgstr "Format : 16:9 | Résolution : 1920x1080" -#: com/views.py:76 com/views.py:194 election/views.py:163 +#: com/views.py:76 com/views.py:198 election/views.py:164 #: subscription/views.py:35 msgid "Start date" msgstr "Date de début" -#: com/views.py:95 +#: com/views.py:98 msgid "Communication administration" msgstr "Administration de la communication" -#: com/views.py:106 core/templates/core/user_tools.jinja:138 +#: com/views.py:109 core/templates/core/user_tools.jinja:138 msgid "Weekmail destinations" msgstr "Destinataires du Weekmail" -#: com/views.py:110 +#: com/views.py:113 msgid "Info message" msgstr "Message d'info" -#: com/views.py:116 +#: com/views.py:119 msgid "Alert message" msgstr "Message d'alerte" -#: com/views.py:137 +#: com/views.py:140 msgid "Screens list" msgstr "Liste d'écrans" -#: com/views.py:196 +#: com/views.py:203 msgid "Until" msgstr "Jusqu'à" -#: com/views.py:198 +#: com/views.py:205 msgid "Automoderation" msgstr "Automodération" -#: com/views.py:205 com/views.py:209 com/views.py:223 +#: com/views.py:212 com/views.py:216 com/views.py:230 msgid "This field is required." msgstr "Ce champ est obligatoire." -#: com/views.py:219 +#: com/views.py:226 msgid "You crazy? You can not finish an event before starting it." msgstr "T'es fou? Un événement ne peut pas finir avant même de commencer." -#: com/views.py:443 +#: com/views.py:450 msgid "Delete and save to regenerate" msgstr "Supprimer et sauver pour régénérer" -#: com/views.py:458 +#: com/views.py:465 msgid "Weekmail of the " msgstr "Weekmail du " -#: com/views.py:562 +#: com/views.py:569 msgid "" "You must be a board member of the selected club to post in the Weekmail." msgstr "" @@ -2390,18 +2390,18 @@ msgstr "500, Erreur Serveur" msgid "Welcome!" msgstr "Bienvenue !" -#: core/templates/core/base.jinja:54 core/templates/core/login.jinja:8 +#: core/templates/core/base.jinja:53 core/templates/core/login.jinja:8 #: core/templates/core/login.jinja:18 core/templates/core/login.jinja:51 #: core/templates/core/password_reset_complete.jinja:5 msgid "Login" msgstr "Connexion" -#: core/templates/core/base.jinja:55 core/templates/core/register.jinja:7 +#: core/templates/core/base.jinja:54 core/templates/core/register.jinja:7 #: core/templates/core/register.jinja:16 core/templates/core/register.jinja:22 msgid "Register" msgstr "Inscription" -#: core/templates/core/base.jinja:61 core/templates/core/base.jinja:62 +#: core/templates/core/base.jinja:60 core/templates/core/base.jinja:61 #: forum/templates/forum/macros.jinja:171 #: forum/templates/forum/macros.jinja:175 #: matmat/templates/matmat/search_form.jinja:37 @@ -2410,52 +2410,52 @@ msgstr "Inscription" msgid "Search" msgstr "Recherche" -#: core/templates/core/base.jinja:97 +#: core/templates/core/base.jinja:96 msgid "Logout" msgstr "Déconnexion" -#: core/templates/core/base.jinja:145 +#: core/templates/core/base.jinja:144 msgid "You do not have any unread notification" msgstr "Vous n'avez aucune notification non lue" -#: core/templates/core/base.jinja:150 +#: core/templates/core/base.jinja:149 msgid "View more" msgstr "Voir plus" -#: core/templates/core/base.jinja:153 +#: core/templates/core/base.jinja:152 #: forum/templates/forum/last_unread.jinja:17 msgid "Mark all as read" msgstr "Marquer tout comme lu" -#: core/templates/core/base.jinja:201 +#: core/templates/core/base.jinja:200 msgid "Main" msgstr "Accueil" -#: core/templates/core/base.jinja:203 +#: core/templates/core/base.jinja:202 msgid "Associations & Clubs" msgstr "Associations & Clubs" -#: core/templates/core/base.jinja:205 +#: core/templates/core/base.jinja:204 msgid "AE" msgstr "L'AE" -#: core/templates/core/base.jinja:206 +#: core/templates/core/base.jinja:205 msgid "AE's clubs" msgstr "Les clubs de L'AE" -#: core/templates/core/base.jinja:207 +#: core/templates/core/base.jinja:206 msgid "Others UTBM's Associations" msgstr "Les autres associations de l'UTBM" -#: core/templates/core/base.jinja:213 core/templates/core/user_tools.jinja:180 +#: core/templates/core/base.jinja:212 core/templates/core/user_tools.jinja:180 msgid "Elections" msgstr "Élections" -#: core/templates/core/base.jinja:214 +#: core/templates/core/base.jinja:213 msgid "Big event" msgstr "Grandes Activités" -#: core/templates/core/base.jinja:217 +#: core/templates/core/base.jinja:216 #: forum/templates/forum/favorite_topics.jinja:14 #: forum/templates/forum/last_unread.jinja:14 #: forum/templates/forum/macros.jinja:90 forum/templates/forum/main.jinja:6 @@ -2464,11 +2464,11 @@ msgstr "Grandes Activités" msgid "Forum" msgstr "Forum" -#: core/templates/core/base.jinja:218 +#: core/templates/core/base.jinja:217 msgid "Gallery" msgstr "Photos" -#: core/templates/core/base.jinja:219 counter/models.py:365 +#: core/templates/core/base.jinja:218 counter/models.py:365 #: counter/templates/counter/counter_list.jinja:11 #: eboutic/templates/eboutic/eboutic_main.jinja:4 #: eboutic/templates/eboutic/eboutic_main.jinja:23 @@ -2478,79 +2478,79 @@ msgstr "Photos" msgid "Eboutic" msgstr "Eboutic" -#: core/templates/core/base.jinja:221 +#: core/templates/core/base.jinja:220 msgid "Services" msgstr "Services" -#: core/templates/core/base.jinja:223 +#: core/templates/core/base.jinja:222 msgid "Matmatronch" msgstr "Matmatronch" -#: core/templates/core/base.jinja:224 launderette/models.py:38 +#: core/templates/core/base.jinja:223 launderette/models.py:38 #: launderette/templates/launderette/launderette_book.jinja:5 #: launderette/templates/launderette/launderette_book_choose.jinja:4 #: launderette/templates/launderette/launderette_main.jinja:4 msgid "Launderette" msgstr "Laverie" -#: core/templates/core/base.jinja:225 core/templates/core/file.jinja:20 +#: core/templates/core/base.jinja:224 core/templates/core/file.jinja:20 #: core/views/files.py:108 msgid "Files" msgstr "Fichiers" -#: core/templates/core/base.jinja:226 core/templates/core/user_tools.jinja:171 +#: core/templates/core/base.jinja:225 core/templates/core/user_tools.jinja:171 msgid "Pedagogy" msgstr "Pédagogie" -#: core/templates/core/base.jinja:230 +#: core/templates/core/base.jinja:229 msgid "My Benefits" msgstr "Mes Avantages" -#: core/templates/core/base.jinja:232 +#: core/templates/core/base.jinja:231 msgid "Sponsors" msgstr "Partenaires" -#: core/templates/core/base.jinja:233 +#: core/templates/core/base.jinja:232 msgid "Subscriber benefits" msgstr "Les avantages cotisants" -#: core/templates/core/base.jinja:237 +#: core/templates/core/base.jinja:236 msgid "Help" msgstr "Aide" -#: core/templates/core/base.jinja:239 +#: core/templates/core/base.jinja:238 msgid "FAQ" msgstr "FAQ" -#: core/templates/core/base.jinja:240 core/templates/core/base.jinja:280 +#: core/templates/core/base.jinja:239 core/templates/core/base.jinja:279 msgid "Contacts" msgstr "Contacts" -#: core/templates/core/base.jinja:241 +#: core/templates/core/base.jinja:240 msgid "Wiki" msgstr "Wiki" -#: core/templates/core/base.jinja:281 +#: core/templates/core/base.jinja:280 msgid "Legal notices" msgstr "Mentions légales" -#: core/templates/core/base.jinja:282 +#: core/templates/core/base.jinja:281 msgid "Intellectual property" msgstr "Propriété intellectuelle" -#: core/templates/core/base.jinja:283 +#: core/templates/core/base.jinja:282 msgid "Help & Documentation" msgstr "Aide & Documentation" -#: core/templates/core/base.jinja:284 +#: core/templates/core/base.jinja:283 msgid "R&D" msgstr "R&D" -#: core/templates/core/base.jinja:287 +#: core/templates/core/base.jinja:286 msgid "Site created by the IT Department of the AE" msgstr "Site réalisé par le Pôle Informatique de l'AE" -#: core/templates/core/base.jinja:293 +#: core/templates/core/base.jinja:292 #, fuzzy #| msgid "Site version:" msgid "Sith version:" @@ -2581,7 +2581,7 @@ msgstr "Confirmation" #: core/templates/core/delete_confirm.jinja:20 #: core/templates/core/file_delete_confirm.jinja:14 -#: counter/templates/counter/counter_click.jinja:122 +#: counter/templates/counter/counter_click.jinja:121 msgid "Cancel" msgstr "Annuler" @@ -3074,7 +3074,7 @@ msgid "Eboutic invoices" msgstr "Facture eboutic" #: core/templates/core/user_account.jinja:57 -#: core/templates/core/user_tools.jinja:58 counter/views.py:759 +#: core/templates/core/user_tools.jinja:58 counter/views.py:761 msgid "Etickets" msgstr "Etickets" @@ -3330,7 +3330,7 @@ msgstr "A modérer" msgid "Picture Unavailable" msgstr "Photo Indisponible" -#: core/templates/core/user_pictures.jinja:82 +#: core/templates/core/user_pictures.jinja:83 msgid "pictures" msgstr "photos" @@ -3400,7 +3400,7 @@ msgstr "Achats" msgid "Product top 10" msgstr "Top 10 produits" -#: core/templates/core/user_stats.jinja:43 counter/forms.py:182 +#: core/templates/core/user_stats.jinja:43 counter/forms.py:200 msgid "Product" msgstr "Produit" @@ -3445,8 +3445,8 @@ msgstr "Cotisations" msgid "Subscription stats" msgstr "Statistiques de cotisation" -#: core/templates/core/user_tools.jinja:48 counter/forms.py:145 -#: counter/views.py:729 +#: core/templates/core/user_tools.jinja:48 counter/forms.py:159 +#: counter/views.py:731 msgid "Counters" msgstr "Comptoirs" @@ -3463,12 +3463,12 @@ msgid "Product types management" msgstr "Gestion des types de produit" #: core/templates/core/user_tools.jinja:56 -#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:749 +#: counter/templates/counter/cash_summary_list.jinja:23 counter/views.py:751 msgid "Cash register summaries" msgstr "Relevés de caisse" #: core/templates/core/user_tools.jinja:57 -#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:754 +#: counter/templates/counter/invoices_call.jinja:4 counter/views.py:756 msgid "Invoices call" msgstr "Appels à facture" @@ -3582,7 +3582,7 @@ msgstr "Ajouter un nouveau dossier" msgid "Error creating folder %(folder_name)s: %(msg)s" msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s" -#: core/views/files.py:145 core/views/forms.py:298 core/views/forms.py:305 +#: core/views/files.py:145 core/views/forms.py:293 core/views/forms.py:300 #: sas/views.py:82 #, python-format msgid "Error uploading file %(file_name)s: %(msg)s" @@ -3592,91 +3592,95 @@ msgstr "Erreur d'envoi du fichier %(file_name)s : %(msg)s" msgid "Apply rights recursively" msgstr "Appliquer les droits récursivement" -#: core/views/forms.py:87 +#: core/views/forms.py:79 msgid "Heading" msgstr "Titre" -#: core/views/forms.py:88 +#: core/views/forms.py:80 msgid "Italic" msgstr "Italique" -#: core/views/forms.py:89 +#: core/views/forms.py:81 msgid "Bold" msgstr "Gras" -#: core/views/forms.py:90 +#: core/views/forms.py:82 msgid "Strikethrough" msgstr "Barré" -#: core/views/forms.py:91 +#: core/views/forms.py:83 msgid "Underline" msgstr "Souligné" -#: core/views/forms.py:92 +#: core/views/forms.py:84 msgid "Superscript" msgstr "Exposant" -#: core/views/forms.py:93 +#: core/views/forms.py:85 msgid "Subscript" msgstr "Indice" -#: core/views/forms.py:95 +#: core/views/forms.py:87 msgid "Quote" msgstr "Citation" -#: core/views/forms.py:96 +#: core/views/forms.py:88 msgid "Unordered list" msgstr "Liste non ordonnée" -#: core/views/forms.py:97 +#: core/views/forms.py:89 msgid "Ordered list" msgstr "Liste ordonnée" -#: core/views/forms.py:98 +#: core/views/forms.py:90 msgid "Insert image" msgstr "Insérer image" -#: core/views/forms.py:99 +#: core/views/forms.py:91 msgid "Insert link" msgstr "Insérer lien" -#: core/views/forms.py:100 +#: core/views/forms.py:92 msgid "Insert table" msgstr "Insérer tableau" -#: core/views/forms.py:101 +#: core/views/forms.py:93 msgid "Clean block" msgstr "Nettoyer bloc" -#: core/views/forms.py:102 +#: core/views/forms.py:94 msgid "Toggle preview" msgstr "Activer la prévisualisation" -#: core/views/forms.py:103 +#: core/views/forms.py:95 msgid "Toggle side by side" msgstr "Activer la vue côte à côte" -#: core/views/forms.py:104 +#: core/views/forms.py:96 msgid "Toggle fullscreen" msgstr "Activer le plein écran" -#: core/views/forms.py:105 +#: core/views/forms.py:97 msgid "Markdown guide" msgstr "Guide markdown" -#: core/views/forms.py:121 core/views/forms.py:129 +#: core/views/forms.py:108 +msgid "Unsupported NFC card" +msgstr "Carte NFC non supportée" + +#: core/views/forms.py:122 core/views/forms.py:130 msgid "Choose file" msgstr "Choisir un fichier" -#: core/views/forms.py:145 core/views/forms.py:153 +#: core/views/forms.py:146 core/views/forms.py:154 msgid "Choose user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:185 +#: core/views/forms.py:186 msgid "Username, email, or account number" msgstr "Nom d'utilisateur, email, ou numéro de compte AE" -#: core/views/forms.py:244 +#: core/views/forms.py:245 msgid "" "Profile: you need to be visible on the picture, in order to be recognized (e." "g. by the barmen)" @@ -3684,36 +3688,36 @@ msgstr "" "Photo de profil: vous devez être visible sur la photo afin d'être reconnu " "(par exemple par les barmen)" -#: core/views/forms.py:246 +#: core/views/forms.py:247 msgid "Avatar: used on the forum" msgstr "Avatar : utilisé sur le forum" -#: core/views/forms.py:247 +#: core/views/forms.py:248 msgid "Scrub: let other know how your scrub looks like!" msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" -#: core/views/forms.py:309 +#: core/views/forms.py:304 msgid "Bad image format, only jpeg, png, and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés" -#: core/views/forms.py:330 +#: core/views/forms.py:325 msgid "Godfather / Godmother" msgstr "Parrain / Marraine" -#: core/views/forms.py:331 +#: core/views/forms.py:326 msgid "Godchild" msgstr "Fillot / Fillote" -#: core/views/forms.py:336 counter/forms.py:61 trombi/views.py:149 +#: core/views/forms.py:331 counter/forms.py:67 trombi/views.py:149 msgid "Select user" msgstr "Choisir un utilisateur" -#: core/views/forms.py:349 core/views/forms.py:367 election/models.py:22 +#: core/views/forms.py:344 core/views/forms.py:362 election/models.py:22 #: election/views.py:147 msgid "edit groups" msgstr "groupe d'édition" -#: core/views/forms.py:352 core/views/forms.py:370 election/models.py:29 +#: core/views/forms.py:347 core/views/forms.py:365 election/models.py:29 #: election/views.py:150 msgid "view groups" msgstr "groupe de vue" @@ -3753,19 +3757,19 @@ msgstr "L'utilisateur a déjà une photo de profil" msgid "counter" msgstr "comptoir" -#: counter/forms.py:45 +#: counter/forms.py:48 msgid "This UID is invalid" msgstr "Cet UID est invalide" -#: counter/forms.py:83 +#: counter/forms.py:89 msgid "User not found" msgstr "Utilisateur non trouvé" -#: counter/forms.py:131 +#: counter/forms.py:145 msgid "Parent product" msgstr "Produit parent" -#: counter/forms.py:137 +#: counter/forms.py:151 msgid "Buying groups" msgstr "Groupes d'achat" @@ -3789,7 +3793,7 @@ msgstr "client" msgid "customers" msgstr "clients" -#: counter/models.py:72 counter/views.py:311 +#: counter/models.py:72 counter/views.py:312 msgid "Not enough money" msgstr "Solde insuffisant" @@ -4055,7 +4059,7 @@ msgstr "Liste des relevés de caisse" msgid "Theoric sums" msgstr "Sommes théoriques" -#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1003 +#: counter/templates/counter/cash_summary_list.jinja:36 counter/views.py:1005 msgid "Emptied" msgstr "Coffre vidé" @@ -4076,8 +4080,8 @@ msgid "This is not a valid student card UID" msgstr "Ce n'est pas un UID de carte étudiante valide" #: counter/templates/counter/counter_click.jinja:41 -#: counter/templates/counter/counter_click.jinja:68 -#: counter/templates/counter/counter_click.jinja:133 +#: counter/templates/counter/counter_click.jinja:67 +#: counter/templates/counter/counter_click.jinja:132 #: counter/templates/counter/invoices_call.jinja:16 #: launderette/templates/launderette/launderette_admin.jinja:35 #: launderette/templates/launderette/launderette_click.jinja:13 @@ -4090,25 +4094,25 @@ msgstr "Valider" msgid "Registered cards" msgstr "Cartes enregistrées" -#: counter/templates/counter/counter_click.jinja:52 +#: counter/templates/counter/counter_click.jinja:51 msgid "No card registered" msgstr "Aucune carte enregistrée" -#: counter/templates/counter/counter_click.jinja:57 +#: counter/templates/counter/counter_click.jinja:56 #: launderette/templates/launderette/launderette_admin.jinja:8 msgid "Selling" msgstr "Vente" -#: counter/templates/counter/counter_click.jinja:75 +#: counter/templates/counter/counter_click.jinja:74 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:20 msgid "Basket: " msgstr "Panier : " -#: counter/templates/counter/counter_click.jinja:116 +#: counter/templates/counter/counter_click.jinja:115 msgid "Finish" msgstr "Terminer" -#: counter/templates/counter/counter_click.jinja:126 +#: counter/templates/counter/counter_click.jinja:125 #: counter/templates/counter/refilling_list.jinja:9 msgid "Refilling" msgstr "Rechargement" @@ -4281,109 +4285,109 @@ msgstr "Temps" msgid "Top 100 barman %(counter_name)s (all semesters)" msgstr "Top 100 barman %(counter_name)s (tous les semestres)" -#: counter/views.py:172 +#: counter/views.py:173 msgid "Cash summary" msgstr "Relevé de caisse" -#: counter/views.py:188 +#: counter/views.py:189 msgid "Last operations" msgstr "Dernières opérations" -#: counter/views.py:205 +#: counter/views.py:206 msgid "Take items from stock" msgstr "Prendre des éléments du stock" -#: counter/views.py:254 +#: counter/views.py:255 msgid "Bad credentials" msgstr "Mauvais identifiants" -#: counter/views.py:256 +#: counter/views.py:257 msgid "User is not barman" msgstr "L'utilisateur n'est pas barman." -#: counter/views.py:261 +#: counter/views.py:262 msgid "Bad location, someone is already logged in somewhere else" msgstr "Mauvais comptoir, quelqu'un est déjà connecté ailleurs" -#: counter/views.py:302 +#: counter/views.py:303 msgid "Too young for that product" msgstr "Trop jeune pour ce produit" -#: counter/views.py:305 +#: counter/views.py:306 msgid "Not allowed for that product" msgstr "Non autorisé pour ce produit" -#: counter/views.py:308 +#: counter/views.py:309 msgid "No date of birth provided" msgstr "Pas de date de naissance renseignée" -#: counter/views.py:597 +#: counter/views.py:598 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:723 +#: counter/views.py:725 msgid "Counter administration" msgstr "Administration des comptoirs" -#: counter/views.py:725 +#: counter/views.py:727 msgid "Stocks" msgstr "Stocks" -#: counter/views.py:744 +#: counter/views.py:746 msgid "Product types" msgstr "Types de produit" -#: counter/views.py:960 +#: counter/views.py:962 msgid "10 cents" msgstr "10 centimes" -#: counter/views.py:961 +#: counter/views.py:963 msgid "20 cents" msgstr "20 centimes" -#: counter/views.py:962 +#: counter/views.py:964 msgid "50 cents" msgstr "50 centimes" -#: counter/views.py:963 +#: counter/views.py:965 msgid "1 euro" msgstr "1 €" -#: counter/views.py:964 +#: counter/views.py:966 msgid "2 euros" msgstr "2 €" -#: counter/views.py:965 +#: counter/views.py:967 msgid "5 euros" msgstr "5 €" -#: counter/views.py:966 +#: counter/views.py:968 msgid "10 euros" msgstr "10 €" -#: counter/views.py:967 +#: counter/views.py:969 msgid "20 euros" msgstr "20 €" -#: counter/views.py:968 +#: counter/views.py:970 msgid "50 euros" msgstr "50 €" -#: counter/views.py:970 +#: counter/views.py:972 msgid "100 euros" msgstr "100 €" -#: counter/views.py:973 counter/views.py:979 counter/views.py:985 -#: counter/views.py:991 counter/views.py:997 +#: counter/views.py:975 counter/views.py:981 counter/views.py:987 +#: counter/views.py:993 counter/views.py:999 msgid "Check amount" msgstr "Montant du chèque" -#: counter/views.py:976 counter/views.py:982 counter/views.py:988 -#: counter/views.py:994 counter/views.py:1000 +#: counter/views.py:978 counter/views.py:984 counter/views.py:990 +#: counter/views.py:996 counter/views.py:1002 msgid "Check quantity" msgstr "Nombre de chèque" -#: counter/views.py:1530 +#: counter/views.py:1532 msgid "people(s)" msgstr "personne(s)" @@ -4691,11 +4695,11 @@ msgstr "Utilisateur se présentant" msgid "This role already exists for this election" msgstr "Ce rôle existe déjà pour cette élection" -#: election/views.py:166 +#: election/views.py:170 msgid "Start candidature" msgstr "Début des candidatures" -#: election/views.py:168 +#: election/views.py:173 msgid "End candidature" msgstr "Fin des candidatures" From b25805e0a1b6a4477f58924d786b65d22d81c006 Mon Sep 17 00:00:00 2001 From: thomas girod Date: Wed, 24 Jul 2024 00:16:31 +0200 Subject: [PATCH 04/20] introduce djhtml as jinja+scss formater --- .gitignore | 4 +- .pre-commit-config.yaml | 13 +- .../accounting/accountingtype_list.jinja | 38 +- .../accounting/bank_account_details.jinja | 56 +- .../accounting/bank_account_list.jinja | 46 +- .../accounting/club_account_details.jinja | 122 ++-- accounting/templates/accounting/co_list.jinja | 46 +- .../accounting/journal_details.jinja | 172 ++--- .../journal_statement_accounting.jinja | 34 +- .../accounting/journal_statement_nature.jinja | 74 +-- .../accounting/journal_statement_person.jinja | 86 +-- .../templates/accounting/label_list.jinja | 52 +- .../templates/accounting/operation_edit.jinja | 202 +++--- .../accounting/refound_account.jinja | 18 +- .../simplifiedaccountingtype_list.jinja | 38 +- accounting/tests.py | 23 +- club/templates/club/club_detail.jinja | 20 +- club/templates/club/club_list.jinja | 54 +- club/templates/club/club_members.jinja | 146 ++--- club/templates/club/club_old_members.jinja | 42 +- club/templates/club/club_sellings.jinja | 86 +-- club/templates/club/club_tools.jinja | 42 +- club/templates/club/mailing.jinja | 154 ++--- club/templates/club/page_history.jinja | 10 +- club/templates/club/pagerev_edit.jinja | 2 +- club/templates/club/stats.jinja | 56 +- com/templates/com/mailing_admin.jinja | 52 +- com/templates/com/news_admin_list.jinja | 606 +++++++++--------- com/templates/com/news_detail.jinja | 60 +- com/templates/com/news_edit.jinja | 102 +-- com/templates/com/news_list.jinja | 284 ++++---- com/templates/com/poster_edit.jinja | 46 +- com/templates/com/poster_list.jinja | 80 +-- com/templates/com/poster_moderate.jinja | 38 +- com/templates/com/screen_edit.jinja | 30 +- com/templates/com/screen_list.jinja | 36 +- com/templates/com/screen_slideshow.jinja | 26 +- com/templates/com/weekmail.jinja | 106 +-- com/templates/com/weekmail_preview.jinja | 48 +- .../com/weekmail_renderer_html.jinja | 76 +-- .../com/weekmail_renderer_text.jinja | 20 +- com/tests.py | 20 +- core/static/com/slideshow.scss | 250 ++++---- core/static/core/markdown.scss | 6 +- core/static/core/navbar.scss | 4 +- core/static/core/style.scss | 117 ++-- core/static/election/election.scss | 486 +++++++------- core/static/user/user_godfathers.scss | 6 +- core/static/user/user_tools.scss | 4 +- core/templates/core/403.jinja | 4 +- core/templates/core/404.jinja | 6 +- core/templates/core/500.jinja | 42 +- core/templates/core/base.jinja | 582 ++++++++--------- core/templates/core/create.jinja | 8 +- core/templates/core/delete_confirm.jinja | 12 +- core/templates/core/edit.jinja | 24 +- core/templates/core/file.jinja | 82 +-- core/templates/core/file_delete_confirm.jinja | 12 +- core/templates/core/file_detail.jinja | 114 ++-- core/templates/core/file_edit.jinja | 6 +- core/templates/core/file_list.jinja | 34 +- core/templates/core/file_moderation.jinja | 26 +- core/templates/core/group_detail.jinja | 58 +- core/templates/core/group_edit.jinja | 8 +- core/templates/core/group_list.jinja | 46 +- core/templates/core/login.jinja | 70 +- core/templates/core/macros.jinja | 194 +++--- core/templates/core/macros_pages.jinja | 26 +- core/templates/core/new_user_email.jinja | 20 +- .../core/new_user_email_subject.jinja | 2 +- core/templates/core/notification_list.jinja | 28 +- core/templates/core/page.jinja | 62 +- core/templates/core/page_detail.jinja | 20 +- core/templates/core/page_hist.jinja | 4 +- core/templates/core/page_list.jinja | 22 +- core/templates/core/page_prop.jinja | 18 +- core/templates/core/pagerev_edit.jinja | 2 +- core/templates/core/password_change.jinja | 14 +- .../templates/core/password_change_done.jinja | 2 +- core/templates/core/password_reset.jinja | 12 +- .../core/password_reset_complete.jinja | 4 +- .../core/password_reset_confirm.jinja | 18 +- core/templates/core/password_reset_done.jinja | 18 +- .../templates/core/password_reset_email.jinja | 16 +- core/templates/core/poster_list.jinja | 54 +- core/templates/core/register.jinja | 17 +- .../core/register_confirm_mail.jinja | 18 +- core/templates/core/screen_slideshow.jinja | 26 +- core/templates/core/search.jinja | 22 +- core/templates/core/to_markdown.jinja | 26 +- core/templates/core/user_account.jinja | 120 ++-- core/templates/core/user_account_detail.jinja | 162 ++--- core/templates/core/user_clubs.jinja | 112 ++-- core/templates/core/user_detail.jinja | 474 +++++++------- core/templates/core/user_edit.jinja | 262 ++++---- core/templates/core/user_godfathers.jinja | 72 +-- .../templates/core/user_godfathers_tree.jinja | 74 +-- core/templates/core/user_group.jinja | 12 +- core/templates/core/user_list.jinja | 14 +- core/templates/core/user_preferences.jinja | 104 +-- core/templates/core/user_stats.jinja | 62 +- core/templates/core/user_tools.jinja | 364 +++++------ .../core/widgets/markdown_textarea.jinja | 366 +++++------ counter/templates/counter/activity.jinja | 58 +- .../counter/cash_register_summary.jinja | 26 +- .../templates/counter/cash_summary_list.jinja | 106 +-- counter/templates/counter/counter_click.jinja | 1 + counter/templates/counter/counter_list.jinja | 120 ++-- counter/templates/counter/counter_main.jinja | 78 +-- counter/templates/counter/eticket_list.jinja | 24 +- counter/templates/counter/invoices_call.jinja | 36 +- counter/templates/counter/last_ops.jinja | 86 +-- counter/templates/counter/product_list.jinja | 44 +- .../templates/counter/producttype_list.jinja | 24 +- .../templates/counter/refilling_list.jinja | 46 +- counter/templates/counter/stats.jinja | 136 ++-- docs/explanation/conventions.md | 12 +- docs/explanation/technos.md | 15 +- eboutic/templates/eboutic/eboutic_main.jinja | 208 +++--- .../eboutic/eboutic_makecommand.jinja | 212 +++--- .../eboutic/eboutic_payment_result.jinja | 10 +- .../templates/election/candidate_form.jinja | 18 +- .../templates/election/election_detail.jinja | 400 ++++++------ .../templates/election/election_list.jinja | 70 +- forum/templates/forum/favorite_topics.jinja | 22 +- forum/templates/forum/forum.jinja | 108 ++-- forum/templates/forum/last_unread.jinja | 26 +- forum/templates/forum/macros.jinja | 210 +++--- forum/templates/forum/main.jinja | 60 +- forum/templates/forum/reply.jinja | 66 +- forum/templates/forum/search.jinja | 20 +- forum/templates/forum/topic.jinja | 72 +-- galaxy/templates/galaxy/user.jinja | 94 +-- .../launderette/launderette_admin.jinja | 96 +-- .../launderette/launderette_book.jinja | 68 +- .../launderette/launderette_book_choose.jinja | 16 +- .../launderette/launderette_click.jinja | 18 +- .../launderette/launderette_list.jinja | 30 +- .../launderette/launderette_main.jinja | 16 +- matmat/templates/matmat/search_form.jinja | 80 +-- pedagogy/templates/pedagogy/guide.jinja | 308 ++++----- pedagogy/templates/pedagogy/macros.jinja | 24 +- pedagogy/templates/pedagogy/moderation.jinja | 60 +- pedagogy/templates/pedagogy/starlist.jinja | 90 +-- pedagogy/templates/pedagogy/uv_detail.jinja | 386 +++++------ pedagogy/templates/pedagogy/uv_edit.jinja | 110 ++-- poetry.lock | 191 +++--- pyproject.toml | 1 + .../rootplace/delete_user_messages.jinja | 16 +- rootplace/templates/rootplace/logs.jinja | 46 +- rootplace/templates/rootplace/merge.jinja | 14 +- sas/templates/sas/album.jinja | 418 ++++++------ sas/templates/sas/main.jinja | 148 ++--- sas/templates/sas/moderation.jinja | 32 +- sas/templates/sas/picture.jinja | 298 ++++----- .../templates/stock/shopping_list_items.jinja | 86 +-- .../stock/shopping_list_quantity.jinja | 18 +- stock/templates/stock/stock_item_list.jinja | 46 +- stock/templates/stock/stock_list.jinja | 34 +- .../templates/stock/stock_shopping_list.jinja | 130 ++-- stock/templates/stock/stock_take_items.jinja | 18 +- .../stock/update_after_shopping.jinja | 18 +- .../templates/subscription/stats.jinja | 178 ++--- .../templates/subscription/subscription.jinja | 72 +-- trombi/templates/trombi/comment.jinja | 20 +- .../templates/trombi/comment_moderation.jinja | 42 +- trombi/templates/trombi/detail.jinja | 60 +- trombi/templates/trombi/edit_profile.jinja | 48 +- trombi/templates/trombi/export.jinja | 182 +++--- trombi/templates/trombi/user_profile.jinja | 62 +- trombi/templates/trombi/user_tools.jinja | 84 +-- 171 files changed, 7070 insertions(+), 7018 deletions(-) diff --git a/.gitignore b/.gitignore index f0ee47d9..e5651bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,6 @@ sith/settings_custom.py sith/search_indexes/ .coverage coverage_report/ -doc/_build + +# compiled documentation +site/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a98da0d..b81eaae6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,4 +7,15 @@ repos: - id: ruff # actually fix the fixable errors, but print nothing args: ["--fix", "--silent"] # Run the formatter. - - id: ruff-format \ No newline at end of file + - id: ruff-format + - repo: https://github.com/rtts/djhtml + rev: 3.0.6 + hooks: + - id: djhtml + name: format templates + entry: djhtml --tabwidth 2 + types: ["jinja"] + - id: djcss + name: format scss files + entry: djcss --tabwidth 2 + types: ["scss"] diff --git a/accounting/templates/accounting/accountingtype_list.jinja b/accounting/templates/accounting/accountingtype_list.jinja index f04cc798..7ae54014 100644 --- a/accounting/templates/accounting/accountingtype_list.jinja +++ b/accounting/templates/accounting/accountingtype_list.jinja @@ -1,27 +1,27 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Accounting type list{% endtrans %} + {% trans %}Accounting type list{% endtrans %} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {% trans %}Accounting types{% endtrans %} -

-
-

{% trans %}New accounting type{% endtrans %}

- {% if accountingtype_list %} -

{% trans %}Accounting type list{% endtrans %}

-
    - {% for a in accountingtype_list %} -
  • {{ a }}
    • - {% endfor %} -
- {% else %} - {% trans %}There is no types in this website.{% endtrans %} - {% endif %} -
+
+

+ {% trans %}Accounting{% endtrans %} > + {% trans %}Accounting types{% endtrans %} +

+
+

{% trans %}New accounting type{% endtrans %}

+ {% if accountingtype_list %} +

{% trans %}Accounting type list{% endtrans %}

+
    + {% for a in accountingtype_list %} +
  • {{ a }}
    • + {% endfor %} +
+ {% else %} + {% trans %}There is no types in this website.{% endtrans %} + {% endif %} +
{% endblock %} diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja index eb7ac8b1..f1b1e056 100644 --- a/accounting/templates/accounting/bank_account_details.jinja +++ b/accounting/templates/accounting/bank_account_details.jinja @@ -1,37 +1,37 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Bank account: {% endtrans %}{{ object.name }} + {% trans %}Bank account: {% endtrans %}{{ object.name }} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {{ object.name }} -

-
-

{% trans %}Bank account: {% endtrans %}{{ object.name }}

- {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %} - {% trans %}Delete{% endtrans %} - {% endif %} -

{% trans %}Infos{% endtrans %}

-
    -
  • {% trans %}IBAN: {% endtrans %}{{ object.iban }}
    • -
  • {% trans %}Number: {% endtrans %}{{ object.number }}
    • -
-

{% trans %}New club account{% endtrans %}

- -
+
+

+ {% trans %}Accounting{% endtrans %} > + {{ object.name }} +

+
+

{% trans %}Bank account: {% endtrans %}{{ object.name }}

+ {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %} + {% trans %}Delete{% endtrans %} + {% endif %} +

{% trans %}Infos{% endtrans %}

+
    +
  • {% trans %}IBAN: {% endtrans %}{{ object.iban }}
    • +
  • {% trans %}Number: {% endtrans %}{{ object.number }}
    • +
+

{% trans %}New club account{% endtrans %}

+ +
{% endblock %} diff --git a/accounting/templates/accounting/bank_account_list.jinja b/accounting/templates/accounting/bank_account_list.jinja index 0bd654b8..bb47cfca 100644 --- a/accounting/templates/accounting/bank_account_list.jinja +++ b/accounting/templates/accounting/bank_account_list.jinja @@ -1,32 +1,32 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Bank account list{% endtrans %} + {% trans %}Bank account list{% endtrans %} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} -

- {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} -

{% trans %}Manage simplified types{% endtrans %}

-

{% trans %}Manage accounting types{% endtrans %}

-

{% trans %}New bank account{% endtrans %}

- {% endif %} - {% if bankaccount_list %} -

{% trans %}Bank account list{% endtrans %}

- - {% else %} - {% trans %}There is no accounts in this website.{% endtrans %} - {% endif %} -
+
+

+ {% trans %}Accounting{% endtrans %} +

+ {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} +

{% trans %}Manage simplified types{% endtrans %}

+

{% trans %}Manage accounting types{% endtrans %}

+

{% trans %}New bank account{% endtrans %}

+ {% endif %} + {% if bankaccount_list %} +

{% trans %}Bank account list{% endtrans %}

+ + {% else %} + {% trans %}There is no accounts in this website.{% endtrans %} + {% endif %} +
{% endblock %} diff --git a/accounting/templates/accounting/club_account_details.jinja b/accounting/templates/accounting/club_account_details.jinja index f9ceec23..b6df130e 100644 --- a/accounting/templates/accounting/club_account_details.jinja +++ b/accounting/templates/accounting/club_account_details.jinja @@ -1,68 +1,68 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Club account:{% endtrans %} {{ object.name }} + {% trans %}Club account:{% endtrans %} {{ object.name }} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {{object.bank_account }} > - {{ object }} -

-
-

{% trans %}Club account:{% endtrans %} {{ object.name }}

- {% if user.is_root and not object.journals.exists() %} - {% trans %}Delete{% endtrans %} - {% endif %} - {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} -

{% trans %}New label{% endtrans %}

- {% endif %} -

{% trans %}Label list{% endtrans %}

- {% if not object.has_open_journal() %} -

{% trans %}New journal{% endtrans %}

- {% else %} -

{% trans %}You can not create new journal while you still have one opened{% endtrans %}

- {% endif %} - - - - - - - - - - - - - - {% for j in object.journals.all() %} - - - - {% if j.end_date %} - - {% else %} - - {% endif %} - - - {% if j.closed %} - - {% else %} - - {% endif %} - - - {% endfor %} - -
{% trans %}Name{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Effective amount{% endtrans %}{% trans %}Closed{% endtrans %}{% trans %}Actions{% endtrans %}
{{ j.name }}{{ j.start_date }}{{ j.end_date }} - {{ j.amount }} €{{ j.effective_amount }} €{% trans %}Yes{% endtrans %}{% trans %}No{% endtrans %} {% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %} - {% trans %}Delete{% endtrans %} - {% endif %} -
-
+
+

+ {% trans %}Accounting{% endtrans %} > + {{object.bank_account }} > + {{ object }} +

+
+

{% trans %}Club account:{% endtrans %} {{ object.name }}

+ {% if user.is_root and not object.journals.exists() %} + {% trans %}Delete{% endtrans %} + {% endif %} + {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} +

{% trans %}New label{% endtrans %}

+ {% endif %} +

{% trans %}Label list{% endtrans %}

+ {% if not object.has_open_journal() %} +

{% trans %}New journal{% endtrans %}

+ {% else %} +

{% trans %}You can not create new journal while you still have one opened{% endtrans %}

+ {% endif %} + + + + + + + + + + + + + + {% for j in object.journals.all() %} + + + + {% if j.end_date %} + + {% else %} + + {% endif %} + + + {% if j.closed %} + + {% else %} + + {% endif %} + + + {% endfor %} + +
{% trans %}Name{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Effective amount{% endtrans %}{% trans %}Closed{% endtrans %}{% trans %}Actions{% endtrans %}
{{ j.name }}{{ j.start_date }}{{ j.end_date }} - {{ j.amount }} €{{ j.effective_amount }} €{% trans %}Yes{% endtrans %}{% trans %}No{% endtrans %} {% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %} + {% trans %}Delete{% endtrans %} + {% endif %} +
+
{% endblock %} diff --git a/accounting/templates/accounting/co_list.jinja b/accounting/templates/accounting/co_list.jinja index 0cca32c6..1d357820 100644 --- a/accounting/templates/accounting/co_list.jinja +++ b/accounting/templates/accounting/co_list.jinja @@ -1,30 +1,30 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Company list{% endtrans %} + {% trans %}Company list{% endtrans %} {% endblock %} {% block content %} -
- {% if user.is_root - or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) - %} -

{% trans %}Create new company{% endtrans %}

- {% endif %} -
- - - - - - - - {% for o in object_list %} - - - - {% endfor %} - -
{% trans %}Companies{% endtrans %}
{{ o.get_display_name() }}
-
+
+ {% if user.is_root + or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) + %} +

{% trans %}Create new company{% endtrans %}

+{% endif %} +
+ + + + + + + + {% for o in object_list %} + + + + {% endfor %} + +
{% trans %}Companies{% endtrans %}
{{ o.get_display_name() }}
+
{% endblock %} diff --git a/accounting/templates/accounting/journal_details.jinja b/accounting/templates/accounting/journal_details.jinja index 274e678f..8393ca8b 100644 --- a/accounting/templates/accounting/journal_details.jinja +++ b/accounting/templates/accounting/journal_details.jinja @@ -1,103 +1,103 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}General journal:{% endtrans %} {{ object.name }} + {% trans %}General journal:{% endtrans %} {{ object.name }} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {{object.club_account.bank_account }} > - {{ object.club_account }} > - {{ object.name }} -

-
-

{% trans %}General journal:{% endtrans %} {{ object.name }}

-

{% trans %}New label{% endtrans %}

-

{% trans %}Label list{% endtrans %}

-

{% trans %}Company list{% endtrans %}

-

{% trans %}Amount: {% endtrans %}{{ object.amount }} € - - {% trans %}Effective amount: {% endtrans %}{{ object.effective_amount }} €

- {% if object.closed %} -

{% trans %}Journal is closed, you can not create operation{% endtrans %}

- {% else %} -

{% trans %}New operation{% endtrans %}

-
- {% endif %} -
- - +
+

+ {% trans %}Accounting{% endtrans %} > + {{object.club_account.bank_account }} > + {{ object.club_account }} > + {{ object.name }} +

+
+

{% trans %}General journal:{% endtrans %} {{ object.name }}

+

{% trans %}New label{% endtrans %}

+

{% trans %}Label list{% endtrans %}

+

{% trans %}Company list{% endtrans %}

+

{% trans %}Amount: {% endtrans %}{{ object.amount }} € - + {% trans %}Effective amount: {% endtrans %}{{ object.effective_amount }} €

+ {% if object.closed %} +

{% trans %}Journal is closed, you can not create operation{% endtrans %}

+ {% else %} +

{% trans %}New operation{% endtrans %}

+
+ {% endif %} +
+
+ + + + + + + + + + + + + + + + + + + {% for o in object.operations.all() %} - - - - - - - - - - - - - - - - - {% for o in object.operations.all() %} - - - - - {% if o.accounting_type.movement_type == "DEBIT" %} - - {% else %} - - {% endif %} - - {% if o.target_type == "OTHER" %} + + + + {% if o.accounting_type.movement_type == "DEBIT" %} + + {% else %} + + {% endif %} + + {% if o.target_type == "OTHER" %} - {% else %} + {% else %} - {% endif %} - - - {% if o.done %} + {% endif %} + + + {% if o.done %} - {% else %} + {% else %} - {% endif %} - - {% if o.invoice %} + + {% if o.invoice %} - {% else %} + {% else %} + {% endif %} + - - - {% endfor %} - -
{% trans %}Nb{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Label{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Payment mode{% endtrans %}{% trans %}Target{% endtrans %}{% trans %}Code{% endtrans %}{% trans %}Nature{% endtrans %}{% trans %}Done{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}File{% endtrans %}{% trans %}Actions{% endtrans %}{% trans %}PDF{% endtrans %}
{% trans %}Nb{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Label{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Payment mode{% endtrans %}{% trans %}Target{% endtrans %}{% trans %}Code{% endtrans %}{% trans %}Nature{% endtrans %}{% trans %}Done{% endtrans %}{% trans %}Comment{% endtrans %}{% trans %}File{% endtrans %}{% trans %}Actions{% endtrans %}{% trans %}PDF{% endtrans %}
{{ o.number }}{{ o.date }}{{ o.label or "" }} {{ o.amount }} € {{ o.amount }} €{{ o.get_mode_display() }}{{ o.number }}{{ o.date }}{{ o.label or "" }} {{ o.amount }} € {{ o.amount }} €{{ o.get_mode_display() }}{{ o.target_label }}{{ o.target.get_display_name() }}{{ o.accounting_type.code }}{{ o.accounting_type.label }}{{ o.accounting_type.code }}{{ o.accounting_type.label }}{% trans %}Yes{% endtrans %}{% trans %}No{% endtrans %}{{ o.remark }} + {% endif %} + {{ o.remark }} {% if not o.linked_operation and o.target_type == "ACCOUNT" and not o.target.has_open_journal() %} -

- {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %} -

-

- {% trans url=o.target.get_absolute_url() %}Open a journal in this club account, then save this operation again to make the linked operation.{% endtrans %} -

+

+ {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %} +

+

+ {% trans url=o.target.get_absolute_url() %}Open a journal in this club account, then save this operation again to make the linked operation.{% endtrans %} +

{% endif %} - 		{{ o.invoice.name }}- + {% + if o.journal.club_account.bank_account.name not in ["AE TI", "TI"] + or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) + %} + {% if not o.journal.closed %} + {% trans %}Edit{% endtrans %} {% endif %} - - {% - if o.journal.club_account.bank_account.name not in ["AE TI", "TI"] - or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) - %} - {% if not o.journal.closed %} - {% trans %}Edit{% endtrans %} - {% endif %} - {% endif %} - {% trans %}Generate{% endtrans %}
-
-
+ {% endif %} + + {% trans %}Generate{% endtrans %} + +{% endfor %} + + +
+
{% endblock %} diff --git a/accounting/templates/accounting/journal_statement_accounting.jinja b/accounting/templates/accounting/journal_statement_accounting.jinja index 0661bbcf..5641e78b 100644 --- a/accounting/templates/accounting/journal_statement_accounting.jinja +++ b/accounting/templates/accounting/journal_statement_accounting.jinja @@ -1,33 +1,33 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}General journal:{% endtrans %} {{ object.name }} + {% trans %}General journal:{% endtrans %} {{ object.name }} {% endblock %} {% block content %} -
+

{% trans %}Accounting statement: {% endtrans %} {{ object.name }}

- - - - - - - - {% for k,v in statement.items() %} - - - - - {% endfor %} - + + + + + + + + {% for k,v in statement.items() %} + + + + + {% endfor %} +
{% trans %}Operation type{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}
{% trans %}Operation type{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}

{% trans %}Amount: {% endtrans %}{{ "%.2f" % object.amount }} €

{% trans %}Effective amount: {% endtrans %}{{ "%.2f" %object.effective_amount }} €

-
+
{% endblock %} diff --git a/accounting/templates/accounting/journal_statement_nature.jinja b/accounting/templates/accounting/journal_statement_nature.jinja index a3aa1567..0a149326 100644 --- a/accounting/templates/accounting/journal_statement_nature.jinja +++ b/accounting/templates/accounting/journal_statement_nature.jinja @@ -1,57 +1,57 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}General journal:{% endtrans %} {{ object.name }} + {% trans %}General journal:{% endtrans %} {{ object.name }} {% endblock %} {% macro display_tables(dict) %} -
+
{% trans %}Credit{% endtrans %}
- - - - - - - - {% for k,v in dict['CREDIT'].items() %} - - - - - {% endfor %} - + + + + + + + + {% for k,v in dict['CREDIT'].items() %} + + + + + {% endfor %} +
{% trans %}Nature of operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}
{% trans %}Nature of operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}
{% trans %}Total: {% endtrans %}{{ "%.2f" % dict['CREDIT_sum'] }}
{% trans %}Debit{% endtrans %}
- - - - - - - - {% for k,v in dict['DEBIT'].items() %} - - - - - {% endfor %} - + + + + + + + + {% for k,v in dict['DEBIT'].items() %} + + + + + {% endfor %} +
{% trans %}Nature of operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}
{% trans %}Nature of operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ k }}{{ "%.2f" % v }}
{% trans %}Total: {% endtrans %}{{ "%.2f" % dict['DEBIT_sum'] }} - {% endmacro %} +{% endmacro %} - {% block content %} -

{% trans %}Statement by nature: {% endtrans %} {{ object.name }}

+{% block content %} +

{% trans %}Statement by nature: {% endtrans %} {{ object.name }}

- {% for k,v in statement.items() %} -

{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}

+ {% for k,v in statement.items() %} +

{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}

{{ display_tables(v) }}
- {% endfor %} -
+ {% endfor %} +
{% endblock %} diff --git a/accounting/templates/accounting/journal_statement_person.jinja b/accounting/templates/accounting/journal_statement_person.jinja index 9a88e73f..76482647 100644 --- a/accounting/templates/accounting/journal_statement_person.jinja +++ b/accounting/templates/accounting/journal_statement_person.jinja @@ -1,37 +1,37 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}General journal:{% endtrans %} {{ object.name }} + {% trans %}General journal:{% endtrans %} {{ object.name }} {% endblock %} {% block content %} -
+

{% trans %}Statement by person: {% endtrans %} {{ object.name }}

{% trans %}Credit{% endtrans %}

- - - - - - - - {% for key in credit_statement.keys() %} - - {% if key.target_type == "OTHER" %} - - {% elif key %} - - {% else %} - - {% endif %} - - - {% endfor %} - + + + + + + + + {% for key in credit_statement.keys() %} + + {% if key.target_type == "OTHER" %} + + {% elif key %} + + {% else %} + + {% endif %} + + + {% endfor %} +
{% trans %}Target of the operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ o.target_label }}{{ key.get_display_name() }}{{ "%.2f" % credit_statement[key] }}
{% trans %}Target of the operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ o.target_label }}{{ key.get_display_name() }}{{ "%.2f" % credit_statement[key] }}
@@ -40,29 +40,29 @@

{% trans %}Debit{% endtrans %}

- - - - - - - - {% for key in debit_statement.keys() %} - - {% if key.target_type == "OTHER" %} - - {% elif key %} - - {% else %} - - {% endif %} - - - {% endfor %} - + + + + + + + + {% for key in debit_statement.keys() %} + + {% if key.target_type == "OTHER" %} + + {% elif key %} + + {% else %} + + {% endif %} + + + {% endfor %} +
{% trans %}Target of the operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ o.target_label }}{{ key.get_display_name() }}{{ "%.2f" % debit_statement[key] }}
{% trans %}Target of the operation{% endtrans %}{% trans %}Sum{% endtrans %}
{{ o.target_label }}{{ key.get_display_name() }}{{ "%.2f" % debit_statement[key] }}

Total : {{ "%.2f" % total_debit }}

-
+
{% endblock %} diff --git a/accounting/templates/accounting/label_list.jinja b/accounting/templates/accounting/label_list.jinja index c15a9373..6b5a9b8b 100644 --- a/accounting/templates/accounting/label_list.jinja +++ b/accounting/templates/accounting/label_list.jinja @@ -1,36 +1,36 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Label list{% endtrans %} + {% trans %}Label list{% endtrans %} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {{object.bank_account }} > - {{ object }} -

-
-

{% trans %}Back to club account{% endtrans %}

- {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %} -

{% trans %}New label{% endtrans %}

- {% endif %} - {% if object.labels.all() %} -

{% trans %}Label list{% endtrans %}

- + {% else %} + {% trans %}There is no label in this club account.{% endtrans %} + {% endif %} +
{% endblock %} diff --git a/accounting/templates/accounting/operation_edit.jinja b/accounting/templates/accounting/operation_edit.jinja index 33348968..e8c34364 100644 --- a/accounting/templates/accounting/operation_edit.jinja +++ b/accounting/templates/accounting/operation_edit.jinja @@ -1,123 +1,123 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Edit operation{% endtrans %} + {% trans %}Edit operation{% endtrans %} {% endblock %} {% block content %} -
+

- {% trans %}Accounting{% endtrans %} > - {{object.club_account.bank_account }} > - {{ object.club_account }} > - {{ object.name }} > - {% trans %}Edit operation{% endtrans %} + {% trans %}Accounting{% endtrans %} > + {{object.club_account.bank_account }} > + {{ object.club_account }} > + {{ object.name }} > + {% trans %}Edit operation{% endtrans %}

{% trans %}Edit operation{% endtrans %}

- {% csrf_token %} - {{ form.non_field_errors() }} - {{ form.journal }} - {{ form.target_id }} -

{{ form.amount.errors }} {{ form.amount }}

-

{{ form.remark.errors }} {{ form.remark }}

-
- {% trans %}Warning: if you select Account, the opposite operation will be created in the target account. If you don't want that, select Club instead of Account.{% endtrans %} -

{{ form.target_type.errors }} {{ form.target_type }}

- {{ form.user }} - {{ form.club }} - {{ form.club_account }} - {{ form.company }} - {{ form.target_label }} - {{ form.need_link }} -

{{ form.date.errors }} {{ form.date }}

-

{{ form.mode.errors }} {{ form.mode }}

-

{{ form.cheque_number.errors }} {{ + {% csrf_token %} + {{ form.non_field_errors() }} + {{ form.journal }} + {{ form.target_id }} +

{{ form.amount.errors }} {{ form.amount }}

+

{{ form.remark.errors }} {{ form.remark }}

+
+ {% trans %}Warning: if you select Account, the opposite operation will be created in the target account. If you don't want that, select Club instead of Account.{% endtrans %} +

{{ form.target_type.errors }} {{ form.target_type }}

+ {{ form.user }} + {{ form.club }} + {{ form.club_account }} + {{ form.company }} + {{ form.target_label }} + {{ form.need_link }} +

{{ form.date.errors }} {{ form.date }}

+

{{ form.mode.errors }} {{ form.mode }}

+

{{ form.cheque_number.errors }} {{ form.cheque_number }}

-

{{ form.invoice.errors }} {{ form.invoice }}

-

{{ form.simpleaccounting_type.errors }} {{ form.simpleaccounting_type }}

-

{{ form.accounting_type.errors }} {{ +

{{ form.invoice.errors }} {{ form.invoice }}

+

{{ form.simpleaccounting_type.errors }} {{ form.simpleaccounting_type }}

+

{{ form.accounting_type.errors }} {{ form.accounting_type }}

-

{{ form.label.errors }} {{ form.label }}

-

{{ form.done.errors }} {{ form.done }}

- {% if form.instance.linked_operation %} +

{{ form.label.errors }} {{ form.label }}

+

{{ form.done.errors }} {{ form.done }}

+ {% if form.instance.linked_operation %} {% set obj = form.instance.linked_operation %}

{% trans %}Linked operation:{% endtrans %}
- - {{obj.journal.club_account.bank_account }} > - {{ obj.journal.club_account }} > - {{ obj.journal }} > - n°{{ obj.number }} + + {{obj.journal.club_account.bank_account }} > + {{ obj.journal.club_account }} > + {{ obj.journal }} > + n°{{ obj.number }}

- {% endif %} -

+ {% endif %} +

- {% endblock %} +{% endblock %} - {% block script %} - {{ super() }} - -
+ var target_type = $('#id_target_type'); + var user = $('#id_user_wrapper'); + var club = $('#id_club_wrapper'); + var club_account = $('#id_club_account_wrapper'); + var company = $('#id_company_wrapper'); + var other = $('#id_target_label'); + var need_link = $('#id_need_link_full'); + function update_targets () { + if (target_type.val() == "USER") { + console.log(user); + user.show(); + club.hide(); + club_account.hide(); + company.hide(); + other.hide(); + need_link.hide(); + } else if (target_type.val() == "ACCOUNT") { + club_account.show(); + need_link.show(); + user.hide(); + club.hide(); + company.hide(); + other.hide(); + } else if (target_type.val() == "CLUB") { + club.show(); + user.hide(); + club_account.hide(); + company.hide(); + other.hide(); + need_link.hide(); + } else if (target_type.val() == "COMPANY") { + company.show(); + user.hide(); + club_account.hide(); + club.hide(); + other.hide(); + need_link.hide(); + } else if (target_type.val() == "OTHER") { + other.show(); + user.hide(); + club.hide(); + club_account.hide(); + company.hide(); + need_link.hide(); + } else { + company.hide(); + user.hide(); + club_account.hide(); + club.hide(); + other.hide(); + need_link.hide(); + } + } + update_targets(); + target_type.change(update_targets); + } ); + +
{% endblock %} diff --git a/accounting/templates/accounting/refound_account.jinja b/accounting/templates/accounting/refound_account.jinja index 2987c04b..9e726a24 100644 --- a/accounting/templates/accounting/refound_account.jinja +++ b/accounting/templates/accounting/refound_account.jinja @@ -1,16 +1,16 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Refound account{% endtrans %} + {% trans %}Refound account{% endtrans %} {% endblock %} {% block content %} -
-

{% trans %}Refound account{% endtrans %}

-
- {% csrf_token %} - {{ form.as_p() }} -

-
-
+
+

{% trans %}Refound account{% endtrans %}

+
+ {% csrf_token %} + {{ form.as_p() }} +

+
+
{% endblock %} \ No newline at end of file diff --git a/accounting/templates/accounting/simplifiedaccountingtype_list.jinja b/accounting/templates/accounting/simplifiedaccountingtype_list.jinja index 8e6bbc85..da72a370 100644 --- a/accounting/templates/accounting/simplifiedaccountingtype_list.jinja +++ b/accounting/templates/accounting/simplifiedaccountingtype_list.jinja @@ -1,27 +1,27 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Simplified type list{% endtrans %} + {% trans %}Simplified type list{% endtrans %} {% endblock %} {% block content %} -
-

- {% trans %}Accounting{% endtrans %} > - {% trans %}Simplified types{% endtrans %} -

-
-

{% trans %}New simplified type{% endtrans %}

- {% if simplifiedaccountingtype_list %} -

{% trans %}Simplified type list{% endtrans %}

-
    - {% for a in simplifiedaccountingtype_list %} -
  • {{ a }}
    • - {% endfor %} -
- {% else %} - {% trans %}There is no types in this website.{% endtrans %} - {% endif %} -
+
+

+ {% trans %}Accounting{% endtrans %} > + {% trans %}Simplified types{% endtrans %} +

+
+

{% trans %}New simplified type{% endtrans %}

+ {% if simplifiedaccountingtype_list %} +

{% trans %}Simplified type list{% endtrans %}

+
    + {% for a in simplifiedaccountingtype_list %} +
  • {{ a }}
    • + {% endfor %} +
+ {% else %} + {% trans %}There is no types in this website.{% endtrans %} + {% endif %} +
{% endblock %} diff --git a/accounting/tests.py b/accounting/tests.py index 610a574d..3630c0e2 100644 --- a/accounting/tests.py +++ b/accounting/tests.py @@ -264,33 +264,26 @@ class TestOperation(TestCase): ) self.assertContains(response, "Total : 5575.72", status_code=200) self.assertContains(response, "Total : 71.42") - self.assertContains( - response, - """ - S' Kia - - 3.00""", + content = response.content.decode() + self.assertInHTML( + """S' Kia3.00""", content ) - self.assertContains( - response, - """ - S' Kia - - 823.00""", + self.assertInHTML( + """S' Kia823.00""", content ) def test_accounting_statement(self): response = self.client.get( reverse("accounting:journal_accounting_statement", args=[self.journal.id]) ) - self.assertContains( - response, + assert response.status_code == 200 + self.assertInHTML( """ 443 - Crédit - Ce code n'existe pas 3.00 """, - status_code=200, + response.content.decode(), ) self.assertContains( response, diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja index 6dbb62b2..42e93b81 100644 --- a/club/templates/club/club_detail.jinja +++ b/club/templates/club/club_detail.jinja @@ -2,16 +2,16 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block content %} -
- {% if club.logo %} - - {% endif %} - {% if page_revision %} - {{ page_revision|markdown }} - {% else %} -

{% trans %}Club{% endtrans %}

- {% endif %} -
+
+ {% if club.logo %} + + {% endif %} + {% if page_revision %} + {{ page_revision|markdown }} + {% else %} +

{% trans %}Club{% endtrans %}

+ {% endif %} +
{% endblock %} diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja index ba875c89..f914803e 100644 --- a/club/templates/club/club_list.jinja +++ b/club/templates/club/club_list.jinja @@ -1,48 +1,48 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Club list{% endtrans %} + {% trans %}Club list{% endtrans %} {% endblock %} {% macro display_club(club) -%} - {% if club.is_active or user.is_root %} - -
  • {{ club.name }} - - {% if not club.is_active %} - ({% trans %}inactive{% endtrans %}) - {% endif %} + {% if club.is_active or user.is_root %} - {% if club.president %} - {{ club.president.user }}{% endif %} - {% if club.short_description %}

    {{ club.short_description|markdown }}

    {% endif %} - - {% endif %} +
  • {{ club.name }} - {%- if club.children.all()|length != 0 %} -
      - {%- for c in club.children.order_by('name') %} - {{ display_club(c) }} - {%- endfor %} -
    - {%- endif -%} -
    • + {% if not club.is_active %} + ({% trans %}inactive{% endtrans %}) + {% endif %} + + {% if club.president %} - {{ club.president.user }}{% endif %} + {% if club.short_description %}

    {{ club.short_description|markdown }}

    {% endif %} + + {% endif %} + + {%- if club.children.all()|length != 0 %} +
      + {%- for c in club.children.order_by('name') %} + {{ display_club(c) }} + {%- endfor %} +
    + {%- endif -%} + {%- endmacro %} {% block content %} - {% if user.is_root %} + {% if user.is_root %}

    {% trans %}New club{% endtrans %}

    - {% endif %} - {% if club_list %} + {% endif %} + {% if club_list %}

    {% trans %}Club list{% endtrans %}

      - {%- for c in club_list.all().order_by('name') if c.parent is none %} + {%- for c in club_list.all().order_by('name') if c.parent is none %} {{ display_club(c) }} - {%- endfor %} + {%- endfor %}
    - {% else %} + {% else %} {% trans %}There is no club in this website.{% endtrans %} - {% endif %} + {% endif %} {% endblock %} diff --git a/club/templates/club/club_members.jinja b/club/templates/club/club_members.jinja index 817b0170..a64d43ce 100644 --- a/club/templates/club/club_members.jinja +++ b/club/templates/club/club_members.jinja @@ -2,81 +2,81 @@ {% from 'core/macros.jinja' import user_profile_link, select_all_checkbox %} {% block content %} -

    {% trans %}Club members{% endtrans %}

    - {% if members %} +

    {% trans %}Club members{% endtrans %}

    + {% if members %}
    - {% csrf_token %} - {% set users_old = dict(form.users_old | groupby("choice_label")) %} - {% if users_old %} - {{ select_all_checkbox("users_old") }} -

    - {% endif %} - - - - - - - - {% if users_old %} - - {% endif %} - - - - {% for m in members %} - - - - - - {% if users_old %} - - {% endif %} - - {% endfor %} - -
    {% trans %}User{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}Since{% endtrans %}{% trans %}Mark as old{% endtrans %}
    {{ user_profile_link(m.user) }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }} - {% set user_old = users_old[m.user.get_display_name()] %} - {% if user_old %} - {{ user_old[0].tag() }} - {% endif %} -
    - {{ form.users_old.errors }} - {% if users_old %} -

    - - {% endif %} + {% csrf_token %} + {% set users_old = dict(form.users_old | groupby("choice_label")) %} + {% if users_old %} + {{ select_all_checkbox("users_old") }} +

    + {% endif %} + + + + + + + + {% if users_old %} + + {% endif %} + + + + {% for m in members %} + + + + + + {% if users_old %} + + {% endif %} + + {% endfor %} + +
    {% trans %}User{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}Since{% endtrans %}{% trans %}Mark as old{% endtrans %}
    {{ user_profile_link(m.user) }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }} + {% set user_old = users_old[m.user.get_display_name()] %} + {% if user_old %} + {{ user_old[0].tag() }} + {% endif %} +
    + {{ form.users_old.errors }} + {% if users_old %} +

    + + {% endif %}
    - {% else %} + {% else %}

    {% trans %}There are no members in this club.{% endtrans %}

    + {% endif %} +
    + {% csrf_token %} + {{ form.non_field_errors() }} +

    + {{ form.users.errors }} + + {{ form.users }} + {{ form.users.help_text }} +

    +

    + {{ form.role.errors }} + + {{ form.role }} +

    + {% if form.start_date %} +

    + {{ form.start_date.errors }} + + {{ form.start_date }} +

    {% endif %} - - {% csrf_token %} - {{ form.non_field_errors() }} -

    - {{ form.users.errors }} - - {{ form.users }} - {{ form.users.help_text }} -

    -

    - {{ form.role.errors }} - - {{ form.role }} -

    - {% if form.start_date %} -

    - {{ form.start_date.errors }} - - {{ form.start_date }} -

    - {% endif %} -

    - {{ form.description.errors }} - - {{ form.description }} -

    -

    -
    +

    + {{ form.description.errors }} + + {{ form.description }} +

    +

    + {% endblock %} diff --git a/club/templates/club/club_old_members.jinja b/club/templates/club/club_old_members.jinja index 4d024df6..887da079 100644 --- a/club/templates/club/club_old_members.jinja +++ b/club/templates/club/club_old_members.jinja @@ -2,27 +2,27 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block content %} -

    {% trans %}Club old members{% endtrans %}

    - - - - - - - - - - {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %} - - - - - - - - {% endfor %} - -
    {% trans %}User{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}
    {{ user_profile_link(m.user) }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{{ m.end_date }}
    +

    {% trans %}Club old members{% endtrans %}

    + + + + + + + + + + {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %} + + + + + + + + {% endfor %} + +
    {% trans %}User{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}
    {{ user_profile_link(m.user) }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{{ m.end_date }}
    {% endblock %} diff --git a/club/templates/club/club_sellings.jinja b/club/templates/club/club_sellings.jinja index 6fdee86a..191d5fb2 100644 --- a/club/templates/club/club_sellings.jinja +++ b/club/templates/club/club_sellings.jinja @@ -2,65 +2,65 @@ {% from 'core/macros.jinja' import user_profile_link, paginate %} {% block content %} -

    {% trans %}Sales{% endtrans %}

    -
    +

    {% trans %}Sales{% endtrans %}

    + {% csrf_token %} {{ form }}

    -
    -

    -{% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}
    -{% trans %}Total: {% endtrans %}{{ total }} €
    -{% trans %}Benefit: {% endtrans %}{{ benefit }} € -

    - + +

    + {% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}
    + {% trans %}Total: {% endtrans %}{{ total }} €
    + {% trans %}Benefit: {% endtrans %}{{ benefit }} € +

    +
    - - - - - - - - - - + + + + + + + + + + - {% for s in paginated_result %} + {% for s in paginated_result %} - - - {% if s.seller %} + + + {% if s.seller %} - {% else %} + {% else %} - {% endif %} - {% if s.customer %} + {% endif %} + {% if s.customer %} - {% else %} + {% else %} - {% endif %} - - - - - {% if s.is_owned_by(user) %} - - {% endif %} + {% endif %} + + + + + {% if s.is_owned_by(user) %} + + {% endif %} - {% endfor %} + {% endfor %} -
    {% trans %}Date{% endtrans %}{% trans %}Counter{% endtrans %}{% trans %}Barman{% endtrans %}{% trans %}Customer{% endtrans %}{% trans %}Label{% endtrans %}{% trans %}Quantity{% endtrans %}{% trans %}Total{% endtrans %}{% trans %}Payment method{% endtrans %}
    {% trans %}Date{% endtrans %}{% trans %}Counter{% endtrans %}{% trans %}Barman{% endtrans %}{% trans %}Customer{% endtrans %}{% trans %}Label{% endtrans %}{% trans %}Quantity{% endtrans %}{% trans %}Total{% endtrans %}{% trans %}Payment method{% endtrans %}
    {{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}{{ s.counter }}{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}{{ s.counter }}{{ s.seller.get_display_name() }}{{ s.customer.user.get_display_name() }}{{ s.label }}{{ s.quantity }}{{ s.quantity * s.unit_price }} €{{ s.get_payment_method_display() }}{% trans %}Delete{% endtrans %}{{ s.label }}{{ s.quantity }}{{ s.quantity * s.unit_price }} €{{ s.get_payment_method_display() }}{% trans %}Delete{% endtrans %}
    - -{{ paginate(paginated_result, paginator, "formPagination(this)") }} + + {{ paginate(paginated_result, paginator, "formPagination(this)") }} {% endblock %} diff --git a/club/templates/club/club_tools.jinja b/club/templates/club/club_tools.jinja index 49e2b0df..fa9584fa 100644 --- a/club/templates/club/club_tools.jinja +++ b/club/templates/club/club_tools.jinja @@ -1,46 +1,46 @@ {% extends "core/base.jinja" %} {% block content %} -

    {% trans %}Club tools{% endtrans %}

    -
    +

    {% trans %}Club tools{% endtrans %}

    +

    {% trans %}Communication:{% endtrans %}

    {% trans %}Counters:{% endtrans %}

      - {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %} - {% for l in Launderette.objects.all() %} -
    • {{ l }}
      • - {% endfor %} - {% elif object.counters.filter(type="OFFICE")|count > 0 %} + {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %} + {% for l in Launderette.objects.all() %} +
    • {{ l }}
      • + {% endfor %} + {% elif object.counters.filter(type="OFFICE")|count > 0 %} {% for c in object.counters.filter(type="OFFICE") %} -
    • {{ c }}: +
    • {{ c }}: View Edit -
      • + {% endfor %} - {% endif %} + {% endif %}
    {% if object.club_account.exists() %} -

    {% trans %}Accounting: {% endtrans %}

    - {% endif %} {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %} -
  • {% trans %}Manage launderettes{% endtrans %}
    • +
  • {% trans %}Manage launderettes{% endtrans %}
    • {% endif %} -
    +
    {% endblock %} diff --git a/club/templates/club/mailing.jinja b/club/templates/club/mailing.jinja index 8a364295..a7421602 100644 --- a/club/templates/club/mailing.jinja +++ b/club/templates/club/mailing.jinja @@ -2,107 +2,107 @@ {% from 'core/macros.jinja' import select_all_checkbox %} {% block title %} -{% trans %}Mailing lists{% endtrans %} + {% trans %}Mailing lists{% endtrans %} {% endblock %} {% block content %} - {% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %} + {% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %} - {% if mailings_not_moderated %} -

    {% trans %}Mailing lists waiting for moderation{% endtrans %}

    - - {% endif %} + {% if mailings_not_moderated %} +

    {% trans %}Mailing lists waiting for moderation{% endtrans %}

    + + {% endif %} - {% if mailings_moderated %} + {% if mailings_moderated %} {% for mailing in mailings_moderated %} -

    {% trans %}Mailing{% endtrans %} {{ mailing.email_full }} +

    {% trans %}Mailing{% endtrans %} {{ mailing.email_full }} {%- if user.is_owner(mailing) -%} - - {% trans %}Delete{% endtrans %} + - {% trans %}Delete{% endtrans %} {%- endif -%} -

    -
    + + -
    - {% set form_mailing_removal = form["removal_" + mailing.id|string] %} - {% if form_mailing_removal.field.choices %} - {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %} -
    -

    {{ select_all_checkbox(form_mailing_removal.auto_id) }}

    - {% csrf_token %} - - + + {% set form_mailing_removal = form["removal_" + mailing.id|string] %} + {% if form_mailing_removal.field.choices %} + {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %} + +

    {{ select_all_checkbox(form_mailing_removal.auto_id) }}

    + {% csrf_token %} + +
    - - - - - + + + + + - {% for widget in form_mailing_removal.subwidgets %} + {% for widget in form_mailing_removal.subwidgets %} {% set user = ms[widget.data.value.value][0] %} - - - + + + - {% endfor %} + {% endfor %} -
    {% trans %}User{% endtrans %}{% trans %}Email{% endtrans %}{% trans %}Delete{% endtrans %}
    {% trans %}User{% endtrans %}{% trans %}Email{% endtrans %}{% trans %}Delete{% endtrans %}
    {{ user.get_username }}{{ user.get_email }}{{ widget.tag() }}{{ user.get_username }}{{ user.get_email }}{{ widget.tag() }}
    - {{ form_mailing_removal.errors }} -

    - + + {{ form_mailing_removal.errors }} +

    + - {% else %} + {% else %}

    {% trans %}There is no subscriber for this mailing list{% endtrans %}

    - {% endif %} + {% endif %} {% endfor %} - {% else %} + {% else %}

    {% trans %}No mailing list existing for this club{% endtrans %}

    - {% endif %} + {% endif %} -

    {{ form.non_field_errors() }}

    - {% if mailings_moderated %} -

    {% trans %}New member{% endtrans %}

    -
    - {% csrf_token %} -

    - {{ form.subscription_mailing.errors }} - - {{ form.subscription_mailing }} -

    -

    - {{ form.subscription_users.errors }} - - {{ form.subscription_users }} - {{ form.subscription_users.help_text }} -

    -

    - {{ form.subscription_email.errors }} - - {{ form.subscription_email }} -

    - -

    -
    - {% endif %} - -

    {% trans %}New mailing{% endtrans %}

    +

    {{ form.non_field_errors() }}

    + {% if mailings_moderated %} +

    {% trans %}New member{% endtrans %}

    - {% csrf_token %} -

    - {{ form.mailing_email.errors }} - - {{ form.mailing_email }} -

    - -

    + {% csrf_token %} +

    + {{ form.subscription_mailing.errors }} + + {{ form.subscription_mailing }} +

    +

    + {{ form.subscription_users.errors }} + + {{ form.subscription_users }} + {{ form.subscription_users.help_text }} +

    +

    + {{ form.subscription_email.errors }} + + {{ form.subscription_email }} +

    + +

    + {% endif %} + +

    {% trans %}New mailing{% endtrans %}

    +
    + {% csrf_token %} +

    + {{ form.mailing_email.errors }} + + {{ form.mailing_email }} +

    + +

    +
    {% endblock %} diff --git a/club/templates/club/page_history.jinja b/club/templates/club/page_history.jinja index 766ef8a1..07c25146 100644 --- a/club/templates/club/page_history.jinja +++ b/club/templates/club/page_history.jinja @@ -2,11 +2,11 @@ {% from 'core/macros_pages.jinja' import page_history %} {% block content %} - {% if club.page %} - {{ page_history(club.page) }} - {% else %} - {% trans %}No page existing for this club{% endtrans %} - {% endif %} + {% if club.page %} + {{ page_history(club.page) }} + {% else %} + {% trans %}No page existing for this club{% endtrans %} + {% endif %} {% endblock %} diff --git a/club/templates/club/pagerev_edit.jinja b/club/templates/club/pagerev_edit.jinja index 91a26b4e..5253805d 100644 --- a/club/templates/club/pagerev_edit.jinja +++ b/club/templates/club/pagerev_edit.jinja @@ -2,7 +2,7 @@ {% from 'core/macros_pages.jinja' import page_edit_form %} {% block content %} -{{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }} + {{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }} {% endblock %} diff --git a/club/templates/club/stats.jinja b/club/templates/club/stats.jinja index cf6c3358..43488be0 100644 --- a/club/templates/club/stats.jinja +++ b/club/templates/club/stats.jinja @@ -1,48 +1,48 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Club stats{% endtrans %} + {% trans %}Club stats{% endtrans %} {% endblock %} {% block content %} - {% if club_list %} + {% if club_list %}

    {% trans %}Club stats{% endtrans %}

    - {% csrf_token %} -

    + {% csrf_token %} +

    -

    -

    +

    +

    - - - - - - - - + + + + + + + + {% for c in club_list.order_by('id') %} - {% set members = c.members.all() %} - {% if request.GET['branch'] %} + {% set members = c.members.all() %} + {% if request.GET['branch'] %} {% set members = members.filter(user__department=request.GET['branch']) %} - {% endif %} - - - - - + {% endif %} + + + + + {% endfor %} - +
    ClubMember numberOld member number
    ClubMember numberOld member number
    {{ c.get_display_name() }}{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}
    {{ c.get_display_name() }}{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}
    - {% else %} + {% else %} {% trans %}There is no club in this website.{% endtrans %} - {% endif %} + {% endif %} {% endblock %} diff --git a/com/templates/com/mailing_admin.jinja b/com/templates/com/mailing_admin.jinja index 75d098bc..3096e435 100644 --- a/com/templates/com/mailing_admin.jinja +++ b/com/templates/com/mailing_admin.jinja @@ -1,43 +1,43 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Mailing lists administration{% endtrans %} + {% trans %}Mailing lists administration{% endtrans %} {% endblock %} {% macro display_mailings(list) %} - - - - - - - {% for mailing in list %} - - - - - - {% endfor %} -
    {% trans %}Email{% endtrans %}{% trans %}Club{%endtrans%}{% trans %}Actions{% endtrans %}
    {{ mailing.email_full }}{{ mailing.club }} - {% trans %}Delete{% endtrans %} - {% if not mailing.is_moderated %}{% trans %}Moderate{% endtrans %}{% else %}{% trans user=mailing.moderator %}Moderated by {{ user }}{% endtrans %}{% endif %} -
    - + + + + + + + {% for mailing in list %} + + + + + + {% endfor %} +
    {% trans %}Email{% endtrans %}{% trans %}Club{%endtrans%}{% trans %}Actions{% endtrans %}
    {{ mailing.email_full }}{{ mailing.club }} + {% trans %}Delete{% endtrans %} - {% if not mailing.is_moderated %}{% trans %}Moderate{% endtrans %}{% else %}{% trans user=mailing.moderator %}Moderated by {{ user }}{% endtrans %}{% endif %} +
    + {% endmacro %} {% block content %} -

    {% trans %}This page lists all mailing lists{% endtrans %}

    +

    {% trans %}This page lists all mailing lists{% endtrans %}

    - {% if has_unmoderated %} + {% if has_unmoderated %}

    {% trans %}Not moderated mailing lists{% endtrans %}

    {{ display_mailings(unmoderated) }} - {% endif %} + {% endif %} -

    {% trans %}Moderated mailing lists{% endtrans %}

    - {% if has_moderated %} - {{ display_mailings(moderated) }} - {% else %} +

    {% trans %}Moderated mailing lists{% endtrans %}

    + {% if has_moderated %} + {{ display_mailings(moderated) }} + {% else %}

    {% trans %}No mailing list existing{% endtrans %}

    - {% endif %} + {% endif %} {% endblock %} diff --git a/com/templates/com/news_admin_list.jinja b/com/templates/com/news_admin_list.jinja index 5f7e3b1f..3214ffd5 100644 --- a/com/templates/com/news_admin_list.jinja +++ b/com/templates/com/news_admin_list.jinja @@ -2,317 +2,317 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block title %} -{% trans %}News admin{% endtrans %} + {% trans %}News admin{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}News{% endtrans %}

    +

    {% trans %}News{% endtrans %}

    -

    {% trans %}Create news{% endtrans %}

    +

    {% trans %}Create news{% endtrans %}

    -
    -

    {% trans %}Notices{% endtrans %}

    - {% set notices = object_list.filter(type="NOTICE").distinct().order_by('id') %} -
    {% trans %}Displayed notices{% endtrans %}
    - - - - - - - - - - - - - - {% for news in notices.filter(is_moderated=True) %} - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Remove{% endtrans %} - {% trans %}Delete{% endtrans %} -
    -
    {% trans %}Notices to moderate{% endtrans %}
    - - - - - - - - - - - - - {% for news in notices.filter(is_moderated=False) %} - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Moderate{% endtrans %} - {% trans %}Delete{% endtrans %} -
    +
    +

    {% trans %}Notices{% endtrans %}

    + {% set notices = object_list.filter(type="NOTICE").distinct().order_by('id') %} +
    {% trans %}Displayed notices{% endtrans %}
    + + + + + + + + + + + + + + {% for news in notices.filter(is_moderated=True) %} + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Remove{% endtrans %} + {% trans %}Delete{% endtrans %} +
    +
    {% trans %}Notices to moderate{% endtrans %}
    + + + + + + + + + + + + + {% for news in notices.filter(is_moderated=False) %} + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Moderate{% endtrans %} + {% trans %}Delete{% endtrans %} +
    -
    -

    {% trans %}Weeklies{% endtrans %}

    - {% set weeklies = object_list.filter(type="WEEKLY", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} -
    {% trans %}Displayed weeklies{% endtrans %}
    - - - - - - - - - - - - - - - {% for news in weeklies.filter(is_moderated=True) %} - - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Dates{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }} -
      - {% for d in news.dates.all() %} -
    • {{ d.start_date|localtime|date(DATETIME_FORMAT) }} - {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - - {{ d.end_date|localtime|date(DATETIME_FORMAT) }} - {{ d.end_date|localtime|time(DATETIME_FORMAT) }} -
      • - {% endfor %} -
    -     		{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Remove{% endtrans %} - {% trans %}Delete{% endtrans %} -
    -
    {% trans %}Weeklies to moderate{% endtrans %}
    - - - - - - - - - - - - - - {% for news in weeklies.filter(is_moderated=False) %} - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Dates{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }} -
      - {% for d in news.dates.all() %} -
    • {{ d.start_date|localtime|date(DATETIME_FORMAT) }} - {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - - {{ d.end_date|localtime|date(DATETIME_FORMAT) }} - {{ d.end_date|localtime|time(DATETIME_FORMAT) }} -
      • - {% endfor %} -
    -     		{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Moderate{% endtrans %} - {% trans %}Delete{% endtrans %} -
    +
    +

    {% trans %}Weeklies{% endtrans %}

    + {% set weeklies = object_list.filter(type="WEEKLY", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} +
    {% trans %}Displayed weeklies{% endtrans %}
    + + + + + + + + + + + + + + + {% for news in weeklies.filter(is_moderated=True) %} + + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Dates{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }} +
      + {% for d in news.dates.all() %} +
    • {{ d.start_date|localtime|date(DATETIME_FORMAT) }} + {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - + {{ d.end_date|localtime|date(DATETIME_FORMAT) }} + {{ d.end_date|localtime|time(DATETIME_FORMAT) }} +
      • + {% endfor %} +
    +     		{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Remove{% endtrans %} + {% trans %}Delete{% endtrans %} +
    +
    {% trans %}Weeklies to moderate{% endtrans %}
    + + + + + + + + + + + + + + {% for news in weeklies.filter(is_moderated=False) %} + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Dates{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }} +
      + {% for d in news.dates.all() %} +
    • {{ d.start_date|localtime|date(DATETIME_FORMAT) }} + {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - + {{ d.end_date|localtime|date(DATETIME_FORMAT) }} + {{ d.end_date|localtime|time(DATETIME_FORMAT) }} +
      • + {% endfor %} +
    +     		{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Moderate{% endtrans %} + {% trans %}Delete{% endtrans %} +
    -
    -

    {% trans %}Calls{% endtrans %}

    - {% set calls = object_list.filter(type="CALL", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} -
    {% trans %}Displayed calls{% endtrans %}
    - - - - - - - - - - - - - - - - {% for news in calls.filter(is_moderated=True) %} - - - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Remove{% endtrans %} - {% trans %}Delete{% endtrans %} -
    -
    {% trans %}Calls to moderate{% endtrans %}
    - - - - - - - - - - - - - - - {% for news in calls.filter(is_moderated=False) %} - - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Moderate{% endtrans %} - {% trans %}Delete{% endtrans %} -
    +
    +

    {% trans %}Calls{% endtrans %}

    + {% set calls = object_list.filter(type="CALL", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} +
    {% trans %}Displayed calls{% endtrans %}
    + + + + + + + + + + + + + + + + {% for news in calls.filter(is_moderated=True) %} + + + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Remove{% endtrans %} + {% trans %}Delete{% endtrans %} +
    +
    {% trans %}Calls to moderate{% endtrans %}
    + + + + + + + + + + + + + + + {% for news in calls.filter(is_moderated=False) %} + + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Moderate{% endtrans %} + {% trans %}Delete{% endtrans %} +
    -
    -

    {% trans %}Events{% endtrans %}

    - {% set events = object_list.filter(type="EVENT", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} -
    {% trans %}Displayed events{% endtrans %}
    - - - - - - - - - - - - - - - - {% for news in events.filter(is_moderated=True) %} - - - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Remove{% endtrans %} - {% trans %}Delete{% endtrans %} -
    -
    {% trans %}Events to moderate{% endtrans %}
    - - - - - - - - - - - - - - - {% for news in events.filter(is_moderated=False) %} - - - - - - - - - - - {% endfor %} - -
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} - {% trans %}Edit{% endtrans %} - {% trans %}Moderate{% endtrans %} - {% trans %}Delete{% endtrans %} -
    +
    +

    {% trans %}Events{% endtrans %}

    + {% set events = object_list.filter(type="EVENT", dates__end_date__gte=timezone.now()).distinct().order_by('id') %} +
    {% trans %}Displayed events{% endtrans %}
    + + + + + + + + + + + + + + + + {% for news in events.filter(is_moderated=True) %} + + + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Moderator{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ user_profile_link(news.moderator) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Remove{% endtrans %} + {% trans %}Delete{% endtrans %} +
    +
    {% trans %}Events to moderate{% endtrans %}
    + + + + + + + + + + + + + + + {% for news in events.filter(is_moderated=False) %} + + + + + + + + + + + {% endfor %} + +
    {% trans %}Type{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Summary{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Author{% endtrans %}{% trans %}Start{% endtrans %}{% trans %}End{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ news.get_type_display() }}{{ news.title }}{{ news.summary|markdown }}{{ news.club }}{{ user_profile_link(news.author) }}{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}{% trans %}View{% endtrans %} + {% trans %}Edit{% endtrans %} + {% trans %}Moderate{% endtrans %} + {% trans %}Delete{% endtrans %} +
    {% endblock %} diff --git a/com/templates/com/news_detail.jinja b/com/templates/com/news_detail.jinja index 18fc633f..cbfa596c 100644 --- a/com/templates/com/news_detail.jinja +++ b/com/templates/com/news_detail.jinja @@ -2,48 +2,48 @@ {% from 'core/macros.jinja' import user_profile_link, facebook_share, tweet, link_news_logo, gen_news_metatags %} {% block title %} -{% trans %}News{% endtrans %} - -{{ object.title }} + {% trans %}News{% endtrans %} - + {{ object.title }} {% endblock %} {% block head %} -{{ super() }} -{{ gen_news_metatags(news) }} + {{ super() }} + {{ gen_news_metatags(news) }} {% endblock %} {% block content %} -

    {% trans %}Back to news{% endtrans %}

    -
    - -

    {{ news.title }}

    -

    - {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - - {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} -

    -
    -
    {{ news.summary|markdown }}
    -
    -
    {{ news.content|markdown }}
    - {{ facebook_share(news) }} - {{ tweet(news) }} -
    +

    {% trans %}Back to news{% endtrans %}

    +
    + +

    {{ news.title }}

    +

    + {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - + {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} +

    +
    +
    {{ news.summary|markdown }}
    +
    +
    {{ news.content|markdown }}
    + {{ facebook_share(news) }} + {{ tweet(news) }} +

    {% trans %}Author: {% endtrans %}{{ user_profile_link(news.author) }}

    {% if news.moderator %} -

    {% trans %}Moderator: {% endtrans %}{{ user_profile_link(news.moderator) }}

    +

    {% trans %}Moderator: {% endtrans %}{{ user_profile_link(news.moderator) }}

    {% elif user.is_com_admin %} -

    {% trans %}Moderate{% endtrans %}

    +

    {% trans %}Moderate{% endtrans %}

    {% endif %} {% if user.can_edit(news) %} -

    {% trans %}Edit (will be moderated again){% endtrans %}

    +

    {% trans %}Edit (will be moderated again){% endtrans %}

    {% endif %} -
    -
    -
    +
    +
    +
    {% endblock %} diff --git a/com/templates/com/news_edit.jinja b/com/templates/com/news_edit.jinja index dd86f544..858ec9a8 100644 --- a/com/templates/com/news_edit.jinja +++ b/com/templates/com/news_edit.jinja @@ -2,46 +2,46 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block title %} -{% if object %} -{% trans %}Edit news{% endtrans %} -{% else %} -{% trans %}Create news{% endtrans %} -{% endif %} + {% if object %} + {% trans %}Edit news{% endtrans %} + {% else %} + {% trans %}Create news{% endtrans %} + {% endif %} {% endblock %} {% block content %} -{% if 'preview' in request.POST.keys() %} -
    -

    {{ form.instance.title }}

    -

    + {% if 'preview' in request.POST.keys() %} +

    +

    {{ form.instance.title }}

    +

    {{ form.instance.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ form.instance.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - + {{ form.instance.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - {{ form.instance.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ form.instance.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} -

    -

    {{ form.instance.club or "Club" }}

    -
    {{ form.instance.summary|markdown }}
    -
    {{ form.instance.content|markdown }}
    -

    {% trans %}Author: {% endtrans %} {{ user_profile_link(form.instance.author) }}

    -
    -{% endif %} -{% if object %} -

    {% trans %}Edit news{% endtrans %}

    -{% else %} -

    {% trans %}Create news{% endtrans %}

    -{% endif %} -
    + {{ form.instance.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} +

    +

    {{ form.instance.club or "Club" }}

    +
    {{ form.instance.summary|markdown }}
    +
    {{ form.instance.content|markdown }}
    +

    {% trans %}Author: {% endtrans %} {{ user_profile_link(form.instance.author) }}

    +
    + {% endif %} + {% if object %} +

    {% trans %}Edit news{% endtrans %}

    + {% else %} +

    {% trans %}Create news{% endtrans %}

    + {% endif %} + {% csrf_token %} {{ form.non_field_errors() }} {{ form.author }}

    {{ form.type.errors }} -

      +
      • {% trans %}Notice: Information, election result - no date{% endtrans %}
      • {% trans %}Event: punctual event, associated with one date{% endtrans %}
      • {% trans %}Weekly: recurrent event, associated with many dates (specify the first one, and a deadline){% endtrans %}
      • {% trans %}Call: long time event, associated with a long date (election appliance, ...){% endtrans %}
        • -
      - {{ form.type }}

      +
    + {{ form.type }}

    {{ form.start_date.errors }} {{ form.start_date }}

    {{ form.end_date.errors }} {{ form.end_date }}

    {{ form.until.errors }} {{ form.until }}

    @@ -50,38 +50,38 @@

    {{ form.summary.errors }} {{ form.summary }}

    {{ form.content.errors }} {{ form.content }}

    {% if user.is_com_admin %} -

    {{ form.automoderation.errors }} +

    {{ form.automoderation.errors }} {{ form.automoderation }}

    {% endif %}

    - + {% endblock %} {% block script %} - {{ super() }} - + } + update_targets(); + type.change(update_targets); + } ); + {% endblock %} diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja index ba811403..bcb0eb6e 100644 --- a/com/templates/com/news_list.jinja +++ b/com/templates/com/news_list.jinja @@ -2,162 +2,162 @@ {% from 'core/macros.jinja' import tweet_quick, fb_quick %} {% block title %} -{% trans %}News{% endtrans %} + {% trans %}News{% endtrans %} {% endblock %} {% block content %} -{% if user.is_com_admin %} - -
    -{% endif %} + {% if user.is_com_admin %} + +
    + {% endif %} -
    +
    - {% for news in object_list.filter(type="NOTICE") %} -
    -

    {{ news.title }}

    -
    {{ news.summary|markdown }}
    -
    - {% endfor %} + {% for news in object_list.filter(type="NOTICE") %} +
    +

    {{ news.title }}

    +
    {{ news.summary|markdown }}
    +
    + {% endfor %} - {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %} -
    + {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %} +
    +

    {{ news.title }}

    +
    + {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - + {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} +
    +
    {{ news.summary|markdown }}
    +
    + {% endfor %} + + {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %} +

    {% trans %}Events today and the next few days{% endtrans %}

    + {% if events_dates %} + {% for d in events_dates %} +
    +
    +
    +
    {{ d|localtime|date('D') }}
    +
    {{ d|localtime|date('d') }}
    +
    {{ d|localtime|date('b') }}
    +
    +
    +
    + {% for news in object_list.filter(dates__start_date__gte=d, + dates__start_date__lte=d+timedelta(days=1), + type="EVENT").exclude(dates__end_date__lt=timezone.now()) + .order_by('dates__start_date') %} +
    +

    {{ news.title }}

    +
    - {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - - {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}
    -
    {{ news.summary|markdown }}
    -
    +
    {{ news.summary|markdown }} +
    + {{ fb_quick(news) }} + {{ tweet_quick(news) }} +
    +
    +
    {% endfor %} - - {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %} -

    {% trans %}Events today and the next few days{% endtrans %}

    - {% if events_dates %} - {% for d in events_dates %} -
    -
    -
    -
    {{ d|localtime|date('D') }}
    -
    {{ d|localtime|date('d') }}
    -
    {{ d|localtime|date('b') }}
    -
    -
    -
    - {% for news in object_list.filter(dates__start_date__gte=d, - dates__start_date__lte=d+timedelta(days=1), - type="EVENT").exclude(dates__end_date__lt=timezone.now()) - .order_by('dates__start_date') %} -
    - -

    {{ news.title }}

    - -
    - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} -
    -
    {{ news.summary|markdown }} -
    - {{ fb_quick(news) }} - {{ tweet_quick(news) }} -
    -
    -
    - {% endfor %} -
    -
    - {% endfor %} - {% else %} -
    - {% trans %}Nothing to come...{% endtrans %} -
    - {% endif %} - - {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5), - type="EVENT").order_by('dates__start_date') %} - {% if coming_soon %} -

    {% trans %}Coming soon... don't miss!{% endtrans %}

    - {% for news in coming_soon %} -
    - {{ news.title }} - {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - - {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} - {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} -
    - {% endfor %} - {% endif %} - -

    {% trans %}All coming events{% endtrans %}

    - -
    - -
    -
    -
    {% trans %}Agenda{% endtrans %}
    -
    - {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(), - news__is_moderated=True, news__type__in=["WEEKLY", - "EVENT"]).order_by('start_date', 'end_date') %} -
    -
    - {{ d.start_date|localtime|date('D d M Y') }} -
    -
    - {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - - {{ d.end_date|localtime|time(DATETIME_FORMAT) }} -
    - -
    {{ d.news.summary|markdown }}
    -
    - {% endfor %} -
    +
    + {% endfor %} +{% else %} +
    + {% trans %}Nothing to come...{% endtrans %} +
    +{% endif %} -
    -
    {% trans %}Birthdays{% endtrans %}
    -
    - {% if user.is_subscribed %} +{% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5), +type="EVENT").order_by('dates__start_date') %} +{% if coming_soon %} +

    {% trans %}Coming soon... don't miss!{% endtrans %}

    + {% for news in coming_soon %} +
    + {{ news.title }} + {{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} - + {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }} + {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }} +
    + {% endfor %} +{% endif %} + +

    {% trans %}All coming events{% endtrans %}

    + +
    + +
    +
    +
    {% trans %}Agenda{% endtrans %}
    +
    + {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(), + news__is_moderated=True, news__type__in=["WEEKLY", + "EVENT"]).order_by('start_date', 'end_date') %} +
    +
    + {{ d.start_date|localtime|date('D d M Y') }} +
    +
    + {{ d.start_date|localtime|time(DATETIME_FORMAT) }} - + {{ d.end_date|localtime|time(DATETIME_FORMAT) }} +
    + +
    {{ d.news.summary|markdown }}
    +
    + {% endfor %} +
    +
    + +
    +
    {% trans %}Birthdays{% endtrans %}
    +
    + {% if user.is_subscribed %} {# Cache request for 1 hour #} - {% cache 3600 "birthdays" %} -
      - {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %} -
    • - {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %} - -
      • - {% endfor %} -
    - {% endcache %} - {% else %} -

    {% trans %}You need an up to date subscription to access this content{% endtrans %}

    - {% endif %} -
    -
    + {% cache 3600 "birthdays" %} +
      + {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %} +
    • + {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %} + +
      • + {% endfor %} +
    + {% endcache %} + {% else %} +

    {% trans %}You need an up to date subscription to access this content{% endtrans %}

    + {% endif %}
    +
    +
    {% endblock %} diff --git a/com/templates/com/poster_edit.jinja b/com/templates/com/poster_edit.jinja index 5e7f15cb..3c5bf39d 100644 --- a/com/templates/com/poster_edit.jinja +++ b/com/templates/com/poster_edit.jinja @@ -1,42 +1,42 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Poster{% endtrans %} + {% trans %}Poster{% endtrans %} {% endblock %} {% block content %} -
    +
    - -

    {% trans %}Posters - edit{% endtrans %}

    - + +

    {% trans %}Posters - edit{% endtrans %}

    +
    -
    - {% csrf_token %} - {{ form.as_p() }} -

    -
    +
    + {% csrf_token %} + {{ form.as_p() }} +

    +
    -
    +
    {% endblock %} diff --git a/com/templates/com/poster_list.jinja b/com/templates/com/poster_list.jinja index f752013e..9ff3add4 100644 --- a/com/templates/com/poster_list.jinja +++ b/com/templates/com/poster_list.jinja @@ -1,66 +1,66 @@ {% extends "core/base.jinja" %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} {% block title %} -{% trans %}Poster{% endtrans %} + {% trans %}Poster{% endtrans %} {% endblock %} {% block content %} -
    +
    -

    {% trans %}Posters{% endtrans %}

    - +

    {% trans %}Posters{% endtrans %}

    +
    - {% if poster_list.count() == 0 %} -
    {% trans %}No posters{% endtrans %}
    - {% else %} + {% if poster_list.count() == 0 %} +
    {% trans %}No posters{% endtrans %}
    + {% else %} - {% for poster in poster_list %} -
    -
    {{ poster.name }}
    -
    -
    -
    {{ poster.date_begin | localtime | date("d/M/Y H:m") }}
    -
    {{ poster.date_end | localtime | date("d/M/Y H:m") }}
    -
    - {% if app == "com" %} - {% trans %}Edit{% endtrans %} - {% elif app == "club" %} - {% trans %}Edit{% endtrans %} - {% endif %} -
    -
      - {% for screen in poster.screens.all() %} -
    • {{ screen }}
      • - {% endfor %} -
    -
    -
    - {% endfor %} + {% for poster in poster_list %} +
    +
    {{ poster.name }}
    +
    +
    +
    {{ poster.date_begin | localtime | date("d/M/Y H:m") }}
    +
    {{ poster.date_end | localtime | date("d/M/Y H:m") }}
    +
    + {% if app == "com" %} + {% trans %}Edit{% endtrans %} + {% elif app == "club" %} + {% trans %}Edit{% endtrans %} + {% endif %} +
    +
      + {% for screen in poster.screens.all() %} +
    • {{ screen }}
      • + {% endfor %} +
    +
    +
    + {% endfor %} - {% endif %} + {% endif %}
    -
    +
    {% endblock %} diff --git a/com/templates/com/poster_moderate.jinja b/com/templates/com/poster_moderate.jinja index d9b34082..36e3dae7 100644 --- a/com/templates/com/poster_moderate.jinja +++ b/com/templates/com/poster_moderate.jinja @@ -1,39 +1,39 @@ {% extends "core/base.jinja" %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} {% block content %} -
    +
    - -

    {% trans %}Posters - moderation{% endtrans %}

    + +

    {% trans %}Posters - moderation{% endtrans %}

    - {% if object_list.count == 0 %} -
    {% trans %}No objects{% endtrans %}
    - {% else %} + {% if object_list.count == 0 %} +
    {% trans %}No objects{% endtrans %}
    + {% else %} - {% for poster in object_list %} -
    -
    {{ poster.name }}
    -
    - Moderate -
    - {% endfor %} + {% for poster in object_list %} +
    +
    {{ poster.name }}
    +
    + Moderate +
    + {% endfor %} - {% endif %} + {% endif %}
    -
    +
    {% endblock %} diff --git a/com/templates/com/screen_edit.jinja b/com/templates/com/screen_edit.jinja index 70aa2b6c..73e13876 100644 --- a/com/templates/com/screen_edit.jinja +++ b/com/templates/com/screen_edit.jinja @@ -1,33 +1,33 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Screen{% endtrans %} + {% trans %}Screen{% endtrans %} {% endblock %} {% block content %} -
    +
    - -

    {% trans %}Screen - edit{% endtrans %}

    - + +

    {% trans %}Screen - edit{% endtrans %}

    +
    -
    - {% csrf_token %} - {{ form.as_p() }} -

    -
    +
    + {% csrf_token %} + {{ form.as_p() }} +

    +
    -
    +
    {% endblock %} diff --git a/com/templates/com/screen_list.jinja b/com/templates/com/screen_list.jinja index 27ff7354..237873d9 100644 --- a/com/templates/com/screen_list.jinja +++ b/com/templates/com/screen_list.jinja @@ -1,38 +1,38 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Screens{% endtrans %} + {% trans %}Screens{% endtrans %} {% endblock %} {% block content %} -
    +
    -

    {% trans %}Screens{% endtrans %}

    - +

    {% trans %}Screens{% endtrans %}

    +
    - {% if screen_list.count() == 0 %} -
    {% trans %}No screens{% endtrans %}
    - {% else %} + {% if screen_list.count() == 0 %} +
    {% trans %}No screens{% endtrans %}
    + {% else %} - {% for screen in screen_list %} -
    -
    {{ screen.name }}
    - {% trans %}Edit{% endtrans %} - {% trans %}Slideshow{% endtrans %} -
    - {% endfor %} + {% for screen in screen_list %} +
    +
    {{ screen.name }}
    + {% trans %}Edit{% endtrans %} + {% trans %}Slideshow{% endtrans %} +
    + {% endfor %} - {% endif %} + {% endif %}
    -
    +
    {% endblock %} diff --git a/com/templates/com/screen_slideshow.jinja b/com/templates/com/screen_slideshow.jinja index da429b6b..9e386fcf 100644 --- a/com/templates/com/screen_slideshow.jinja +++ b/com/templates/com/screen_slideshow.jinja @@ -1,30 +1,30 @@ - + {% trans %}Slideshow{% endtrans %} - - + +
    -
    +
    {% for poster in posters %} -
    - -
    +
    + +
    {% endfor %} -
    +
    -
    +
    {% for poster in posters %} -
    +
    {% endfor %} -
    +
    -
    +
    - + diff --git a/com/templates/com/weekmail.jinja b/com/templates/com/weekmail.jinja index f524fc3b..f8b37cbf 100644 --- a/com/templates/com/weekmail.jinja +++ b/com/templates/com/weekmail.jinja @@ -2,77 +2,77 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block title %} -{% trans %}Weekmail{% endtrans %} + {% trans %}Weekmail{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}Weekmail{% endtrans %} {{ object.id }}

    -

    {% trans %}Preview{% endtrans %}

    -

    {% trans %}Send{% endtrans %}

    -

    {% trans %}New article{% endtrans %}

    -

    {% trans %}Articles in no weekmail yet{% endtrans %}

    - +

    {% trans %}Weekmail{% endtrans %} {{ object.id }}

    +

    {% trans %}Preview{% endtrans %}

    +

    {% trans %}Send{% endtrans %}

    +

    {% trans %}New article{% endtrans %}

    +

    {% trans %}Articles in no weekmail yet{% endtrans %}

    +
    - - - - - - - + + + + + + + - {% for a in orphans.all() %} + {% for a in orphans.all() %} - - - - - + + + + + - {% endfor %} + {% endfor %} -
    {% trans %}Author{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Content{% endtrans %}{% trans %}Actions{% endtrans %}
    {% trans %}Author{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Content{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ user_profile_link(a.author) }}{{ a.club }}{{ a.title }}{{ a.content|markdown }} - {% trans %}Edit{% endtrans %} | - {% trans %}Delete{% endtrans %} | - {% trans %}Add to weekmail{% endtrans %} | - {% trans %}Up{% endtrans %} | - {% trans %}Down{% endtrans %} - {{ user_profile_link(a.author) }}{{ a.club }}{{ a.title }}{{ a.content|markdown }} + {% trans %}Edit{% endtrans %} | + {% trans %}Delete{% endtrans %} | + {% trans %}Add to weekmail{% endtrans %} | + {% trans %}Up{% endtrans %} | + {% trans %}Down{% endtrans %} +
    -

    {% trans %}Articles included the next weekmail{% endtrans %}

    - +
    +

    {% trans %}Articles included the next weekmail{% endtrans %}

    + - - - - - - - + + + + + + + - {% for a in object.articles.order_by('rank') %} + {% for a in object.articles.order_by('rank') %} - - - - - + + + + + - {% endfor %} + {% endfor %} -
    {% trans %}Author{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Content{% endtrans %}{% trans %}Actions{% endtrans %}
    {% trans %}Author{% endtrans %}{% trans %}Club{% endtrans %}{% trans %}Title{% endtrans %}{% trans %}Content{% endtrans %}{% trans %}Actions{% endtrans %}
    {{ user_profile_link(a.author) }}{{ a.club }}{{ a.title }}{{ a.content|markdown }} - {% trans %}Edit{% endtrans %} | - {% trans %}Delete{% endtrans %} | - {% trans %}Delete from weekmail{% endtrans %} | - {% trans %}Up{% endtrans %} | - {% trans %}Down{% endtrans %} - {{ user_profile_link(a.author) }}{{ a.club }}{{ a.title }}{{ a.content|markdown }} + {% trans %}Edit{% endtrans %} | + {% trans %}Delete{% endtrans %} | + {% trans %}Delete from weekmail{% endtrans %} | + {% trans %}Up{% endtrans %} | + {% trans %}Down{% endtrans %} +
    -
    + + {% csrf_token %} {{ form.as_p() }}

    -
    + {% endblock %} diff --git a/com/templates/com/weekmail_preview.jinja b/com/templates/com/weekmail_preview.jinja index 44c4da0a..067eb95d 100644 --- a/com/templates/com/weekmail_preview.jinja +++ b/com/templates/com/weekmail_preview.jinja @@ -2,41 +2,41 @@ {% from 'core/macros.jinja' import user_profile_link %} {% block title %} -{{ weekmail.title }} + {{ weekmail.title }} {% endblock %} {% block content %} -{% trans %}Back{% endtrans %} -{% if bad_recipients %} + {% trans %}Back{% endtrans %} + {% if bad_recipients %}

    - + {% trans %}The following recipients were refused by the SMTP:{% endtrans %} - -

      - {% for r in bad_recipients.keys() %} -
    • {{ r }}
      • - {% endfor %} -
    + +
      + {% for r in bad_recipients.keys() %} +
    • {{ r }}
      • + {% endfor %} +

    - {% csrf_token %} - + {% csrf_token %} +
    -{% else %} + {% else %} {% if request.GET['send'] %} -

    {% trans %}Are you sure you want to send this weekmail?{% endtrans %}

    - {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %} -

    {% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}

    - {% endif %} -
    - {% csrf_token %} - -
    +

    {% trans %}Are you sure you want to send this weekmail?{% endtrans %}

    + {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %} +

    {% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}

    + {% endif %} +
    + {% csrf_token %} + +
    {% endif %} -{% endif %} -
    -{{ weekmail_rendered|safe }} + {% endif %} +
    + {{ weekmail_rendered|safe }} {% endblock %} diff --git a/com/templates/com/weekmail_renderer_html.jinja b/com/templates/com/weekmail_renderer_html.jinja index c3e865be..50bef937 100644 --- a/com/templates/com/weekmail_renderer_html.jinja +++ b/com/templates/com/weekmail_renderer_html.jinja @@ -1,52 +1,52 @@
    -
    -

    {{ weekmail.title }}

    - - {% if weekmail.intro %} -

    {% trans %}Intro{% endtrans %}

    - {{ weekmail.intro|markdown }} - {% endif %} +
    +

    {{ weekmail.title }}

    + + {% if weekmail.intro %} +

    {% trans %}Intro{% endtrans %}

    + {{ weekmail.intro|markdown }} + {% endif %} -

    {% trans %}Table of content{% endtrans %}

    -
      - {% for a in weekmail.articles.all() %} -
    • [{{ a.club }}] {{ a.title }}
      • - {%- endfor %} -
    +

    {% trans %}Table of content{% endtrans %}

    +
      + {% for a in weekmail.articles.all() %} +
    • [{{ a.club }}] {{ a.title }}
      • + {%- endfor %} +
    - {%- for a in weekmail.articles.all() %} -

    [{{ a.club }}] {{ a.title }}

    - {{ a.content|markdown }} - {%- endfor -%} + {%- for a in weekmail.articles.all() %} +

    [{{ a.club }}] {{ a.title }}

    + {{ a.content|markdown }} + {%- endfor -%} - {%- if weekmail.joke %} -

    {% trans %}Joke{% endtrans %}

    - {{ weekmail.joke|markdown }} - {% endif -%} + {%- if weekmail.joke %} +

    {% trans %}Joke{% endtrans %}

    + {{ weekmail.joke|markdown }} + {% endif -%} - {%- if weekmail.protip %} -

    {% trans %}Pro tip{% endtrans %}

    - {{ weekmail.protip|markdown }} - {% endif -%} + {%- if weekmail.protip %} +

    {% trans %}Pro tip{% endtrans %}

    + {{ weekmail.protip|markdown }} + {% endif -%} - {%- if weekmail.conclusion %} -

    {% trans %}Final word{% endtrans %}

    - {{ weekmail.conclusion|markdown }} - {% endif -%} - + {%- if weekmail.conclusion %} +

    {% trans %}Final word{% endtrans %}

    + {{ weekmail.conclusion|markdown }} + {% endif -%} + -
    +
    diff --git a/com/templates/com/weekmail_renderer_text.jinja b/com/templates/com/weekmail_renderer_text.jinja index 82c6b813..b07ef8e7 100644 --- a/com/templates/com/weekmail_renderer_text.jinja +++ b/com/templates/com/weekmail_renderer_text.jinja @@ -1,8 +1,8 @@ # {{ weekmail.title }} {%- if weekmail.intro %} -## {% trans %}Intro{% endtrans %} -{{ weekmail.intro }} + ## {% trans %}Intro{% endtrans %} + {{ weekmail.intro }} {% endif %} ## {% trans %}Table of content{% endtrans %} @@ -11,22 +11,22 @@ {% endfor -%} {% for a in weekmail.articles.all() %} -## [{{ a.club }}] {{ a.title }} -{{ a.content }} + ## [{{ a.club }}] {{ a.title }} + {{ a.content }} {% endfor -%} {%- if weekmail.joke %} -## {% trans %}Joke{% endtrans %} -{{ weekmail.joke }} + ## {% trans %}Joke{% endtrans %} + {{ weekmail.joke }} {% endif -%} {%- if weekmail.protip %} -## {% trans %}Pro tip{% endtrans %} -{{ weekmail.protip }} + ## {% trans %}Pro tip{% endtrans %} + {{ weekmail.protip }} {% endif -%} {%- if weekmail.conclusion %} -## {% trans %}Final word{% endtrans %} -{{ weekmail.conclusion }} + ## {% trans %}Final word{% endtrans %} + {{ weekmail.conclusion }} {% endif -%} diff --git a/com/tests.py b/com/tests.py index bc00ea48..1ca29a08 100644 --- a/com/tests.py +++ b/com/tests.py @@ -69,11 +69,11 @@ class TestCom(TestCase): }, ) r = self.client.get(reverse("core:index")) - self.assertContains( - r, - """
    -

    ALERTE!

    -

    Caaaataaaapuuuulte!!!!

    """, + assert r.status_code == 200 + self.assertInHTML( + """

    ALERTE!

    +

    Caaaataaaapuuuulte!!!!

    """, + r.content.decode(), ) def test_info_msg(self): @@ -86,10 +86,12 @@ class TestCom(TestCase): }, ) r = self.client.get(reverse("core:index")) - self.assertContains( - r, - """
    -

    INFO: Caaaataaaapuuuulte!!!!

    """, + + assert r.status_code == 200 + self.assertInHTML( + """
    +

    INFO: Caaaataaaapuuuulte!!!!

    """, + r.content.decode(), ) def test_birthday_non_subscribed_user(self): diff --git a/core/static/com/slideshow.scss b/core/static/com/slideshow.scss index 82d63a4d..9ea4fa52 100644 --- a/core/static/com/slideshow.scss +++ b/core/static/com/slideshow.scss @@ -1,149 +1,149 @@ body{ - position: absolute; - width: 100vw; - height: 100vh; + position: absolute; + width: 100vw; + height: 100vh; - padding: 0; - margin: 0; + padding: 0; + margin: 0; } #slideshow{ - position: relative; - background-color: lightgrey; + position: relative; + background-color: lightgrey; + height: 100%; + + *{ + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + + &:hover{ + + &::before{ + + position: absolute; + width: 100%; + height: 100%; + + display: flex; + justify-content: center; + align-items: center; + + z-index: 10; + + content: "Click to expand"; + + color: white; + background-color: rgba(black, 0.5); + + } + + } + + &.fullscreen{ + position: fixed; + width: 100%; height: 100%; + top: 0; + left: 0; + background: none; - *{ - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } - - &:hover{ - - &::before{ - - position: absolute; - width: 100%; - height: 100%; - - display: flex; - justify-content: center; - align-items: center; - - z-index: 10; - - content: "Click to expand"; - - color: white; - background-color: rgba(black, 0.5); - - } - - } - - &.fullscreen{ - position: fixed; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: none; - - &:before{ - display:none; - } - - #slides{ - height: 100vh; - } - + &:before{ + display:none; } #slides{ - position: relative; - height: 100%; - overflow: hidden; - - .slide{ - position: absolute; - width: 100%; - height: 100%; - - display: inline-flex; - justify-content: center; - - top: 0px; - - background-color: grey; - transition: left 1s ease-out; - - img{ - max-width: 100%; - max-height: 100%; - object-fit: contain; - } - } - - .slide.left{ - left: -100%; - } - - .slide.center{ - left: 0px; - } - - .slide.right{ - left: 100%; - transition: none; - } + height: 100vh; } + } - #progress_bullets{ - position: absolute; - bottom: 10px; - width: 100%; - height: 10px; + #slides{ + position: relative; + height: 100%; + overflow: hidden; - display: flex; - justify-content: center; + .slide{ + position: absolute; + width: 100%; + height: 100%; - margin-bottom: 10px; + display: inline-flex; + justify-content: center; - .bullet{ - height: 10px; - width: 10px; + top: 0px; - margin-left: 5px; - margin-right: 5px; + background-color: grey; + transition: left 1s ease-out; - border-radius: 50%; - - background-color: grey; - - &.active{ - background-color: #c99836; - } - } + img{ + max-width: 100%; + max-height: 100%; + object-fit: contain; + } } - #progress_bar{ - position: absolute; - bottom: 0px; - height: 10px; - background-color: #304c83; - - &.init{ - width: 0px; - transition: none; - } - - &.progress{ - width: 100%; - transition: width 10s linear; - } + .slide.left{ + left: -100%; } + + .slide.center{ + left: 0px; + } + + .slide.right{ + left: 100%; + transition: none; + } + } + + + #progress_bullets{ + position: absolute; + bottom: 10px; + width: 100%; + height: 10px; + + display: flex; + justify-content: center; + + margin-bottom: 10px; + + .bullet{ + height: 10px; + width: 10px; + + margin-left: 5px; + margin-right: 5px; + + border-radius: 50%; + + background-color: grey; + + &.active{ + background-color: #c99836; + } + } + } + + #progress_bar{ + position: absolute; + bottom: 0px; + height: 10px; + background-color: #304c83; + + &.init{ + width: 0px; + transition: none; + } + + &.progress{ + width: 100%; + transition: width 10s linear; + } + } } diff --git a/core/static/core/markdown.scss b/core/static/core/markdown.scss index 55e3bed6..86778e46 100644 --- a/core/static/core/markdown.scss +++ b/core/static/core/markdown.scss @@ -21,9 +21,9 @@ overflow: auto; max-width: 100%; font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", - "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", - "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, - monospace; + "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", + "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, + monospace; font-size: 14px; tab-size: 4; border-radius: 4px; diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss index a3b4209c..5b5e0653 100644 --- a/core/static/core/navbar.scss +++ b/core/static/core/navbar.scss @@ -43,7 +43,7 @@ nav.navbar { justify-content: center; display: flex !important; } - + > .menu, > .link { box-sizing: border-box; @@ -146,5 +146,5 @@ nav.navbar { } } } - } + } } \ No newline at end of file diff --git a/core/static/core/style.scss b/core/static/core/style.scss index a2596986..f169c88b 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -170,7 +170,7 @@ a:not(.button) { .shadow { box-shadow: rgba(60, 64, 67, 0.3) 0 1px 3px 0, - rgba(60, 64, 67, 0.15) 0 4px 8px 3px; + rgba(60, 64, 67, 0.15) 0 4px 8px 3px; } .w_big { @@ -246,7 +246,7 @@ a:not(.button) { #page { width: 90%; margin: 20px auto 0; - /*---------------------------------NAV---------------------------------*/ +/*---------------------------------NAV---------------------------------*/ .btn { font-size: 15px; @@ -278,7 +278,7 @@ a:not(.button) { } } - /*--------------------------------CONTENT------------------------------*/ +/*--------------------------------CONTENT------------------------------*/ #quick_notif { width: 100%; margin: 0 auto; @@ -357,7 +357,7 @@ a:not(.button) { } } - /*---------------------------------NEWS--------------------------------*/ +/*---------------------------------NEWS--------------------------------*/ #news { display: flex; @@ -385,11 +385,11 @@ a:not(.button) { background: $second-color; box-shadow: $shadow-color 1px 1px 1px; padding: 0.4em; - margin: 0em 0em 0.5em 0em; + margin: 0 0 0.5em 0; text-transform: uppercase; font-size: 1.1em; &:not(:first-of-type) { - margin: 2em 0em 1em 0em; + margin: 2em 0 1em 0; } } } @@ -400,7 +400,7 @@ a:not(.button) { } } - /* AGENDA/BIRTHDAYS */ +/* AGENDA/BIRTHDAYS */ #agenda, #birthdays { display: block; @@ -410,7 +410,7 @@ a:not(.button) { margin-bottom: 1em; #agenda_title, #birthdays_title { - margin: 0em; + margin: 0; border-radius: 5px 5px 0 0; box-shadow: $shadow-color 1px 1px 1px; padding: 0.5em; @@ -444,7 +444,7 @@ a:not(.button) { } } ul.birthdays_year { - margin: 0em; + margin: 0; list-style-type: none; font-weight: bold; > li { @@ -454,7 +454,7 @@ a:not(.button) { } } ul { - margin: 0em; + margin: 0; margin-left: 1em; list-style-type: square; list-style-position: inside; @@ -463,9 +463,9 @@ a:not(.button) { } } } - /* END AGENDA/BIRTHDAYS */ +/* END AGENDA/BIRTHDAYS */ - /* EVENTS TODAY AND NEXT FEW DAYS */ +/* EVENTS TODAY AND NEXT FEW DAYS */ .news_events_group { box-shadow: $shadow-color 1px 1px 1px; margin-left: 1em; @@ -516,14 +516,14 @@ a:not(.button) { float: left; min-width: 7em; max-width: 9em; - margin: 0em; + margin: 0; margin-right: 1em; margin-top: 0.8em; img { max-height: 6em; max-width: 8em; display: block; - margin: 0em auto; + margin: 0 auto; } } .news_date { @@ -544,15 +544,15 @@ a:not(.button) { } } } - /* END EVENTS TODAY AND NEXT FEW DAYS */ +/* END EVENTS TODAY AND NEXT FEW DAYS */ - /* COMING SOON */ +/* COMING SOON */ .news_coming_soon { display: list-item; list-style-type: square; list-style-position: inside; margin-left: 1em; - padding-left: 0em; + padding-left: 0; a { font-weight: bold; text-transform: uppercase; @@ -561,35 +561,35 @@ a:not(.button) { font-size: 0.9em; } } - /* END COMING SOON */ +/* END COMING SOON */ - /* NOTICES */ +/* NOTICES */ .news_notice { - margin: 0em 0em 1em 1em; + margin: 0 0 1em 1em; padding: 0.4em; padding-left: 1em; background: $secondary-neutral-light-color; box-shadow: $shadow-color 0 0 2px; border-radius: 18px 5px 18px 5px; h4 { - margin: 0em; + margin: 0; } .news_content { margin-left: 1em; } } - /* END NOTICES */ +/* END NOTICES */ - /* CALLS */ +/* CALLS */ .news_call { - margin: 0em 0em 1em 1em; + margin: 0 0 1em 1em; padding: 0.4em; padding-left: 1em; background: $secondary-neutral-light-color; border: 1px solid grey; box-shadow: $shadow-color 1px 1px 1px; h4 { - margin: 0em; + margin: 0; } .news_date { font-size: 0.9em; @@ -598,7 +598,7 @@ a:not(.button) { margin-left: 1em; } } - /* END CALLS */ +/* END CALLS */ .news_empty { margin-left: 1em; @@ -631,12 +631,12 @@ a:not(.button) { width: 19%; float: left; min-width: 15em; - margin: 0em; + margin: 0; img { max-height: 15em; max-width: 12em; display: block; - margin: 0em auto; + margin: 0 auto; margin-bottom: 10px; } } @@ -646,7 +646,6 @@ a:not(.button) { padding: 0.5em 1em; text-align: center; text-decoration: none; - display: inline-block; font-size: 1.2em; border-radius: 2px; float: right; @@ -978,7 +977,7 @@ table { -moz-border-radius: 5px; overflow: hidden; box-shadow: rgba(60, 64, 67, 0.3) 0 1px 3px 0, - rgba(60, 64, 67, 0.15) 0 4px 8px 3px; + rgba(60, 64, 67, 0.15) 0 4px 8px 3px; } @media screen and (max-width: 500px) { @@ -1198,8 +1197,8 @@ u, color: $primary-neutral-dark-color; height: 100%; width: 100%; - margin: 0em; - padding: 0em; + margin: 0; + padding: 0; display: block; } } @@ -1393,7 +1392,7 @@ footer { text-align: center; vertical-align: middle; div { - margin: 0.6em 0em; + margin: 0.6em 0; color: $white-color; border-radius: 5px; display: flex; @@ -1573,10 +1572,10 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: auto auto; grid-template-rows: auto auto auto; grid-template-areas: - "action-bar action-bar" - "search-bar search-bar" - "radio-department radio-department" - "radio-credit-type radio-semester"; + "action-bar action-bar" + "search-bar search-bar" + "radio-department radio-department" + "radio-credit-type radio-semester"; } .action-bar { @@ -1668,8 +1667,8 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: 20% 20% 20% 20% auto; grid-template-rows: auto auto; grid-template-areas: - "hours-cm hours-td hours-tp hours-te hours-the" - "department credit-type semester . ."; + "hours-cm hours-td hours-tp hours-te hours-the" + "department credit-type semester . ."; } .department { @@ -1722,8 +1721,8 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: 100%; grid-template-rows: auto auto; grid-template-areas: - "stars" - "comment"; + "stars" + "comment"; } } @@ -1770,15 +1769,15 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: 150px 100px auto; grid-template-rows: 156px 1fr; grid-template-areas: - "grade grade-stars uv-infos" - ". . uv-infos"; + "grade grade-stars uv-infos" + ". . uv-infos"; @media screen and (max-width: $large-devices) { grid-template-columns: 50% 50%; grid-template-rows: auto auto; grid-template-areas: - "grade grade-stars" - "uv-infos uv-infos"; + "grade grade-stars" + "uv-infos uv-infos"; } } @@ -1811,9 +1810,9 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: 300px auto; grid-template-rows: auto auto auto; grid-template-areas: - "grade-block comment" - "grade-block info" - "comment-end-bar comment-end-bar"; + "grade-block comment" + "grade-block info" + "comment-end-bar comment-end-bar"; margin-bottom: 30px; margin-top: 10px; @@ -1821,10 +1820,10 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: auto; grid-template-rows: auto auto auto auto; grid-template-areas: - "grade-block" - "comment" - "info" - "comment-end-bar"; + "grade-block" + "comment" + "info" + "comment-end-bar"; } .grade-block { @@ -1835,8 +1834,8 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: 150px 150px; grid-template-rows: 156px auto; grid-template-areas: - "grade-type grade-stars" - "grade-extension grade-extension"; + "grade-type grade-stars" + "grade-extension grade-extension"; grid-gap: 15px; clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 30px, 270px 0); @@ -1881,8 +1880,8 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: auto; grid-template-rows: auto auto; grid-template-areas: - "anchor" - "markdown"; + "anchor" + "markdown"; @media screen and (max-width: $large-devices) { border-left: solid; @@ -1944,9 +1943,9 @@ $pedagogy-white-text: #f0f0f0; grid-template-columns: auto; grid-template-rows: auto auto auto; grid-template-areas: - "report" - "date" - "author"; + "report" + "date" + "author"; margin-top: 0; text-align: center; } diff --git a/core/static/election/election.scss b/core/static/election/election.scss index c6f7cc26..ab12078d 100644 --- a/core/static/election/election.scss +++ b/core/static/election/election.scss @@ -5,287 +5,287 @@ $border: .01rem solid black; $min_col_width: 100px; .error { - color: red !important; + color: red !important; } .radio-btn { - display: flex; - flex-direction: row; - gap: $gap; + display: flex; + flex-direction: row; + gap: $gap; - > input, - > label { - margin: 0; - } + > input, + > label { + margin: 0; + } - &:hover { - cursor: pointer; - } + &:hover { + cursor: pointer; + } } .election_vote { - overflow-x: scroll !important; + overflow-x: scroll !important; } .election_table { - width: 100%; + width: 100%; - >.lists { + >.lists { + display: flex; + flex-direction: row; + + >tr { + display: flex; + flex-direction: row; + width: 100%; + + >.column { + display: flex; + flex-direction: column-reverse; + align-items: center; + justify-content: center; + padding: $padding; + border: $border; + border-collapse: collapse; + position: relative; + min-width: $min_col_width; + + >a{ + margin-left: $padding; + width: 20px; + height: 20px; + text-align: center; + padding: 5px; + border-radius: 25%; + margin: 0; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + right: $gap; + top: $gap; + + &:hover { + background-color: #ddd; + } + } + } + } + } + + >.role { + display: flex; + flex-direction: column; + + >tr { + display: flex; + flex-direction: row; + background-color: lightgrey; + + &:hover { + background-color: lightgrey; + } + + >.role_title { display: flex; flex-direction: row; + align-items: center; + justify-content: space-between; + margin: 0; + padding: $padding; + width: 100%; - >tr { - display: flex; - flex-direction: row; - width: 100%; - >.column { - display: flex; - flex-direction: column-reverse; - align-items: center; - justify-content: center; - padding: $padding; - border: $border; - border-collapse: collapse; - position: relative; - min-width: $min_col_width; - - >a{ - margin-left: $padding; - width: 20px; - height: 20px; - text-align: center; - padding: 5px; - border-radius: 25%; - margin: 0; - display: flex; - align-items: center; - justify-content: center; - position: absolute; - right: $gap; - top: $gap; - - &:hover { - background-color: #ddd; - } - } - } + >.role_text { + >h4 { + margin: 0; + } + >p { + margin-top: .5em; + } } - } - >.role { + >.role_buttons { + display: flex; + flex-direction: row; + align-items: center; + gap: $gap; + + > button, + > button > i, + > a { + width: 20px; + height: 20px; + background-color: #e9e9e9; + text-align: center; + padding: 5px; + border-radius: 25%; + margin: 0; + display: flex; + align-items: center; + justify-content: center; + + &:hover, + &:hover > i { + background-color: #fff; + } + } + + > button { + width: 30px; + height: 30px; + } + + > button[disabled] { + background-color: #eee; + cursor: not-allowed; + + >i, + &:hover, + &:hover > i { + background-color: #eee; + } + } + } + } + + >.list_per_role { display: flex; - flex-direction: column; + flex-direction: row; + justify-content: center; + border: $border; + border-collapse: collapse; + background-color: #fff; + padding: $padding_smaller; + margin: 0; + min-width: $min_col_width; - >tr { + >.candidates { + margin: 0; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + width: 100%; + gap: $gap; + + >.candidate { display: flex; - flex-direction: row; - background-color: lightgrey; + flex-direction: column; + align-items: center; + list-style-type: none; + width: 100%; + gap: $gap; - &:hover { - background-color: lightgrey; - } + >input[type="radio"]:checked + label, + >input[type="checkbox"]:checked + label { + background-color: lightgray; + border-radius: 10px; - >.role_title { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - margin: 0; - padding: $padding; - width: 100%; - - - >.role_text { - >h4 { - margin: 0; - } - >p { - margin-top: .5em; - } - } - - >.role_buttons { - display: flex; - flex-direction: row; - align-items: center; - gap: $gap; - - > button, - > button > i, - > a { - width: 20px; - height: 20px; - background-color: #e9e9e9; - text-align: center; - padding: 5px; - border-radius: 25%; - margin: 0; - display: flex; - align-items: center; - justify-content: center; - - &:hover, - &:hover > i { - background-color: #fff; - } - } - - > button { - width: 30px; - height: 30px; - } - - > button[disabled] { - background-color: #eee; - cursor: not-allowed; - - >i, - &:hover, - &:hover > i { - background-color: #eee; - } - } - } - } - - >.list_per_role { - display: flex; - flex-direction: row; - justify-content: center; - border: $border; - border-collapse: collapse; + >figure>.edit_btns>a:hover{ background-color: #fff; - padding: $padding_smaller; - margin: 0; - min-width: $min_col_width; - - >.candidates { - margin: 0; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - width: 100%; - gap: $gap; - - >.candidate { - display: flex; - flex-direction: column; - align-items: center; - list-style-type: none; - width: 100%; - gap: $gap; - - >input[type="radio"]:checked + label, - >input[type="checkbox"]:checked + label { - background-color: lightgray; - border-radius: 10px; - - >figure>.edit_btns>a:hover{ - background-color: #fff; - } - } - - >label { - width: 100%; - } - - >label>figure, - >figure { - position: relative; - display: flex; - flex-direction: column; - align-items: center; - gap: $gap; - padding: 10px; - max-width: 100%; - - >img { - max-width: 100% !important; - } - - >figcaption { - width: 100%; - max-width: inherit !important; - overflow: hidden; - - h5 { - margin: 0; - text-align: center; - } - .candidate_program { - margin: 5px 0; - } - } - - >.edit_btns { - position: absolute; - display: flex; - flex-direction: column; - top: $gap; - right: $gap; - gap: $gap; - - > a { - width: 20px; - height: 20px; - background-color: #e9e9e9; - text-align: center; - padding: 5px; - border-radius: 25%; - margin: 0; - display: flex; - align-items: center; - justify-content: center; - - &:hover { - background-color: #d8d8d8; - } - } - } - } - } - } + } } + + >label { + width: 100%; + } + + >label>figure, + >figure { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + gap: $gap; + padding: 10px; + max-width: 100%; + + >img { + max-width: 100% !important; + } + + >figcaption { + width: 100%; + max-width: inherit !important; + overflow: hidden; + + h5 { + margin: 0; + text-align: center; + } + .candidate_program { + margin: 5px 0; + } + } + + >.edit_btns { + position: absolute; + display: flex; + flex-direction: column; + top: $gap; + right: $gap; + gap: $gap; + + > a { + width: 20px; + height: 20px; + background-color: #e9e9e9; + text-align: center; + padding: 5px; + border-radius: 25%; + margin: 0; + display: flex; + align-items: center; + justify-content: center; + + &:hover { + background-color: #d8d8d8; + } + } + } + } + } } + } } + } } .election_details { - margin: .5em 0; + margin: .5em 0; } .buttons { - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items: center; - justify-content: center; - gap: $gap; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: center; + gap: $gap; } .button { - border: none; + border: none; + color: black; + text-decoration: none; + background-color: #f2f2f2; + padding: 0.4em; + margin: 0.1em; + font-size: 1.18em; + border-radius: 5px; + box-shadow: #dfdfdf 0px 0px 1px; + cursor: pointer; + + &:hover { color: black; - text-decoration: none; - background-color: #f2f2f2; - padding: 0.4em; - margin: 0.1em; - font-size: 1.18em; - border-radius: 5px; - box-shadow: #dfdfdf 0px 0px 1px; - cursor: pointer; + background: #d4d4d4; + } + &_send { + background-color: #59aee2; &:hover { - color: black; - background: #d4d4d4; - } - - &_send { - background-color: #59aee2; - &:hover { - background-color: rgb(130, 186, 235); - } + background-color: rgb(130, 186, 235); } + } } \ No newline at end of file diff --git a/core/static/user/user_godfathers.scss b/core/static/user/user_godfathers.scss index e49e63c9..1075c8b8 100644 --- a/core/static/user/user_godfathers.scss +++ b/core/static/user/user_godfathers.scss @@ -50,7 +50,7 @@ align-items: flex-start; max-height: 65px; } - + > span { height: 150px; width: 100%; @@ -66,14 +66,14 @@ max-height: 100%; height: auto; object-fit: contain; - + @media (max-width: 375px) { max-width: 100%; max-height: 65px; } } } - + > em { box-sizing: border-box; padding: 0 5px; diff --git a/core/static/user/user_tools.scss b/core/static/user/user_tools.scss index 82cb5cbf..268e3371 100644 --- a/core/static/user/user_tools.scss +++ b/core/static/user/user_tools.scss @@ -35,7 +35,7 @@ main { > span { margin-top: 5px; } - + > span > span, > span { display: flex; @@ -43,7 +43,7 @@ main { flex-wrap: wrap; gap: 5px; width: 100%; - + >.button { font-size: smaller; width: 100%; diff --git a/core/templates/core/403.jinja b/core/templates/core/403.jinja index 194109a8..33a1a084 100644 --- a/core/templates/core/403.jinja +++ b/core/templates/core/403.jinja @@ -2,9 +2,9 @@ {% block content %} -

    {% trans %}403, Forbidden{% endtrans %}

    +

    {% trans %}403, Forbidden{% endtrans %}

    -{{ super() }} + {{ super() }} {% endblock %} diff --git a/core/templates/core/404.jinja b/core/templates/core/404.jinja index a777cea6..9560fb27 100644 --- a/core/templates/core/404.jinja +++ b/core/templates/core/404.jinja @@ -2,9 +2,9 @@ {% block content %} -
    -

    {% trans %}404, Not Found{% endtrans %}

    -
    +
    +

    {% trans %}404, Not Found{% endtrans %}

    +
    {% endblock %} diff --git a/core/templates/core/500.jinja b/core/templates/core/500.jinja index 67962e0d..4b6ad883 100644 --- a/core/templates/core/500.jinja +++ b/core/templates/core/500.jinja @@ -1,27 +1,27 @@ {% extends "core/base.jinja" %} {% block head %} -{{ super() }} - + {{ super() }} + {% endblock head %} {% block content %} -

    {% trans %}500, Server Error{% endtrans %}

    - {% if settings.SENTRY_DSN %} - -{% endif %} +

    {% trans %}500, Server Error{% endtrans %}

    + {% if settings.SENTRY_DSN %} + + {% endif %} {% endblock content %} diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index 0a243994..30d157ba 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -1,319 +1,321 @@ - - {% block head %} - {% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM - - - - - - - - + + {% block head %} + {% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM + + + + + + + + - {% block jquery_css %} + {% block jquery_css %} {# Thile file is quite heavy (around 250kb), so declaring it in a block allows easy removal #} - - {% endblock %} - - - + + {% endblock %} + + + - + - + - {% block additional_css %}{% endblock %} - {% block additional_js %}{% endblock %} - {% endblock %} - + {% block additional_css %}{% endblock %} + {% block additional_js %}{% endblock %} + {% endblock %} + - + - {% csrf_token %} + {% csrf_token %} - {% block header %} - {% if not popup %} -
    - - {% if not user.is_authenticated %} -
    - {% trans %}Login{% endtrans %} - {% trans %}Register{% endtrans %} -
    - {% else %} -
    -
    - - +
    +
    +
    +
    +
    + {{ user.get_display_name() }} +
    +
    + {% trans %}Tools{% endtrans %} + {% trans %}Logout{% endtrans %} +
    +
    + - {% for language in LANGUAGES %} -
    - {% csrf_token %} - - - -
    + >     +
    +
    + + + {% set notification_count = user.notifications.filter(viewed=False).count() %} + + {% if notification_count > 0 %} + + {% if notification_count < 100 %} + {{ notification_count }} + {% else %} +   + {% endif %} + + {% endif %} + +
    + +
    + + {% trans %}View more{% endtrans %} + + + {% trans %}Mark all as read{% endtrans %} +
    -
    +
    +
    +
    +
    + {% endif %} +
    + {% for language in LANGUAGES %} +
    + {% csrf_token %} + + + +
    + {% endfor %} +
    + - {% block info_boxes %} -
    - {% set sith = get_sith() %} - {% if sith.alert_msg %} -
    - {{ sith.alert_msg|markdown }} -
    - {% endif %} - {% if sith.info_msg %} -
    - {{ sith.info_msg|markdown }} -
    - {% endif %} -
    - {% endblock %} - - {% else %} -
    {{ user.get_display_name() }}
    + {% block info_boxes %} +
    + {% set sith = get_sith() %} + {% if sith.alert_msg %} +
    + {{ sith.alert_msg|markdown }} +
    {% endif %} - + {% if sith.info_msg %} +
    + {{ sith.info_msg|markdown }} +
    + {% endif %} +
    {% endblock %} + + {% else %} +
    {{ user.get_display_name() }}
    + {% endif %} + + {% endblock %} - {% block nav %} - {% if not popup %} - - {% endif %} - {% endblock %} - -
    - -
      - {% for n in quick_notifs %} -
    • {{ n }}
      • - {% endfor %} -
    - -
    - {% if list_of_tabs %} -
    -
    - {% for t in list_of_tabs -%} - {{ t.name }} - {%- endfor %} -
    + {% block nav %} + {% if not popup %} +
    + + {% endif %} + {% endblock %} - {% if not popup %} - +
    + +
      + {% for n in quick_notifs %} +
    • {{ n }}
      • + {% endfor %} +
    + +
    + {% if list_of_tabs %} +
    +
    + {% for t in list_of_tabs -%} + {{ t.name }} + {%- endfor %} +
    +
    {% endif %} - {% block script %} - - - - + + {% if error %} + {{ error }} + {% endif %} + {% block content %} {% endblock %} - +
    +
    + + {% if not popup %} + + {% endif %} + + {% block script %} + + + + + {% endblock %} + diff --git a/core/templates/core/create.jinja b/core/templates/core/create.jinja index 04d8f866..332bb94b 100644 --- a/core/templates/core/create.jinja +++ b/core/templates/core/create.jinja @@ -1,16 +1,16 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %} + {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %} {% endblock %} {% block content %} -

    {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}

    -
    +

    {% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}

    + {% csrf_token %} {{ form.as_p() }}

    -
    + {% endblock %} diff --git a/core/templates/core/delete_confirm.jinja b/core/templates/core/delete_confirm.jinja index a439c9e0..3a393b67 100644 --- a/core/templates/core/delete_confirm.jinja +++ b/core/templates/core/delete_confirm.jinja @@ -1,7 +1,7 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Delete confirmation{% endtrans %} + {% trans %}Delete confirmation{% endtrans %} {% endblock %} {% block info_boxes %} @@ -11,14 +11,14 @@ {% endblock %} {% block content %} -

    {% trans %}Delete confirmation{% endtrans %}

    -
    {% csrf_token %} +

    {% trans %}Delete confirmation{% endtrans %}

    + {% csrf_token %}

    {% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}

    -
    -
    +
    +
    -
    + {% endblock %} diff --git a/core/templates/core/edit.jinja b/core/templates/core/edit.jinja index a6fe7a40..25c6bd74 100644 --- a/core/templates/core/edit.jinja +++ b/core/templates/core/edit.jinja @@ -1,24 +1,24 @@ {% extends "core/base.jinja" %} {% block title %} -{% if object %} -{% trans obj=object %}Edit {{ obj }}{% endtrans %} -{% else %} -{% trans %}Save{% endtrans %} -{% endif %} + {% if object %} + {% trans obj=object %}Edit {{ obj }}{% endtrans %} + {% else %} + {% trans %}Save{% endtrans %} + {% endif %} {% endblock %} {% block content %} -{% if object %} -

    {% trans obj=object %}Edit {{ obj }}{% endtrans %}

    -{% else %} -

    {% trans %}Save{% endtrans %}

    -{% endif %} -
    + {% if object %} +

    {% trans obj=object %}Edit {{ obj }}{% endtrans %}

    + {% else %} +

    {% trans %}Save{% endtrans %}

    + {% endif %} + {% csrf_token %} {{ form.as_p() }}

    -
    + {% endblock %} diff --git a/core/templates/core/file.jinja b/core/templates/core/file.jinja index f6e2d856..f8f42990 100644 --- a/core/templates/core/file.jinja +++ b/core/templates/core/file.jinja @@ -1,62 +1,62 @@ {% extends "core/base.jinja" %} {% block title %} -{% if file %} -{{ file.get_display_name() }} -{% elif file_list %} -{% trans %}File list{% endtrans %} -{% elif new_file %} -{% trans %}New file{% endtrans %} -{% else %} -{% trans %}Not found{% endtrans %} -{% endif %} + {% if file %} + {{ file.get_display_name() }} + {% elif file_list %} + {% trans %}File list{% endtrans %} + {% elif new_file %} + {% trans %}New file{% endtrans %} + {% else %} + {% trans %}Not found{% endtrans %} + {% endif %} {% endblock %} {% macro print_file_name(file) %} -{% if file %} -{{ print_file_name(file.parent) }} > -{{ file.get_display_name() }} -{% else %} -{% trans %}Files{% endtrans %} -{% endif %} + {% if file %} + {{ print_file_name(file.parent) }} > + {{ file.get_display_name() }} + {% else %} + {% trans %}Files{% endtrans %} + {% endif %} {% endmacro %} {% block content %} -{{ print_file_name(file) }} + {{ print_file_name(file) }} -
    +
    -
    - {% set home = user.home %} - {% if home %} - {% trans %}My files{% endtrans %} - {% endif %} -
    - {% if file %} +
    + {% set home = user.home %} + {% if home %} + {% trans %}My files{% endtrans %} + {% endif %} +
    + {% if file %} {% trans %}View{% endtrans %} {% if can_edit(file, user) %} - {% trans %}Edit{% endtrans %} + {% trans %}Edit{% endtrans %} {% endif %} {% if can_edit_prop(file, user) %} - {% trans %}Prop{% endtrans %} - {% endif %} + {% trans %}Prop{% endtrans %} {% endif %} + {% endif %}
    -
    -
    +
    +
    -{% if file %} -{% block file %} -{% endblock %} -{% endif %} + {% if file %} + {% block file %} + {% endblock %} + {% endif %} -{% block script %} -{{ super() }} -{% if popup %} - -{% endif %} -{% endblock %} + {% block script %} + {{ super() }} + {% if popup %} + + {% endif %} + {% endblock %} {% endblock %} diff --git a/core/templates/core/file_delete_confirm.jinja b/core/templates/core/file_delete_confirm.jinja index 3efd2bd7..521413e2 100644 --- a/core/templates/core/file_delete_confirm.jinja +++ b/core/templates/core/file_delete_confirm.jinja @@ -1,18 +1,18 @@ {% extends "core/file.jinja" %} {% block title %} -{% trans %}Delete confirmation{% endtrans %} + {% trans %}Delete confirmation{% endtrans %} {% endblock %} {% block file %} -

    {% trans %}Delete confirmation{% endtrans %}

    -
    {% csrf_token %} +

    {% trans %}Delete confirmation{% endtrans %}

    + {% csrf_token %}

    {% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}

    -
    -
    +
    +
    -
    + {% endblock %} diff --git a/core/templates/core/file_detail.jinja b/core/templates/core/file_detail.jinja index 4d0a2887..b8b5c18b 100644 --- a/core/templates/core/file_detail.jinja +++ b/core/templates/core/file_detail.jinja @@ -2,78 +2,78 @@ {% block file %} -

    -{% if file.is_folder %} - -{% else %} - -{% endif %} -{{ file.get_display_name() }} -

    -

    {% trans %}Owner: {% endtrans %}{{ file.owner.get_display_name() }}

    -{% if file.is_folder %} -{% if user.can_edit(file) %} -
    - {% csrf_token %} - {{ form.as_p() }} -

    -
    -{% endif %} -
    - {% csrf_token %} -

    +

    + {% if file.is_folder %} + + {% else %} + + {% endif %} + {{ file.get_display_name() }} +

    +

    {% trans %}Owner: {% endtrans %}{{ file.owner.get_display_name() }}

    + {% if file.is_folder %} + {% if user.can_edit(file) %} + + {% csrf_token %} + {{ form.as_p() }} +

    +
    + {% endif %} +
    + {% csrf_token %} +

    | | | -

    - {% if clipboard %} -

    {% trans %}Clipboard: {% endtrans %} -

      - {% for f in clipboard %} -
    • {{ f.get_full_path() }}
      • - {% endfor %} -
    -

    - {% endif %} -
      +

      + {% if clipboard %} +

      {% trans %}Clipboard: {% endtrans %} +

        + {% for f in clipboard %} +
      • {{ f.get_full_path() }}
        • + {% endfor %} +
      +

      + {% endif %} +
        {% for f in file.children.order_by('-is_folder', 'name').all() %} -
      • +
      • {% if f.is_folder %} - + {% else %} - + {% endif %} {{ f.get_display_name() }}
        • {% endfor %} -
      - -{% else %} -

      {% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}

      -

      {% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} - -{{ file.date|localtime|time(DATETIME_FORMAT) }}

      -

      {% trans %}Type: {% endtrans %}{{ file.mime_type }}

      -

      {% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}

      +
    + + {% else %} +

    {% trans %}Real name: {% endtrans %}{{ file.file.name.split('/')[-1] }}

    +

    {% trans %}Date: {% endtrans %}{{ file.date|localtime|date(DATETIME_FORMAT) }} - + {{ file.date|localtime|time(DATETIME_FORMAT) }}

    +

    {% trans %}Type: {% endtrans %}{{ file.mime_type }}

    +

    {% trans %}Size: {% endtrans %}{{ file.size }} {% trans %}bytes{% endtrans %}

    -

    {% trans %}Download{% endtrans %}

    -{% endif %} -{% if not file.home_of and not file.home_of_club and file.parent %} -

    {% trans %}Delete{% endtrans %}

    -{% endif %} -{% if user.is_com_admin %} -

    {% trans %}Moderate{% endtrans %}

    -{% endif %} +

    {% trans %}Download{% endtrans %}

    + {% endif %} + {% if not file.home_of and not file.home_of_club and file.parent %} +

    {% trans %}Delete{% endtrans %}

    + {% endif %} + {% if user.is_com_admin %} +

    {% trans %}Moderate{% endtrans %}

    + {% endif %} {% endblock %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} diff --git a/core/templates/core/file_edit.jinja b/core/templates/core/file_edit.jinja index 38d74695..338fa2b9 100644 --- a/core/templates/core/file_edit.jinja +++ b/core/templates/core/file_edit.jinja @@ -1,12 +1,12 @@ {% extends "core/file.jinja" %} {% block file %} -

    {% trans obj=object %}Edit {{ obj }}{% endtrans %}

    -
    +

    {% trans obj=object %}Edit {{ obj }}{% endtrans %}

    + {% csrf_token %} {{ form.as_p() }}

    -
    + {% endblock %} diff --git a/core/templates/core/file_list.jinja b/core/templates/core/file_list.jinja index b8b28261..077a2bf9 100644 --- a/core/templates/core/file_list.jinja +++ b/core/templates/core/file_list.jinja @@ -1,23 +1,23 @@ {% extends "core/file.jinja" %} {% block content %} -{{ super() }} -{% if file_list %} -

    {% trans %}File list{% endtrans %}

    -
      - {% for f in file_list %} -
    • - {% if f.is_folder %} - - {% else %} - - {% endif %} - {{ f.name }}
      • - {% endfor %} -
    -{% else %} -

    {% trans %}There is no file in this website.{% endtrans %}

    -{% endif %} + {{ super() }} + {% if file_list %} +

    {% trans %}File list{% endtrans %}

    +
      + {% for f in file_list %} +
    • + {% if f.is_folder %} + + {% else %} + + {% endif %} + {{ f.name }}
      • + {% endfor %} +
    + {% else %} +

    {% trans %}There is no file in this website.{% endtrans %}

    + {% endif %} {% endblock %} diff --git a/core/templates/core/file_moderation.jinja b/core/templates/core/file_moderation.jinja index ba46d806..f8fd255e 100644 --- a/core/templates/core/file_moderation.jinja +++ b/core/templates/core/file_moderation.jinja @@ -1,28 +1,28 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}File moderation{% endtrans %} + {% trans %}File moderation{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}File moderation{% endtrans %}

    -
    +

    {% trans %}File moderation{% endtrans %}

    +
    {% for f in files %} -
    +
    {% if f.is_folder %} - Folder + Folder {% else %} - File + File {% endif %}

    - {{ f.name }}
    - {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}
    - {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}
    - {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}
    + {{ f.name }}
    + {% trans %}Full name: {% endtrans %}{{ f.get_parent_path()+'/'+f.name }}
    + {% trans %}Owner: {% endtrans %}{{ f.owner.get_display_name() }}
    + {% trans %}Date: {% endtrans %}{{ f.date|date(DATE_FORMAT) }} {{ f.date|time(TIME_FORMAT) }}

    {% trans %}Moderate{% endtrans %} - - {% trans %}Delete{% endtrans %}

    -
    + {% trans %}Delete{% endtrans %}

    +
    {% endfor %} -
    +
    {% endblock %} diff --git a/core/templates/core/group_detail.jinja b/core/templates/core/group_detail.jinja index 3e9dfe45..0c9ebb53 100644 --- a/core/templates/core/group_detail.jinja +++ b/core/templates/core/group_detail.jinja @@ -2,38 +2,38 @@ {% from "core/macros.jinja" import select_all_checkbox %} {% block title %} - {% trans %}Group detail{% endtrans %} + {% trans %}Group detail{% endtrans %} {% endblock title %} {% block content %} -

    {{ object }}

    -

    {% trans %}Back to list{% endtrans %}

    - {% if form.users_removed | length <= 0 %} -

    {% trans %}No user in this group{% endtrans %}

    - {% else %} -
    - {{ select_all_checkbox("add_users") }} -
    - {% csrf_token %} - - {{ form.users_removed.errors }} - {% for user in form.users_removed %} - - {% endfor %} - -
    - {% endif %} +

    {{ object }}

    +

    {% trans %}Back to list{% endtrans %}

    + {% if form.users_removed | length <= 0 %} +

    {% trans %}No user in this group{% endtrans %}

    + {% else %}
    - {% csrf_token %} -

    - {{ form.users_added.errors }} - - {{ form.users_added }} - {{ form.users_added.help_text }} -

    - + {{ select_all_checkbox("add_users") }} +
    + {% csrf_token %} + + {{ form.users_removed.errors }} + {% for user in form.users_removed %} + + {% endfor %} +
    + {% endif %} +
    + {% csrf_token %} +

    + {{ form.users_added.errors }} + + {{ form.users_added }} + {{ form.users_added.help_text }} +

    + +
    {% endblock content %} \ No newline at end of file diff --git a/core/templates/core/group_edit.jinja b/core/templates/core/group_edit.jinja index 44ad2d1c..081cf303 100644 --- a/core/templates/core/group_edit.jinja +++ b/core/templates/core/group_edit.jinja @@ -1,13 +1,13 @@ {% extends "core/base.jinja" %} {% block content %} -

    {% trans %}Back to list{% endtrans %}

    -

    {% trans %}Edit group{% endtrans %}

    -
    +

    {% trans %}Back to list{% endtrans %}

    +

    {% trans %}Edit group{% endtrans %}

    + {% csrf_token %} {{ form.as_p() }}

    -
    + {% endblock %} diff --git a/core/templates/core/group_list.jinja b/core/templates/core/group_list.jinja index e655335d..1cf9cab9 100644 --- a/core/templates/core/group_list.jinja +++ b/core/templates/core/group_list.jinja @@ -1,31 +1,31 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Group list{% endtrans %} + {% trans %}Group list{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}Group list{% endtrans %}

    -

    {% trans %}New group{% endtrans %}

    - - - - - - - - - - {% for group in object_list %} - - - - - - - - {% endfor %} - -
    {% trans %}ID{% endtrans %}{% trans %}Group{% endtrans %}{% trans %}Description{% endtrans %}
    {{ group.id }}{{ group }}{{ group.description }}{% trans %}Edit{% endtrans %}{% trans %}Delete{% endtrans %}
    +

    {% trans %}Group list{% endtrans %}

    +

    {% trans %}New group{% endtrans %}

    + + + + + + + + + + {% for group in object_list %} + + + + + + + + {% endfor %} + +
    {% trans %}ID{% endtrans %}{% trans %}Group{% endtrans %}{% trans %}Description{% endtrans %}
    {{ group.id }}{{ group }}{{ group.description }}{% trans %}Edit{% endtrans %}{% trans %}Delete{% endtrans %}
    {% endblock %} diff --git a/core/templates/core/login.jinja b/core/templates/core/login.jinja index 4e56613d..5e94a304 100644 --- a/core/templates/core/login.jinja +++ b/core/templates/core/login.jinja @@ -1,11 +1,11 @@ {% extends "core/base.jinja" %} {%- block additional_css -%} - + {%- endblock -%} {% block title %} - {% trans %}Login{% endtrans %} + {% trans %}Login{% endtrans %} {% endblock %} {% block info_boxes %} @@ -15,48 +15,48 @@ {% endblock %} {% block content %} -

    {% trans %}Login{% endtrans %}

    +

    {% trans %}Login{% endtrans %}

    - {% if next %} - {% if user.is_authenticated %} -

    {% trans %}Your account doesn't have access to this page. To proceed, + {% if next %} + {% if user.is_authenticated %} +

    {% trans %}Your account doesn't have access to this page. To proceed, please login with an account that has access.{% endtrans %}

    - {% else %} -

    {% trans %}Please login or create an account to see this page.{% endtrans %}

    - {% endif %} + {% else %} +

    {% trans %}Please login or create an account to see this page.{% endtrans %}

    + {% endif %} + {% endif %} + +
    + {% if form.errors %} +

    {% trans %}Your username and password didn't match. Please try again.{% endtrans %}

    +
    {% endif %} - - {% if form.errors %} -

    {% trans %}Your username and password didn't match. Please try again.{% endtrans %}

    -
    - {% endif %} + {% csrf_token %} + {% render_honeypot_field %} - {% csrf_token %} - {% render_honeypot_field %} +
    + + + {{ form.username.errors }} +
    -
    - - - {{ form.username.errors }} -
    +
    + + {{ form.password }} + {{ form.password.errors }} +
    -
    - - {{ form.password }} - {{ form.password.errors }} -
    - - - + + {# Assumes you setup the password_reset view in your URLconf #} -

    - {% trans %}Lost password?{% endtrans %} -    - {% trans %}Create account{% endtrans %} -

    -
    +

    + {% trans %}Lost password?{% endtrans %} +    + {% trans %}Create account{% endtrans %} +

    + {% endblock %} diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja index 02a3ceae..2344de37 100644 --- a/core/templates/core/macros.jinja +++ b/core/templates/core/macros.jinja @@ -1,155 +1,155 @@ {% macro user_profile_link(user) -%} -{{ user.get_display_name() }} + {{ user.get_display_name() }} {%- endmacro %} {% macro user_profile_link_short_name(user) -%} -{{ user.get_short_name() }} + {{ user.get_short_name() }} {%- endmacro %} {% macro user_link_with_pict(user) -%} - + {{ user.get_mini_item()|safe }} - + {%- endmacro %} {% macro link_news_logo(news) -%} - {% if news.club.logo -%} - {{ news.club.logo.url }} - {% else -%} - {{ static("com/img/news.png") }} - {% endif %} + {% if news.club.logo -%} + {{ news.club.logo.url }} + {% else -%} + {{ static("com/img/news.png") }} + {% endif %} {%- endmacro %} {% macro gen_news_metatags(news) -%} - - - - - - - - + + + + + + + + {%- endmacro %} {% macro facebook_share(news) -%} - + {%- endmacro %} {% macro tweet(news) -%} - + {%- endmacro %} {% macro fb_quick(news) -%} - + {%- endmacro %} {% macro tweet_quick(news) -%} - + {%- endmacro %} {% macro user_mini_profile(user) %} -
    +
    -
    -
    {{ user.get_full_name() }}
    - {% if user.nick_name %} -
    « {{ user.nick_name }} »
    - {% endif %} - {% if user.pronouns %} -
    {{ user.pronouns }}
    - {% endif %} - {% if user.date_of_birth %} -
    - {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }}) -
    - {% endif %} -
    - {% if user.promo %} -
    - Promo {{ user.promo }} -
    +
    +
    {{ user.get_full_name() }}
    + {% if user.nick_name %} +
    « {{ user.nick_name }} »
    {% endif %} + {% if user.pronouns %} +
    {{ user.pronouns }}
    + {% endif %} + {% if user.date_of_birth %} +
    + {{ user.date_of_birth|date("d/m/Y") }} ({{ user.get_age() }}) +
    + {% endif %} +
    + {% if user.promo %} +
    + Promo {{ user.promo }} +
    + {% endif %}
    - {% if user.profile_pict %} + {% if user.profile_pict %} {% trans %}Profile{% endtrans %} - {% else %} + {% else %} {% trans %}Profile{% endtrans %} - {% endif %} + title="{% trans %}Profile{% endtrans %}" /> + {% endif %}
    -
    +
    {%- endmacro %} {% macro user_subscription(user) %} - {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
    - {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}
    + {% trans subscription_end=user.subscriptions.order_by('subscription_end').last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
    + {% trans %}Account number: {% endtrans %}{{ user.customer.account_id }}
    {%- endmacro %} {% macro show_slots(user) %} - {% if user.slots.filter(start_date__gte=timezone.now()).exists() %} -
    {% trans %}Slot{% endtrans %}
    -
      - {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %} -
    • {{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} : - {{ i.start_date|time(DATETIME_FORMAT) }} | - {% trans %}Delete{% endtrans %}
      • - {% endfor %} -
    - {% endif %} + {% if user.slots.filter(start_date__gte=timezone.now()).exists() %} +
    {% trans %}Slot{% endtrans %}
    +
      + {% for i in user.slots.filter(start_date__gte=timezone.now().replace(tzinfo=None)).all() %} +
    • {{ i.get_type_display() }} - {{i.machine.launderette }}, {{ i.start_date|date("l j") }} : + {{ i.start_date|time(DATETIME_FORMAT) }} | + {% trans %}Delete{% endtrans %}
      • + {% endfor %} +
    + {% endif %} {% endmacro %} {% macro show_tokens(user) %} - {% if user.tokens.exists() %} -
    {% trans %}Tokens{% endtrans %}
    -
      - {% for i in user.tokens.all() %} -
    • {{ i }}
      • - {% endfor %} -
    - {% endif %} + {% if user.tokens.exists() %} +
    {% trans %}Tokens{% endtrans %}
    +
      + {% for i in user.tokens.all() %} +
    • {{ i }}
      • + {% endfor %} +
    + {% endif %} {% endmacro %} {% macro delete_godfather(user, profile, godfather, is_father) %} - {% if user == profile or user.is_root or user.is_board_member %} + {% if user == profile or user.is_root or user.is_board_member %} {% trans %}Delete{% endtrans %} - {% endif %} + {% endif %} {% endmacro %} {% macro paginate(page_obj, paginator, js_action) %} - {% set js = js_action|default('') %} - {% if page_obj.has_previous() or page_obj.has_next() %} - {% if page_obj.has_previous() %} - {% trans %}Previous{% endtrans %} - {% else %} - {% trans %}Previous{% endtrans %} - {% endif %} - {% for i in paginator.page_range %} - {% if page_obj.number == i %} - {{ i }} ({% trans %}current{% endtrans %}) - {% else %} - {{ i }} - {% endif %} - {% endfor %} - {% if page_obj.has_next() %} - {% trans %}Next{% endtrans %} - {% else %} - {% trans %}Next{% endtrans %} - {% endif %} + {% set js = js_action|default('') %} + {% if page_obj.has_previous() or page_obj.has_next() %} + {% if page_obj.has_previous() %} + {% trans %}Previous{% endtrans %} + {% else %} + {% trans %}Previous{% endtrans %} {% endif %} + {% for i in paginator.page_range %} + {% if page_obj.number == i %} + {{ i }} ({% trans %}current{% endtrans %}) + {% else %} + {{ i }} + {% endif %} + {% endfor %} + {% if page_obj.has_next() %} + {% trans %}Next{% endtrans %} + {% else %} + {% trans %}Next{% endtrans %} + {% endif %} + {% endif %} {% endmacro %} {% macro select_all_checkbox(form_id) %} - - - + } + } + + + {% endmacro %} diff --git a/core/templates/core/macros_pages.jinja b/core/templates/core/macros_pages.jinja index 4f486a2f..c18bfe31 100644 --- a/core/templates/core/macros_pages.jinja +++ b/core/templates/core/macros_pages.jinja @@ -1,27 +1,27 @@ {% from "core/macros.jinja" import user_profile_link %} {% macro page_history(page) %} -

    {% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}

    -
      +

      {% trans page_name=page.name %}You're seeing the history of page "{{ page_name }}"{% endtrans %}

      +
        {% for r in (page.revisions.all()|sort(attribute='date', reverse=True)) %} - {% if loop.index < 2 %} + {% if loop.index < 2 %}
      • {% trans %}last{% endtrans %} - - {{ user_profile_link(page.revisions.last().author) }} - - {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }}
        • - {% else %} + {{ user_profile_link(page.revisions.last().author) }} - + {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }} + {% else %}
      • {{ r.revision }} - - {{ user_profile_link(r.author) }} - - {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }}
        • - {% endif %} + {{ user_profile_link(r.author) }} - + {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }} + {% endif %} {% endfor %} -
      +
    {% endmacro %} {% macro page_edit_form(page, form, url, token) %} -

    {% trans %}Edit page{% endtrans %}

    -
    +

    {% trans %}Edit page{% endtrans %}

    + {{ form.as_p() }}

    -
    + {% endmacro %} diff --git a/core/templates/core/new_user_email.jinja b/core/templates/core/new_user_email.jinja index e23c6b16..6dff5b3c 100644 --- a/core/templates/core/new_user_email.jinja +++ b/core/templates/core/new_user_email.jinja @@ -1,17 +1,17 @@ {% autoescape off %} -{% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %} + {% trans %}You're receiving this email because you subscribed to the UTBM student association.{% endtrans %} -{% trans %}Please go to the following page and choose a new password:{% endtrans %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} -{% endblock %} -{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }} -{% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %} -{% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %} + {% trans %}Please go to the following page and choose a new password:{% endtrans %} + {% block reset_link %} + {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} + {% endblock %} + {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ user.get_username() }} + {% trans %}You also got a new account that will be useful to purchase products in the living areas and on the Eboutic.{% endtrans %} + {% trans account=user.customer.account_id %}Here is your account number: {{ account }}{% endtrans %} -{% trans %}Thanks for subscribing! {% endtrans %} + {% trans %}Thanks for subscribing! {% endtrans %} -{% trans %}The AE team{% endtrans %} + {% trans %}The AE team{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/new_user_email_subject.jinja b/core/templates/core/new_user_email_subject.jinja index 103149c4..f992d0a7 100644 --- a/core/templates/core/new_user_email_subject.jinja +++ b/core/templates/core/new_user_email_subject.jinja @@ -1,3 +1,3 @@ {% autoescape off %} -{% trans %}New subscription to the UTBM student association{% endtrans %} + {% trans %}New subscription to the UTBM student association{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/notification_list.jinja b/core/templates/core/notification_list.jinja index 412d79f4..3b8f2a6b 100644 --- a/core/templates/core/notification_list.jinja +++ b/core/templates/core/notification_list.jinja @@ -1,24 +1,24 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Notification list{% endtrans %} + {% trans %}Notification list{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}Notification list{% endtrans %}

    - {% endblock %} diff --git a/core/templates/core/page.jinja b/core/templates/core/page.jinja index 73a58676..620839aa 100644 --- a/core/templates/core/page.jinja +++ b/core/templates/core/page.jinja @@ -1,53 +1,53 @@ {% extends "core/base.jinja" %} {% block title %} -{% if page %} -{{ page.get_display_name() }} -{% elif page_list %} -{% trans %}Page list{% endtrans %} -{% elif new_page %} -{% trans %}Create page{% endtrans %} -{% else %} -{% trans %}Not found{% endtrans %} -{% endif %} + {% if page %} + {{ page.get_display_name() }} + {% elif page_list %} + {% trans %}Page list{% endtrans %} + {% elif new_page %} + {% trans %}Create page{% endtrans %} + {% else %} + {% trans %}Not found{% endtrans %} + {% endif %} {% endblock %} {% macro print_page_name(page) %} -{% if page %} -{{ print_page_name(page.parent) }} > -{{ page.get_display_name() }} -{% endif %} + {% if page %} + {{ print_page_name(page.parent) }} > + {{ page.get_display_name() }} + {% endif %} {% endmacro %} {% block content %} -{{ print_page_name(page) }} + {{ print_page_name(page) }} -
    +
    - {% if page %} + {% if page %} {% if page.club %} - {% trans %}Return to club management{% endtrans %} + {% trans %}Return to club management{% endtrans %} {% else %} - {% trans %}View{% endtrans %} + {% trans %}View{% endtrans %} {% endif %} {% trans %}History{% endtrans %} {% if can_edit(page, user) %} - {% trans %}Edit{% endtrans %} + {% trans %}Edit{% endtrans %} {% endif %} {% if can_edit_prop(page, user) and not page.is_club_page %} - {% trans %}Prop{% endtrans %} - {% endif %} + {% trans %}Prop{% endtrans %} {% endif %} + {% endif %}
    -
    -
    +
    +
    -{% if page %} -{% block page %} -{% endblock %} -{% else %} -

    {% trans %}Page does not exist{% endtrans %}

    -

    - {% trans %}Create it?{% endtrans %}

    -{% endif %} + {% if page %} + {% block page %} + {% endblock %} + {% else %} +

    {% trans %}Page does not exist{% endtrans %}

    +

    + {% trans %}Create it?{% endtrans %}

    + {% endif %} {% endblock %} diff --git a/core/templates/core/page_detail.jinja b/core/templates/core/page_detail.jinja index afa5d3ca..054ee612 100644 --- a/core/templates/core/page_detail.jinja +++ b/core/templates/core/page_detail.jinja @@ -1,16 +1,16 @@ {% extends "core/page.jinja" %} {% block page %} -{% if rev %} -

    {% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}

    -

    {{ rev.title }}

    -
    {{ rev.content|markdown }}
    -{% else %} -{% if page.revisions.last() %} -

    {{ page.revisions.last().title }}

    -
    {{ page.revisions.last().content|markdown }}
    -{% endif %} -{% endif %} + {% if rev %} +

    {% trans rev_id=rev.revision %}This may not be the last update, you are seeing revision {{ rev_id }}!{% endtrans %}

    +

    {{ rev.title }}

    +
    {{ rev.content|markdown }}
    + {% else %} + {% if page.revisions.last() %} +

    {{ page.revisions.last().title }}

    +
    {{ page.revisions.last().content|markdown }}
    + {% endif %} + {% endif %} {% endblock %} diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja index 6f363f7b..4aac13b1 100644 --- a/core/templates/core/page_hist.jinja +++ b/core/templates/core/page_hist.jinja @@ -3,8 +3,8 @@ {% from "core/macros_pages.jinja" import page_history %} {% block page %} -

    {% trans %}Page history{% endtrans %}

    -{{ page_history(page) }} +

    {% trans %}Page history{% endtrans %}

    + {{ page_history(page) }} {% endblock %} diff --git a/core/templates/core/page_list.jinja b/core/templates/core/page_list.jinja index 39e9b69f..dfb8ea48 100644 --- a/core/templates/core/page_list.jinja +++ b/core/templates/core/page_list.jinja @@ -1,20 +1,20 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}Page list{% endtrans %} + {% trans %}Page list{% endtrans %} {% endblock %} {% block content %} -{% if page_list %} -

    {% trans %}Page list{% endtrans %}

    - -{% else %} -{% trans %}There is no page in this website.{% endtrans %} -{% endif %} + {% if page_list %} +

    {% trans %}Page list{% endtrans %}

    + + {% else %} + {% trans %}There is no page in this website.{% endtrans %} + {% endif %} {% endblock %} diff --git a/core/templates/core/page_prop.jinja b/core/templates/core/page_prop.jinja index 9207f52c..978ec385 100644 --- a/core/templates/core/page_prop.jinja +++ b/core/templates/core/page_prop.jinja @@ -1,18 +1,18 @@ {% extends "core/page.jinja" %} {% block content %} -{% if page %} -{{ super() }} -{% endif %} -

    {% trans %}Page properties{% endtrans %}

    -
    + {% if page %} + {{ super() }} + {% endif %} +

    {% trans %}Page properties{% endtrans %}

    + {% csrf_token %} {{ form.as_p() }}

    -
    -{% if page %} -{% trans %}Delete{% endtrans %} -{% endif %} + + {% if page %} + {% trans %}Delete{% endtrans %} + {% endif %} {% endblock %} diff --git a/core/templates/core/pagerev_edit.jinja b/core/templates/core/pagerev_edit.jinja index 9e188d4f..2d1bb6a0 100644 --- a/core/templates/core/pagerev_edit.jinja +++ b/core/templates/core/pagerev_edit.jinja @@ -2,7 +2,7 @@ {% from 'core/macros_pages.jinja' import page_edit_form %} {% block page %} -{{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }} + {{ page_edit_form(page, form, url('core:page_edit', page_name=page.get_full_name()), csrf_token) }} {% endblock %} diff --git a/core/templates/core/password_change.jinja b/core/templates/core/password_change.jinja index a81baf55..7cd27b1e 100644 --- a/core/templates/core/password_change.jinja +++ b/core/templates/core/password_change.jinja @@ -2,12 +2,12 @@ {% block content %} -{% if target %} + {% if target %}

    {% trans user=target.get_display_name() %}Change password for {{ user }}{% endtrans %}

    -{% endif %} -
    -{% csrf_token %} -{{ form.as_p() }} - -
    + {% endif %} +
    + {% csrf_token %} + {{ form.as_p() }} + +
    {% endblock %} diff --git a/core/templates/core/password_change_done.jinja b/core/templates/core/password_change_done.jinja index fbb570da..86ce1407 100644 --- a/core/templates/core/password_change_done.jinja +++ b/core/templates/core/password_change_done.jinja @@ -1,6 +1,6 @@ {% extends "core/base.jinja" %} {% block content %} -

    {% trans %}You successfully changed your password!{% endtrans %}

    +

    {% trans %}You successfully changed your password!{% endtrans %}

    {% endblock %} diff --git a/core/templates/core/password_reset.jinja b/core/templates/core/password_reset.jinja index b0a63fc3..3f141d71 100644 --- a/core/templates/core/password_reset.jinja +++ b/core/templates/core/password_reset.jinja @@ -1,10 +1,10 @@ {% extends "core/base.jinja" %} {% block content %} -
    -{% csrf_token %} -{% render_honeypot_field %} -{{ form.as_p() }} - -
    +
    + {% csrf_token %} + {% render_honeypot_field %} + {{ form.as_p() }} + +
    {% endblock %} diff --git a/core/templates/core/password_reset_complete.jinja b/core/templates/core/password_reset_complete.jinja index fdd79b48..30898d71 100644 --- a/core/templates/core/password_reset_complete.jinja +++ b/core/templates/core/password_reset_complete.jinja @@ -1,8 +1,8 @@ {% extends "core/base.jinja" %} {% block content %} -

    {% trans %}You successfully reset your password!{% endtrans %}

    -{% trans %}Login{% endtrans %} +

    {% trans %}You successfully reset your password!{% endtrans %}

    + {% trans %}Login{% endtrans %} {% endblock %} diff --git a/core/templates/core/password_reset_confirm.jinja b/core/templates/core/password_reset_confirm.jinja index e90c9f36..fe172f1f 100644 --- a/core/templates/core/password_reset_confirm.jinja +++ b/core/templates/core/password_reset_confirm.jinja @@ -1,14 +1,14 @@ {% extends "core/base.jinja" %} {% block content %} -{% if form %} -
    -{% csrf_token %} -{{ form.as_p() }} - -
    -{% else %} -{% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}{% trans %}lost password{% endtrans %}. -{% endif %} + {% if form %} +
    + {% csrf_token %} + {{ form.as_p() }} + +
    + {% else %} + {% trans %}It seems that this link has expired. To generate a new link, you can follow this link: {% endtrans %}{% trans %}lost password{% endtrans %}. + {% endif %} {% endblock %} diff --git a/core/templates/core/password_reset_done.jinja b/core/templates/core/password_reset_done.jinja index 2f56cac1..f2743e8a 100644 --- a/core/templates/core/password_reset_done.jinja +++ b/core/templates/core/password_reset_done.jinja @@ -1,15 +1,15 @@ {% extends "core/base.jinja" %} {% block content %} -

    {% trans %}Password reset sent{% endtrans %}

    +

    {% trans %}Password reset sent{% endtrans %}

    -

    -{% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should -receive them shortly.{% endtrans %} -

    +

    + {% trans %}We've emailed you instructions for setting your password, if an account exists with the email you entered. You should + receive them shortly.{% endtrans %} +

    -

    -{% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam -folder.{% endtrans %} -

    +

    + {% trans %}If you don't receive an email, please make sure you've entered the address you registered with, and check your spam + folder.{% endtrans %} +

    {% endblock %} diff --git a/core/templates/core/password_reset_email.jinja b/core/templates/core/password_reset_email.jinja index 65532865..6e0f6f63 100644 --- a/core/templates/core/password_reset_email.jinja +++ b/core/templates/core/password_reset_email.jinja @@ -1,15 +1,15 @@ {% autoescape off %} -{% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %} + {% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %} -{% trans %}Please go to the following page and choose a new password:{% endtrans %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} -{% endblock %} -{% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }} + {% trans %}Please go to the following page and choose a new password:{% endtrans %} + {% block reset_link %} + {{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }} + {% endblock %} + {% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }} -{% trans %}Thanks for using our site! {% endtrans %} + {% trans %}Thanks for using our site! {% endtrans %} -{% trans %}The {{ site_name }} team{% endtrans %} + {% trans %}The {{ site_name }} team{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/poster_list.jinja b/core/templates/core/poster_list.jinja index 816c8332..fe65658c 100644 --- a/core/templates/core/poster_list.jinja +++ b/core/templates/core/poster_list.jinja @@ -1,53 +1,53 @@ {% extends "core/base.jinja" %} {% block script %} -{{ super() }} - + {{ super() }} + {% endblock %} {% block title %} -{% trans %}Poster{% endtrans %} + {% trans %}Poster{% endtrans %} {% endblock %} {% block content %} -
    +
    -

    {% trans %}Posters{% endtrans %}

    - +

    {% trans %}Posters{% endtrans %}

    +
    - {% if poster_list.count() == 0 %} -
    {% trans %}No posters{% endtrans %}
    - {% else %} + {% if poster_list.count() == 0 %} +
    {% trans %}No posters{% endtrans %}
    + {% else %} - {% for poster in poster_list %} -
    -
    {{ poster.name }}
    -
    -
    -
    {{ poster.date_begin | date("d/M/Y H:m") }}
    -
    {{ poster.date_end | date("d/M/Y H:m") }}
    -
    - {% trans %}Edit{% endtrans %} -
    - {% endfor %} + {% for poster in poster_list %} +
    +
    {{ poster.name }}
    +
    +
    +
    {{ poster.date_begin | date("d/M/Y H:m") }}
    +
    {{ poster.date_end | date("d/M/Y H:m") }}
    +
    + {% trans %}Edit{% endtrans %} +
    + {% endfor %} - {% endif %} + {% endif %}
    -
    +
    {% endblock %} diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja index c80d2f98..2ad7d4c1 100644 --- a/core/templates/core/register.jinja +++ b/core/templates/core/register.jinja @@ -1,7 +1,7 @@ {% extends "core/base.jinja" %} {%- block additional_css -%} - + {%- endblock -%} {% block title %}{% trans %}Register{% endtrans %}{% endblock %} @@ -13,13 +13,12 @@ {% endblock %} {% block content %} -

    {% trans %}Register{% endtrans %}

    +

    {% trans %}Register{% endtrans %}

    -
    - {% csrf_token %} - {% render_honeypot_field %} - {{ form }} - -
    +
    + {% csrf_token %} + {% render_honeypot_field %} + {{ form }} + +
    {% endblock %} - \ No newline at end of file diff --git a/core/templates/core/register_confirm_mail.jinja b/core/templates/core/register_confirm_mail.jinja index 9b313035..2bc321b0 100644 --- a/core/templates/core/register_confirm_mail.jinja +++ b/core/templates/core/register_confirm_mail.jinja @@ -1,17 +1,17 @@ {% autoescape off %} -{% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %} + {% trans %}You're receiving this email because you created an account on the AE website.{% endtrans %} -{% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }} + {% trans %}Your username, in case it was not given to you: {% endtrans %} {{ username }} -{% trans %} -As this is the website of the students of the AE, by the students of the AE, -for the students of the AE, you won't be able to do many things without subscribing to the AE. -To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr. -{% endtrans %} + {% trans %} + As this is the website of the students of the AE, by the students of the AE, + for the students of the AE, you won't be able to do many things without subscribing to the AE. + To make a contribution, contact a member of the association's board, either directly or by email at ae@utbm.fr. + {% endtrans %} -{% trans %}Wishing you a good experience among us! {% endtrans %} + {% trans %}Wishing you a good experience among us! {% endtrans %} -{% trans %}The AE team{% endtrans %} + {% trans %}The AE team{% endtrans %} {% endautoescape %} diff --git a/core/templates/core/screen_slideshow.jinja b/core/templates/core/screen_slideshow.jinja index 4dd63884..9e386fcf 100644 --- a/core/templates/core/screen_slideshow.jinja +++ b/core/templates/core/screen_slideshow.jinja @@ -1,30 +1,30 @@ - + {% trans %}Slideshow{% endtrans %} - - + +
    -
    +
    {% for poster in posters %} -
    - -
    +
    + +
    {% endfor %} -
    +
    -
    +
    {% for poster in posters %} -
    +
    {% endfor %} -
    +
    -
    +
    - + diff --git a/core/templates/core/search.jinja b/core/templates/core/search.jinja index bd38874e..f413debb 100644 --- a/core/templates/core/search.jinja +++ b/core/templates/core/search.jinja @@ -3,24 +3,24 @@ {% from "core/macros.jinja" import user_link_with_pict %} {% block title %} - {% trans %}Search result{% endtrans %} + {% trans %}Search result{% endtrans %} {% endblock %} {% block content %} -

    {% trans %}Users{% endtrans %}

    -
      +

      {% trans %}Users{% endtrans %}

      +
        {% for i in result.users %} -
      • +
      • {{ user_link_with_pict(i) }} -
        • + {% endfor %} -
      -

      {% trans %}Clubs{% endtrans %}

      -
        +
      +

      {% trans %}Clubs{% endtrans %}

      +
        {% for i in result.clubs %} -
      • +
      • {{ i }} -
        • + {% endfor %} -
      +
    {% endblock %} diff --git a/core/templates/core/to_markdown.jinja b/core/templates/core/to_markdown.jinja index 85ef0a71..06318d59 100644 --- a/core/templates/core/to_markdown.jinja +++ b/core/templates/core/to_markdown.jinja @@ -1,28 +1,28 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans %}To Markdown{% endtrans %} + {% trans %}To Markdown{% endtrans %} {% endblock %} {% block content %} -
    + {% csrf_token %} Doku BBCode

    -
    -
    -
    {% trans %}Markdown{% endtrans %}
    -
    {{- text_md -}}
    -
    -
    -
    {% trans %}Render{% endtrans %}
    -
    -{{ text_md|markdown }} -
    + +
    +
    {% trans %}Markdown{% endtrans %}
    + 
    {{- text_md -}}
    +
    +
    +
    {% trans %}Render{% endtrans %}
    +
    + {{ text_md|markdown }} +
    {% endblock %} diff --git a/core/templates/core/user_account.jinja b/core/templates/core/user_account.jinja index 2f9cfb31..c1a8b742 100644 --- a/core/templates/core/user_account.jinja +++ b/core/templates/core/user_account.jinja @@ -1,83 +1,83 @@ {% extends "core/base.jinja" %} {% macro monthly(obj) %} -
    +
    - - - - - - - - + + + + + + + + {% for array in obj %} - {% for dict in array %} - {% if dict['sum'] != 0 %} - {% set link=url('core:user_account_detail', user_id=profile.id, year=dict['date'].year, month=dict['date'].month) %} - - - - - - {% endif %} - {% endfor %} + {% for dict in array %} + {% if dict['sum'] != 0 %} + {% set link=url('core:user_account_detail', user_id=profile.id, year=dict['date'].year, month=dict['date'].month) %} + + + + + + {% endif %} + {% endfor %} {% endfor %} - +
    {% trans %}Year{% endtrans %}{% trans %}Month{% endtrans %}{% trans %}Total{% endtrans %}
    {% trans %}Year{% endtrans %}{% trans %}Month{% endtrans %}{% trans %}Total{% endtrans %}
    {{ dict['date'].year }}{{ dict['date']|date("E") }}{{ dict['sum'] }} €
    {{ dict['date'].year }}{{ dict['date']|date("E") }}{{ dict['sum'] }} €
    -
    +
    {% endmacro %} {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} {% endblock %} {% block content %} -{% if customer %} -

    {% trans %}User account{% endtrans %}

    -

    {% trans %}Amount: {% endtrans %}{{ customer.amount }} €

    -
    -{% set bought = customer.buyings.exists() %} -{% set refilled = customer.refillings.exists() %} -{% if bought or refilled %} - {% if bought %} -
    {% trans %}Account purchases{% endtrans %}
    - {{ monthly(buyings_month) }} - {% endif %} - {% if refilled %} -
    {% trans %}Reloads{% endtrans %}
    - {{ monthly(refilling_month) }} - {% endif %} -{% endif %} - {% if customer.user.invoices.exists() %} -
    {% trans %}Eboutic invoices{% endtrans %}
    + {% if customer %} +

    {% trans %}User account{% endtrans %}

    +

    {% trans %}Amount: {% endtrans %}{{ customer.amount }} €

    +
    + {% set bought = customer.buyings.exists() %} + {% set refilled = customer.refillings.exists() %} + {% if bought or refilled %} + {% if bought %} +
    {% trans %}Account purchases{% endtrans %}
    + {{ monthly(buyings_month) }} + {% endif %} + {% if refilled %} +
    {% trans %}Reloads{% endtrans %}
    + {{ monthly(refilling_month) }} + {% endif %} + {% endif %} + {% if customer.user.invoices.exists() %} +
    {% trans %}Eboutic invoices{% endtrans %}
    {{ monthly(invoices_month) }} - {% endif %} - {% if etickets %} -

    {% trans %}Etickets{% endtrans %}

    -
    - + {% endif %} + {% if etickets %} +

    {% trans %}Etickets{% endtrans %}

    +
    + +
    + {% endif %}
    - {% endif %} -
    -{% else %} -

    {% trans %}User has no account{% endtrans %}

    -{% endif %} + {% else %} +

    {% trans %}User has no account{% endtrans %}

    + {% endif %} {% endblock %} {% block script %} -{{ super() }} - + {% endblock %} diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja index ccb35f38..8c9b3c3c 100644 --- a/core/templates/core/user_account_detail.jinja +++ b/core/templates/core/user_account_detail.jinja @@ -1,19 +1,19 @@ {% extends "core/base.jinja" %} {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s account{% endtrans %} {% endblock %} {% block content %} -{% if customer %} -

    {% trans %}User account{% endtrans %}

    -

    {% trans %}Amount: {% endtrans %}{{ customer.amount }} €

    -

    {% trans %}Back{% endtrans %}

    -{% if customer.buyings.exists() %} -

    {% trans %}Account purchases{% endtrans %}

    - - - + {% if customer %} +

    {% trans %}User account{% endtrans %}

    +

    {% trans %}Amount: {% endtrans %}{{ customer.amount }} €

    +

    {% trans %}Back{% endtrans %}

    + {% if customer.buyings.exists() %} +

    {% trans %}Account purchases{% endtrans %}

    +
    + + @@ -21,85 +21,85 @@ + + + + {% for i in customer.buyings.order_by('-date').all().filter( + date__year=year, date__month=month) %} + + + + + + + + + {% if i.is_owned_by(user) %} + + {% endif %} + + {% endfor %} + +
    {% trans %}Date{% endtrans %} {% trans %}Counter{% endtrans %} {% trans %}Barman{% endtrans %}{% trans %}Quantity{% endtrans %} {% trans %}Total{% endtrans %} {% trans %}Payment method{% endtrans %}
    {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}{{ i.counter }}{{ i.seller.get_display_name() }}{{ i.label }}{{ i.quantity }}{{ i.quantity * i.unit_price }} €{{ i.get_payment_method_display() }}{% trans %}Delete{% endtrans %}
    + {% endif %} + {% if customer.refillings.exists() %} +

    {% trans %}Reloads{% endtrans %}

    + + + + + + + + - - - {% for i in customer.buyings.order_by('-date').all().filter( + + + {% for i in customer.refillings.order_by('-date').filter( date__year=year, date__month=month) %} + + + + + + + {% if i.is_owned_by(user) %} + + {% endif %} + + {% endfor %} + +
    {% trans %}Date{% endtrans %}{% trans %}Counter{% endtrans %}{% trans %}Barman{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Payment method{% endtrans %}
    {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}{{ i.counter }}{{ i.operator.get_display_name() }}{{ i.amount }} €{{ i.get_payment_method_display() }}{% trans %}Delete{% endtrans %}
    + {% endif %} + {% if customer.user.invoices.exists() %} +

    {% trans %}Eboutic invoices{% endtrans %}

    + + + + + + + + + + {% for i in customer.user.invoices.order_by('-date').all().filter( date__year=year, date__month=month) %} - - - - - - - - {% if i.is_owned_by(user) %} - - {% endif %} - -{% endfor %} - -
    {% trans %}Date{% endtrans %}{% trans %}Items{% endtrans %}{% trans %}Amount{% endtrans %}
    {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}{{ i.counter }}{{ i.seller.get_display_name() }}{{ i.label }}{{ i.quantity }}{{ i.quantity * i.unit_price }} €{{ i.get_payment_method_display() }}{% trans %}Delete{% endtrans %}
    -{% endif %} -{% if customer.refillings.exists() %} -

    {% trans %}Reloads{% endtrans %}

    - - - - - - - - - - - - {% for i in customer.refillings.order_by('-date').filter( date__year=year, date__month=month) %} - - - - - - - {% if i.is_owned_by(user) %} - - {% endif %} - -{% endfor %} - -
    {% trans %}Date{% endtrans %}{% trans %}Counter{% endtrans %}{% trans %}Barman{% endtrans %}{% trans %}Amount{% endtrans %}{% trans %}Payment method{% endtrans %}
    {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}{{ i.counter }}{{ i.operator.get_display_name() }}{{ i.amount }} €{{ i.get_payment_method_display() }}{% trans %}Delete{% endtrans %}
    -{% endif %} -{% if customer.user.invoices.exists() %} -

    {% trans %}Eboutic invoices{% endtrans %}

    - - - - - - - - - - {% for i in customer.user.invoices.order_by('-date').all().filter( - date__year=year, date__month=month) %} - - - + - - -{% endfor %} - -
    {% trans %}Date{% endtrans %}{% trans %}Items{% endtrans %}{% trans %}Amount{% endtrans %}
    {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }} + {{ i.date|localtime|date(DATETIME_FORMAT) }} - {{ i.date|localtime|time(DATETIME_FORMAT) }}
      - {% for it in i.items.all() %} + {% for it in i.items.all() %}
    • {{ it.quantity }} x {{ it.product_name }} - {{ it.product_unit_price }} €
      • - {% endfor %} + {% endfor %}
    -     		{{ i.get_total() }} €
    + + {{ i.get_total() }} € + + {% endfor %} + + {% endif %} {% else %} -

    {% trans %}User has no account{% endtrans %}

    +

    {% trans %}User has no account{% endtrans %}

    {% endif %}

    {% trans %}Back{% endtrans %}

    {% endblock %} diff --git a/core/templates/core/user_clubs.jinja b/core/templates/core/user_clubs.jinja index f6e96b9a..324f8389 100644 --- a/core/templates/core/user_clubs.jinja +++ b/core/templates/core/user_clubs.jinja @@ -1,80 +1,80 @@ {% extends "core/base.jinja" %} {% block title %} - {% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s club(s){% endtrans %} {% endblock %} {% block content %} -

    {% trans%}Club(s){% endtrans %}

    -
    -

    {% trans%}Current club(s) :{% endtrans %}

    -
    - +

    {% trans%}Club(s){% endtrans %}

    +
    +

    {% trans%}Current club(s) :{% endtrans %}

    +
    +
    - - - - - - - - + + + + + + + + - {% for m in profile.memberships.filter(end_date=None).all() %} + {% for m in profile.memberships.filter(end_date=None).all() %} - - - - - {% if m.can_be_edited_by(user) %} + + + + + {% if m.can_be_edited_by(user) %} - {% endif %} - {% if user.is_root %} - - {% endif %} + {% endif %} + {% if user.is_root %} + + {% endif %} - {% endfor %} + {% endfor %} -
    {% trans %}Club{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}Since{% endtrans %}
    {% trans %}Club{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}Since{% endtrans %}
    {{ m.club }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{{ m.club }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{% trans %}Mark as old{% endtrans %}{% trans %}Delete{% endtrans %}{% trans %}Delete{% endtrans %}
    -
    -

    {% trans%}Old club(s) :{% endtrans %}

    -
    - +
    +
    +

    {% trans%}Old club(s) :{% endtrans %}

    +
    + - - - - - - + + + + + + - + - {% for m in profile.memberships.exclude(end_date=None).all() %} + {% for m in profile.memberships.exclude(end_date=None).all() %} - - - - - - {% if user.is_root %} - - {% endif %} + + + + + + {% if user.is_root %} + + {% endif %} - {% endfor %} + {% endfor %} -
    {% trans %}Club{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}
    {% trans %}Club{% endtrans %}{% trans %}Role{% endtrans %}{% trans %}Description{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}
    {{ m.club }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{{ m.end_date }}{% trans %}Delete{% endtrans %}{{ m.club }}{{ settings.SITH_CLUB_ROLES[m.role] }}{{ m.description }}{{ m.start_date }}{{ m.end_date }}{% trans %}Delete{% endtrans %}
    + -{% if - profile.mailing_subscriptions.exists() - and (profile.id == user.id or user.is_root or user.is_com_admin) -%} -

    {% trans %}Subscribed mailing lists{% endtrans %}

    - {% for sub in profile.mailing_subscriptions.all() %} -

    {{ sub.mailing.email }} {% trans %}Unsubscribe{% endtrans %}

    - {% endfor %} + {% if + profile.mailing_subscriptions.exists() + and (profile.id == user.id or user.is_root or user.is_com_admin) + %} +

    {% trans %}Subscribed mailing lists{% endtrans %}

    + {% for sub in profile.mailing_subscriptions.all() %} +

    {{ sub.mailing.email }} {% trans %}Unsubscribe{% endtrans %}

    + {% endfor %} {% endif %} {% endblock %} diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja index b7651b88..9f5824fc 100644 --- a/core/templates/core/user_detail.jinja +++ b/core/templates/core/user_detail.jinja @@ -2,279 +2,279 @@ {% from "core/macros.jinja" import show_slots, show_tokens, user_subscription %} {%- block additional_css -%} - + {%- endblock -%} {% block title %} -{% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %} + {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %} {% endblock %} {% block additional_js %} - + {% endblock %} {% block content %} -