Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar

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()

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

RIGS/templates/RIGS/event_table.html

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