Changeset 1159 for OpenPNE/branches

Timestamp:

Dec 14, 2006, 4:39:12 PM (16 years ago)

Author:

ebihara

Message:

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

Location:

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp

Files:

• lib/db/etc.php (modified) (1 diff)
• modules/pc/page/h_calendar.php (modified) (1 diff)
• modules/pc/page/h_home.php (modified) (1 diff)
• modules/pc/templates/h_calendar.tpl (modified) (1 diff)
• modules/pc/templates/h_home.tpl (modified) (2 diffs)

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp/lib/db/etc.php

@@ -732 +732 @@
 }
 
+/**
+ * カレンダーの祝日を取得する
+ */
+function db_c_holiday_list4date($m, $d)
+{
+    $sql = 'SELECT name FROM c_holiday WHERE month = ? AND day = ?';
+    $params = array(intval($m), intval($d));
+    return db_get_col($sql, $params);
+}
 ?>

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp/modules/pc/page/h_calendar.php

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

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp/modules/pc/page/h_home.php

@@ -156 +156 @@
                 'event' => p_h_home_event4c_member_id($y, $m, $d, $u),
                 'schedule' => p_h_calendar_c_schedule_list4date($y, $m, $d, $u),
+                'holiday' => db_c_holiday_list4date($m, $d),
             );
             if ($w == 0 && $d == date('d')) {

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp/modules/pc/templates/h_calendar.tpl

@@ -81 +81 @@
 ({$item.day})
 ({/if})<br>
+
 ({if $add_schedule})
 <a href="({t_url m=pc a=page_h_schedule_add})&amp;year=({$ym.year_disp})&amp;month=({$ym.month_disp})&amp;day=({$item.day})"><img src="({t_img_url_skin filename=icon_schedule})" class="icon"></a><br>
+({/if})
+
+({* 祝日 *})
+({if $item.holiday})
+({foreach from=$item.holiday item=item_holiday})
+<span class=" c_02">({$item_holiday})</span><br>
+({/foreach})
 ({/if})
 

OpenPNE/branches/ebihara/prj_dev26_calendar/webapp/modules/pc/templates/h_home.tpl

@@ -923 +923 @@
 <tr>
 ({foreach from=$calendar item=item name=calendar})
-<td style="width:({if $smarty.foreach.calendar.last})64({else})60({/if})px;({if !$smarty.foreach.calendar.last})border-right:none;({/if})" align="left" valign="top" class="border_01 bg_0({if $item.now})9({else})2({/if})({if $item.dayofweek == "日"}) c_02({elseif $item.dayofweek == "土"}) c_03({/if}) padding_s">
+<td style="width:({if $smarty.foreach.calendar.last})64({else})60({/if})px;({if !$smarty.foreach.calendar.last})border-right:none;({/if})" align="left" valign="top" class="border_01 bg_0({if $item.now})9({else})2({/if})({if $item.dayofweek == "日" || $item.holiday}) c_02({elseif $item.dayofweek == "土"}) c_03({/if}) padding_s">
 ({if $item.now})<span class="b_b">({/if})
 
@@ -935 +935 @@
 
 <div>
+({* 祝日 *})
+({foreach from=$item.holiday item=item_holiday})
+({$item_holiday})<br>
+({/foreach})
+
 ({* 誕生日 *})
 ({foreach from=$item.birth item=item_birth})