Changeset 22103
- Timestamp:
- 2012/11/16 19:18:48 (11 years ago)
- Location:
- branches/version-2_12-multilang
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-multilang
- Property svn:mergeinfo changed
/branches/version-2_12-dev merged: 22097-22098
- Property svn:mergeinfo changed
-
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/contact_mail.tpl
r22058 r22103 20 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 21 *}--> 22 23 22 <!--{$tpl_header}--> 24 23 ※本メールは自動配信メールです。 -
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_mail.tpl
r22058 r22103 20 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 21 *}--> 22 23 22 ※本メールは自動配信メールです。 24 23 等幅フォント(MSゴシック12ポイント、Osaka-等幅など)で -
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/customer_regist_mail.tpl
r22058 r22103 20 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 21 *}--> 22 23 22 ※本メールは自動配信メールです。 24 23 等幅フォント(MSゴシック12ポイント、Osaka-等幅など)で -
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/forgot_mail.tpl
r21867 r22103 22 22 */ 23 23 *}--> 24 25 24 パスワードを変更いたしました。 26 25 -
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/mail_title.tpl
r21867 r22103 22 22 */ 23 23 *}--> 24 25 24 【<!--{$tpl_shopname}-->】 <!--{$tpl_mailtitle}--> -
branches/version-2_12-multilang/data/Smarty/templates/default/mail_templates/order_mail.tpl
r21867 r22103 20 20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 21 *}--> 22 23 22 <!--{$arrOrder.order_name01}--> <!--{$arrOrder.order_name02}--> 様 24 23 -
branches/version-2_12-multilang/data/Smarty/templates/mobile/mail_templates/mail_title.tpl
r21867 r22103 22 22 */ 23 23 *}--> 24 25 24 【<!--{$tpl_shopname}-->】 <!--{$tpl_mailtitle}--> -
branches/version-2_12-multilang/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
r21867 r22103 22 22 */ 23 23 *}--> 24 25 24 <!--{$arrOrder.order_name01}--> <!--{$arrOrder.order_name02}--> 様 26 25 -
branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
r21867 r22103 87 87 * 88 88 * @param integer $disp_month 表示する月数 89 * @return array $arrCalendarカレンダー情報の配列を返す89 * @return array カレンダー情報の配列を返す 90 90 */ 91 91 function lfGetCalendar($disp_month = 1) { 92 $arrCalendar = array(); 93 $today = date('Y/m/d'); 92 94 93 $today = date('Y/m/d'); 94 for ($j = 0; $j <= $disp_month-1; ++$j) { 95 $year = date('Y'); 96 $month = date('n') + $j; 97 if ($month > 12) { 98 $month = $month%12; 99 $year = $year + $month%12; 100 } 95 for ($j = 0; $j <= $disp_month - 1; $j++) { 96 $time = mktime(0, 0, 0, date('n') + $j, 1); 97 $year = date('Y', $time); 98 $month = date('n', $time); 101 99 102 100 $objMonth = new Calendar_Month_Weekdays($year, $month, 0); … … 104 102 $i = 0; 105 103 while ($objDay = $objMonth->fetch()) { 106 if ($month == $objDay->month) { 107 $arrCalendar[$j][$i]['in_month'] = true; 108 } else { 109 $arrCalendar[$j][$i]['in_month'] = false; 110 } 111 $arrCalendar[$j][$i]['first'] = $objDay->first; 112 $arrCalendar[$j][$i]['last'] = $objDay->last; 113 $arrCalendar[$j][$i]['empty'] = $objDay->empty; 114 $arrCalendar[$j][$i]['year'] = $year; 115 $arrCalendar[$j][$i]['month'] = $month; 116 $arrCalendar[$j][$i]['day'] = $objDay->day; 117 if ($this->lfCheckHoliday($year, $month, $objDay->day)) { 118 $arrCalendar[$j][$i]['holiday'] = true; 119 } else { 120 $arrCalendar[$j][$i]['holiday'] = false; 121 } 104 $arrCalendar[$j][$i]['in_month'] = $month == $objDay->month; 105 $arrCalendar[$j][$i]['first'] = $objDay->first; 106 $arrCalendar[$j][$i]['last'] = $objDay->last; 107 $arrCalendar[$j][$i]['empty'] = $objDay->empty; 108 $arrCalendar[$j][$i]['year'] = $year; 109 $arrCalendar[$j][$i]['month'] = $month; 110 $arrCalendar[$j][$i]['day'] = $objDay->day; 111 $arrCalendar[$j][$i]['holiday'] = $this->lfCheckHoliday($year, $month, $objDay->day); 112 $arrCalendar[$j][$i]['today'] = $today === sprintf('%04d/%02d/%02d', $year, $month, $objDay->day); 122 113 123 if ($today === sprintf('%04d/%02d/%02d', $year, $month, $objDay->day)) { 124 $arrCalendar[$j][$i]['today'] = true; 125 } 126 127 ++$i; 114 $i++; 128 115 } 129 116 }
Note: See TracChangeset
for help on using the changeset viewer.