Changeset 1161 for OpenPNE/branches

Timestamp:

Dec 14, 2006, 5:12:03 PM (16 years ago)

Author:

ebihara

Message:

#315 BIZモジュール上で祝日の表示ができるように

Location:

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp_biz/modules/biz

Files:

• lib/smarty_functions.php (modified) (1 diff)
• page/fh_biz_schedule_calendar.php (modified) (1 diff)
• templates/fh_biz_schedule_calendar.tpl (modified) (1 diff)
• templates/inc_biz_schedule_week.tpl (modified) (3 diffs)

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp_biz/modules/biz/lib/smarty_functions.php

@@ -107 +107 @@
                 'event' => p_h_home_event4c_member_id($y, $m, $d, $member_id),
                 'schedule' => $schedule,
+                'holiday' => db_c_holiday_list4date($m, $d),
             );
 

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp_biz/modules/biz/page/fh_biz_schedule_calendar.php

@@ -74 +74 @@
                 'event' => $event_list[$day],
                 'schedule' => $schedule,
+                'holiday' => db_c_holiday_list4date($month, $day),
               );
               $item['day'] = $day;

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl

@@ -79 +79 @@
 ({/if})<br>
 <a href="({t_url m=biz a=page_fh_biz_schedule_add})&amp;begin_date=({$year})({$month|string_format:'%02d'})({$item.day|string_format:'%02d'})"><img src="./skin/icon_schedule.gif" class="icon"></a><br>
+
+({* 祝日 *})
+({foreach from=$item.holiday item=item_holiday})
+<span class=" c_02">({$item_holiday})</span><br>
+({/foreach})
 
 ({* スケジュール *})

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

@@ -140 +140 @@
 <td class="bg_05 border_01" style="width:131px;border-top:none;border-right:none;" align="center" valign="top"><img src="./skin/dummy.gif" style="width:130px;height:10px;" class="dummy"></td>
 ({foreach from=$calendar item=item name=calendar})
-<td class="({if $item.now})bg_09({else})bg_05({/if}) padding_ss border_01({if $item.dayofweek == "日"}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if})" align="center">
+<td class="({if $item.now})bg_09({else})bg_05({/if}) padding_ss border_01({if $item.dayofweek == "日" || $item.holiday}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if})" align="center">
 
 ({if $item.now})<span class="b_b">({/if})
@@ -205 +205 @@
 </td>
 ({foreach from=$calendar item=item name=calendar})
-<td class="({if $item.now})bg_09({else})bg_02({/if}) border_01({if $item.dayofweek == "日"}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if}) border-bottom:none;" align="left" valign="top">
+<td class="({if $item.now})bg_09({else})bg_02({/if}) border_01({if $item.dayofweek == "日" || $item.holiday}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if}) border-bottom:none;" align="left" valign="top">
+
+({* 祝日 *})
+<div class="padding_s">
+({foreach from=$item.holiday item=item_holiday})
+({$item_holiday})<br>
+({/foreach})
+</div>
 
 ({* スケジュール(時間有) *})
@@ -257 +264 @@
 
 ({foreach from=$calendar item=item name=calendar})
-<td class="({if $item.now})bg_09({else})bg_02({/if}) border_01({if $item.dayofweek == "日"}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if})" align="left" valign="top">
+<td class="({if $item.now})bg_09({else})bg_02({/if}) border_01({if $item.dayofweek == "日" || $item.holiday}) c_02({elseif $item.dayofweek == "土"}) c_03({else})({/if})" style="width:81px;border-top:none;({if !$smarty.foreach.calendar.last}) border-right:none;({/if})" align="left" valign="top">
 
 ({if $cmd == 'h'})