From 6dc101a961f65b4d4ca24e881c88b8154d951f12 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 31 Mar 2015 16:50:14 +0100 Subject: [PATCH 1/4] Changed to wavatar default --- RIGS/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 94a07c71c7ad034e936fd6144a6f56ede2ce6dfb Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 19 Apr 2015 23:40:12 +0100 Subject: [PATCH 2/4] Fixed issue #61 - caused by typo in 0940d9f --- RIGS/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From b9d2f1e9aa0bd181b5ec3374dde97779ab319a55 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 20 Apr 2015 00:15:10 +0100 Subject: [PATCH 3/4] Fix for issue #57 --- RIGS/templates/RIGS/event_table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html index bddced3d..60aa7afd 100644 --- a/RIGS/templates/RIGS/event_table.html +++ b/RIGS/templates/RIGS/event_table.html @@ -69,7 +69,7 @@ {{ event.start_date|date:"(Y-m-d)" }}
{% endif %} - {% if event.end_time and event.start_time != event.end_time %} + {% if event.end_time and (event.start_time != event.end_time or event.start_date != event.end_date) %}
Event ends
{{ event.end_time|date:"H:i" }}
From 12123f7b253251e3d331327cb8534df1c8404a4a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 20 Apr 2015 00:59:00 +0100 Subject: [PATCH 4/4] Actual fix for #57 (Django templates don't like parenthesis in logic) --- RIGS/templates/RIGS/event_table.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html index 60aa7afd..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 or event.start_date != event.end_date) %} + {% 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 %}