diff --git a/core/models.py b/core/models.py index c3135377..40323810 100644 --- a/core/models.py +++ b/core/models.py @@ -7,6 +7,8 @@ from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.conf import settings from django.db import transaction +from django.contrib.staticfiles.storage import staticfiles_storage +from django.utils.html import escape from phonenumber_field.modelfields import PhoneNumberField from datetime import datetime, timedelta, date @@ -281,6 +283,12 @@ class User(AbstractBaseUser): return "%s (%s)" % (self.get_full_name(), self.nick_name) return self.get_full_name() + def get_age(self): + """ + Returns the age + """ + return timezone.now().year - self.date_of_birth.year + def email_user(self, subject, message, from_email=None, **kwargs): """ Sends an email to this User. @@ -360,9 +368,9 @@ class User(AbstractBaseUser): %s """ % ( - self.profile_pict.get_download_url() if self.profile_pict else "/static/core/img/na.gif", + self.profile_pict.get_download_url() if self.profile_pict else staticfiles_storage.url("core/img/na.gif"), _("Profile"), - self.get_display_name(), + escape(self.get_display_name()), ) diff --git a/core/static/core/js/script.js b/core/static/core/js/script.js index ded1a1cb..1a36dee0 100644 --- a/core/static/core/js/script.js +++ b/core/static/core/js/script.js @@ -35,8 +35,4 @@ $( function() { popup.html('
'); popup.dialog({title: $(this).text()}).dialog( "open" ); }); - $('.select_date').datepicker({ - changeMonth: true, - changeYear: true - }); } ); diff --git a/core/static/core/js/ui/i18n/datepicker-fr.js b/core/static/core/js/ui/i18n/datepicker-fr.js new file mode 100644 index 00000000..9e39fbd6 --- /dev/null +++ b/core/static/core/js/ui/i18n/datepicker-fr.js @@ -0,0 +1,39 @@ +/* French initialisation for the jQuery UI date picker plugin. */ +/* Written by Keith Wood (kbwood{at}iinet.com.au), + Stéphane Nahmani (sholby@sholby.net), + Stéphane Raimbault