From 0fd448f50155500e60d0b813136139a0082203cd Mon Sep 17 00:00:00 2001 From: pavel Date: Mon, 30 Mar 2015 13:14:59 +0000 Subject: [PATCH] calendar bugs --- templates/client/includes/accounts/calendar_table.html | 6 +++++- .../static_client/js/_modules/page.profile.calendar.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/client/includes/accounts/calendar_table.html b/templates/client/includes/accounts/calendar_table.html index d262c3ef..d783eb54 100644 --- a/templates/client/includes/accounts/calendar_table.html +++ b/templates/client/includes/accounts/calendar_table.html @@ -83,8 +83,12 @@ {% if day.month == event.data_begin.month %} {% if day.day == event.data_begin.day %} + {% comment %}
-
+ {% endcomment %} +
+ +

{{ event.name|safe }}

diff --git a/templates/client/static_client/js/_modules/page.profile.calendar.js b/templates/client/static_client/js/_modules/page.profile.calendar.js index aac71b92..cf3bee3e 100644 --- a/templates/client/static_client/js/_modules/page.profile.calendar.js +++ b/templates/client/static_client/js/_modules/page.profile.calendar.js @@ -84,12 +84,12 @@ if (EXPO.profile.calendar) { stepsCount = allDays / onestep; currenCount = allDays / currentDay; - result = stepsCount - Math.floor(currenCount); + result = Math.floor(stepsCount) - Math.floor(currenCount); self.currentDay =currentDay; if (result) { - result--; + //result--; offset = onestep * result * width; } else {