Changeset 19483 for branches/camp
- Timestamp:
- 2010/11/07 03:20:02 (13 years ago)
- bzr:base-revision:
- nanasess@fsm.ne.jp-20101106134610-i1ml692nb6afkft4
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.jp>
- bzr:file-ids:
data/Smarty/templates/default/bloc/calendar.tpl 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fbloc%2Fcalendar.tpl
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 17073@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Calendar.php
html/user_data/packages/default/jquery.jCal/jCal.css jcal.css-20101106134229-cb7jzzqcy6caaucl-4
html/user_data/packages/default/jquery.jCal/jCal.js jcal.js-20101106134229-cb7jzzqcy6caaucl-5- bzr:mapping-version:
- v4
- bzr:merge:
nanasess@fsm.ne.jp-20101106181919-onykq3et6l5ye4mn- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20101106181955-y86svepnyc8xajfc
- bzr:revno:
- 2366
- bzr:revprop:branch-nick:
- branches/camp/camp-2_5-A
- bzr:root:
- branches/camp/camp-2_5-A
- bzr:text-parents:
data/Smarty/templates/default/bloc/calendar.tpl nanasess@fsm.ne.jp-20101106134528-cmpo8uzzougo8igk
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php ohkouchi@loop-az.jp-20100614082857-g3n9wn9zakpc7a0m
html/user_data/packages/default/jquery.jCal/jCal.css nanasess@fsm.ne.jp-20101106134528-cmpo8uzzougo8igk
html/user_data/packages/default/jquery.jCal/jCal.js nanasess@fsm.ne.jp-20101106134528-cmpo8uzzougo8igk- bzr:text-revisions:
data/Smarty/templates/default/bloc/calendar.tpl nanasess@fsm.ne.jp-20101106181919-onykq3et6l5ye4mn
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php nanasess@fsm.ne.jp-20101106181919-onykq3et6l5ye4mn
html/user_data/packages/default/jquery.jCal/jCal.css nanasess@fsm.ne.jp-20101106181919-onykq3et6l5ye4mn
html/user_data/packages/default/jquery.jCal/jCal.js nanasess@fsm.ne.jp-20101106181919-onykq3et6l5ye4mn- bzr:timestamp:
- 2010-11-07 03:19:55.286999941 +0900
- bzr:user-agent:
- bzr2.1.1+bzr-svn1.0.2
- svn:original-date:
- 2010-11-06T18:19:55.287000Z
- Location:
- branches/camp/camp-2_5-A
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/camp/camp-2_5-A/data/Smarty/templates/default/bloc/calendar.tpl
r19140 r19483 24 24 <!--{* TODO 休日表示などの処理は未実装 *}--> 25 25 <script type="text/javascript">//<![CDATA[ 26 var holidays = <!--{$arrHoliday}-->; // TODO 27 var regularHolidays = <!--{$arrRegularHoliday}-->; // TODO 26 28 $(function() { 27 29 $('#blockCalendar').jCal({ … … 30 32 dow: ['日', '月', '火', '水', '木', '金', '土'], 31 33 ml: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'], 32 callback: changeCalSize(22)34 callback: jCalCallback() 33 35 }); 36 var today = new Date(); 37 var dToday = $('div[id*=d_' + (today.getMonth() + 1) + '_' + today.getDate() + '_' + today.getFullYear() + ']'); 38 dToday.addClass('tday'); 39 40 $('.jCalMo .day').each(function() { 41 var aDays = $(this).attr('id').split('_'); 42 var hDate = new Date(aDays[3], aDays[1] - 1, aDays[2]); 43 var rDay = hDate.getDay(); 44 for (var r in regularHolidays) { 45 if (rDay == regularHolidays[r]) { 46 addClassByCal(hDate.getFullYear(), hDate.getMonth() + 1, 47 hDate.getDate(), 'hday'); 48 } 49 } 50 }); 51 52 for (var m in holidays) { 53 for (var d in holidays[m]) { 54 addClassByCal(today.getFullYear(), m, holidays[m][d], 'hday') 55 } 56 } 57 58 function addClassByCal(year, month, date, className) { 59 $('div[id*=d_' + month + '_' + date + '_' + year + ']') 60 .addClass(className); 61 } 34 62 }); 35 function changeCalSize (daySize) {36 var daySize = (parseInt(daySize) || 30);63 function jCalCallback (day, days) { 64 var daySize = 22; 37 65 var monthSize = ( daySize + 2 ) * 7; 38 66 var titleSize = monthSize - 35; -
branches/camp/camp-2_5-A/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
r18701 r19483 27 27 require_once($current_dir . "/../../../../module/Calendar/Month/Weekdays.php"); 28 28 require_once(CLASS_PATH . "pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php"); 29 require_once(DATA_PATH . 'module/Services/JSON.php'); 29 30 30 31 /** … … 62 63 $objView = new SC_SiteView(false); 63 64 } 65 $objJson = new Services_JSON(); 64 66 65 // 休日取得 取得66 $this->arrHoliday = $ this->lfGetHoliday();67 // 休日取得 68 $this->arrHoliday = $objJson->encode($this->lfGetHoliday()); 67 69 68 // 定休日取得取得 69 $this->arrRegularHoliday = $this->lfGetRegularHoliday(); 70 71 // カレンダーデータ取得 72 $this->arrCalendar = $this->lfGetCalendar(2); 70 // 定休日取得 71 $this->arrRegularHoliday = $objJson->encode($this->lfGetRegularHoliday()); 73 72 74 73 $objView->assignobj($this); -
branches/camp/camp-2_5-A/html/user_data/packages/default/jquery.jCal/jCal.css
r19140 r19483 146 146 overflow:hidden; 147 147 } 148 .jCalMo .tday { 149 background-color: #ff6600; 150 } 151 .jCalMo .hday { 152 background-color: #ff3300; 153 } -
branches/camp/camp-2_5-A/html/user_data/packages/default/jquery.jCal/jCal.js
r19140 r19483 127 127 '<div class="jCalMove"></div>' + 128 128 '</div>'); 129 $('.jCalMove', e.data._target).css('margin-left', ( ( mD.w / e.data.showMonths ) * -1 ) + 'px').css('opacity', 0.5).animate({ marginLeft:'0px' }, 'fast',129 $('.jCalMove', e.data._target).css('margin-left', ( ( mD.w / e.data.showMonths ) * -1 ) + 'px').css('opacity', 0.5).animate({ marginLeft:'0px' }, 1, 130 130 function () { 131 131 $(this).children('.jCalMo:not(:last)').appendTo( $(e.data._target) ); … … 159 159 '<div class="jCalMove"></div>' + 160 160 '</div>'); 161 $('.jCalMove', e.data._target).css('opacity', 0.5).animate({ marginLeft:( ( mD.w / e.data.showMonths ) * -1 ) + 'px' }, 'fast',161 $('.jCalMove', e.data._target).css('opacity', 0.5).animate({ marginLeft:( ( mD.w / e.data.showMonths ) * -1 ) + 'px' }, 1, 162 162 function () { 163 163 $(this).children('.jCalMo:not(:first)').appendTo( $(e.data._target) );
Note: See TracChangeset
for help on using the changeset viewer.