Merge branch 'calendarv2'

widget_princessgabi/widget_calendar/models.py

@@ -17,8 +17,8 @@ class Location(models.Model):
         return self.venue
 
 class Event(models.Model):
-    target_datetime = models.DateTimeField('target date')
     activity = models.TextField()
+    target_datetime = models.DateTimeField('target date/time')
     estimated_hours = models.FloatField() 
     location = models.ForeignKey(Location, on_delete = models.CASCADE)
     course = models.ForeignKey(Course, on_delete = models.CASCADE)

widget_princessgabi/widget_calendar/templates/widget_calendar/event-details.html

@@ -13,13 +13,11 @@
 {% block body %}
 <div class="event-content">
     {% block content %}
-    <div class="details">
-        <h4>Date and Time: {{ object.target_datetime|date:'m/d/Y' }} {{ object.target_datetime|date:'h:i A' }} </h4>
+    <h4>Date and Time: {{ object.target_datetime|date:'m/d/Y' }}, {{ object.target_datetime|date:'h:i A' }} </h4>
     <h4>Estimated Hours: {{ object.estimated_hours }}</h4>
     <h4>{{ object.course.code }} {{ object.course.title }} - {{ object.course.section }}</h4>
     <h4>Mode: {{ object.location.mode }}</h4>
     <h4>Venue: {{ object.location.venue }}</h4>
-    </div>
     {% endblock %}
     <a href="{{object.get_absolute_url}}../edit" class="edit-btn"><i class="fa fa-edit"></i>Edit Activity</a>
 </div>