remotes/origin/1203
pavel 11 years ago
parent 4ccd3066ea
commit 2db0813f74
  1. 15
      templates/client/includes/accounts/calendar_table.html
  2. 10
      templates/client/static_client/js/app.js
  3. 10
      templates/client/static_client/js/main.js
  4. 2
      templates/client/static_client/js/min/app.min.js

@ -15,7 +15,7 @@
</div> </div>
</header> </header>
<div class="cal-wrap"> <div class="cal-wrap">
<div class="calendar-container"> <div class="calendar-container" id="calendar-container">
<div class="scroll-content"> <div class="scroll-content">
<table> <table>
<tbody class="cal-days"> <tbody class="cal-days">
@ -136,4 +136,17 @@
</div> </div>
</div> </div>
</div> </div>
{% block scripts %}
<script src="{% static 'client/js/_modules/page.profile.calendar.js' %}"></script>
<script>
EXPO.calendar.init({
containerId: 'calendar-container',
currentDayClass:'c-cur',
daysClass:'cal-days',
bodyClass: 'cal-body'
});
</script>
{% endblock %}

@ -2119,11 +2119,11 @@ function placeInput(width){
}); });
/* Custom scroll для календаря*/ /* Custom scroll для календаря*/
$('div.calendar-container').each(function () { //$('div.calendar-container').each(function () {
var $scrollContainer = $(this); // var $scrollContainer = $(this);
var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true }); // var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true });
$scrollContainer.mCustomScrollbar(calScrollOptions); // $scrollContainer.mCustomScrollbar(calScrollOptions);
}); //});
/* Временная функция для указания файла */ /* Временная функция для указания файла */
$('input[type="file"]').each(function () { $('input[type="file"]').each(function () {

@ -1052,11 +1052,11 @@ function placeInput(width){
}); });
/* Custom scroll для календаря*/ /* Custom scroll для календаря*/
$('div.calendar-container').each(function () { //$('div.calendar-container').each(function () {
var $scrollContainer = $(this); // var $scrollContainer = $(this);
var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true }); // var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true });
$scrollContainer.mCustomScrollbar(calScrollOptions); // $scrollContainer.mCustomScrollbar(calScrollOptions);
}); //});
/* Временная функция для указания файла */ /* Временная функция для указания файла */
$('input[type="file"]').each(function () { $('input[type="file"]').each(function () {

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save