arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar

Browse Source
This commit is contained in:
David Taylor
2015-04-20 15:20:29 +01:00
parent ca94c0b31b 0d719b328f
commit 013fa7441b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/forms.py
View File

@@ -58,7 +58,7 @@ class EventForm(forms.ModelForm):
self.fields['end_date'].widget.format = '%Y-%m-%d' 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['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): def init_items(self):
self.items = self.process_items_json() self.items = self.process_items_json()

2
RIGS/models.py
View File

@@ -19,7 +19,7 @@ class Profile(AbstractUser):
def profile_picture(self): def profile_picture(self):
url = "" url = ""
if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None: 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 return url
@property @property

4
RIGS/templates/RIGS/event_table.html
View File

@@ -69,13 +69,13 @@
{{ event.start_date|date:"(Y-m-d)" }}<br/> {{ event.start_date|date:"(Y-m-d)" }}<br/>
</dd> </dd>
{% endif %} {% 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 %}
<dt>Event ends</dt> <dt>Event ends</dt>
<dd> <dd>
{{ event.end_time|date:"H:i" }}<br/> {{ event.end_time|date:"H:i" }}<br/>
{{ event.end_date|date:"(Y-m-d)" }} {{ event.end_date|date:"(Y-m-d)" }}
</dd> </dd>
{% endif %} {% endif %}{% endif %}
</dl> </dl>
{% endif %} {% endif %}
</td> </td>