diff --git a/AKPlan/templates/AKPlan/encode_events.html b/AKPlan/templates/AKPlan/encode_events.html index b53dae01b4bd98e71d82f6c54706cacfe498b910..10db556de477a4641732f28fdd5bdc95ae50d210 100644 --- a/AKPlan/templates/AKPlan/encode_events.html +++ b/AKPlan/templates/AKPlan/encode_events.html @@ -6,6 +6,7 @@ {% if slot.start %} { 'title': '{{ slot.ak.short_name }}', + 'description': '{{ slot.ak.name }}', 'start': '{{ slot.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}', 'end': '{{ slot.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}', 'resourceId': '{{ slot.room.title }}', diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html index f4fc250ad3e170a34602ceb560d6cac8ef4769db..976ce496b06f90075bf76a106fc3708b77fbc415 100644 --- a/AKPlan/templates/AKPlan/plan_index.html +++ b/AKPlan/templates/AKPlan/plan_index.html @@ -17,7 +17,6 @@ <script src='{% static 'AKPlan/vendor/fullcalendar/timeline/main.js' %}'></script> <script src='{% static 'AKPlan/vendor/fullcalendar/resource-common/main.js' %}'></script> <script src='{% static 'AKPlan/vendor/fullcalendar/resource-timeline/main.js' %}'></script> - <script> document.addEventListener('DOMContentLoaded', function () { var planEl = document.getElementById('planCalendar'); @@ -51,6 +50,9 @@ buttonText: '{% trans "Event" %}', } }, + eventRender: function(info) { + $(info.el).tooltip({title: info.event.extendedProps.description}); + }, editable: false, allDaySlot: false, nowIndicator: true, @@ -64,6 +66,9 @@ }); plan.render(); + + // Scroll to current time + $('.fc-scroller').scrollLeft($('.fc-now-indicator').position().left); }); </script> {% endif %} diff --git a/AKPlan/templates/AKPlan/plan_wall.html b/AKPlan/templates/AKPlan/plan_wall.html index 541bfd6b87d00fe3cf1d4bea94a1f60af37ad026..c99ff3c8738afa028c8a4ae4ab713e6f353cb4d0 100644 --- a/AKPlan/templates/AKPlan/plan_wall.html +++ b/AKPlan/templates/AKPlan/plan_wall.html @@ -53,7 +53,9 @@ start: '{{ start | timezone:event.timezone | date:"Y-m-d H:i:s" }}', end: '{{ end | timezone:event.timezone | date:"Y-m-d H:i:s"}}', }, - scrollTime: '{{ start | timezone:event.timezone | date:"H:i:s" }}', + eventRender: function(info) { + $(info.el).tooltip({title: info.event.extendedProps.description}); + }, editable: false, allDaySlot: false, nowIndicator: true, @@ -75,6 +77,9 @@ }); plan.render(); + + // Scroll to current time + $('.fc-scroller').scrollLeft($('.fc-now-indicator').position().left); }); </script>