diff --git a/RIGS/forms.py b/RIGS/forms.py index ab85a460..640a2a15 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -58,7 +58,7 @@ class EventForm(forms.ModelForm): self.fields['end_date'].widget.format = '%Y-%m-%d' self.fields['access_at'].widget.format = '%Y-%m-%dT%H:%M:%S' - self.fields['access_at'].widget.format = '%Y-%m-%dT%H:%M:%S' + self.fields['meet_at'].widget.format = '%Y-%m-%dT%H:%M:%S' def init_items(self): self.items = self.process_items_json() diff --git a/RIGS/models.py b/RIGS/models.py index f31ff77d..a9b85f03 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -19,7 +19,7 @@ class Profile(AbstractUser): def profile_picture(self): url = "" if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None: - url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email).hexdigest() + "?d=identicon&s=500" + url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email).hexdigest() + "?d=wavatar&s=500" return url @property diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html index bddced3d..cf87f53d 100644 --- a/RIGS/templates/RIGS/event_table.html +++ b/RIGS/templates/RIGS/event_table.html @@ -69,13 +69,13 @@ {{ event.start_date|date:"(Y-m-d)" }}
{% endif %} - {% if event.end_time and event.start_time != event.end_time %} + {% if event.end_time%}{% if event.start_date != event.end_date or event.start_time != event.end_time %}
Event ends
{{ event.end_time|date:"H:i" }}
{{ event.end_date|date:"(Y-m-d)" }}
- {% endif %} + {% endif %}{% endif %} {% endif %}