Changeset 18039

Timestamp:

2009/06/04 01:55:16 (15 years ago)

Author:

Seasoft

Message:

正式版のソース整形をマージ。(ロジック変更無し)

Location:

branches/comu-ver2/data

Files:

• Smarty/templates/default/admin/basis/index.tpl (modified) (3 diffs)
• class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (modified) (2 diffs)

branches/comu-ver2/data/Smarty/templates/default/admin/basis/index.tpl

@@ -75 +75 @@
         <p>
           <span class="attention"><!--{$arrErr.pref}--></span>
-          <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" >              
+          <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" >
             <option value="" selected="selected">都道府県を選択</option>
             <!--{html_options options=$arrPref selected=$arrForm.pref}-->
@@ -96 +96 @@
       <td>
         <span class="attention"><!--{$arrErr.tel01}--></span>
-        <input type="text" name="tel01" value="<!--{$arrForm.tel01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> - 
-        <input type="text" name="tel02" value="<!--{$arrForm.tel02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> - 
+        <input type="text" name="tel01" value="<!--{$arrForm.tel01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> -
+        <input type="text" name="tel02" value="<!--{$arrForm.tel02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> -
         <input type="text" name="tel03" value="<!--{$arrForm.tel03}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" />
       </td>
@@ -105 +105 @@
       <td>
         <span class="attention"><!--{$arrErr.fax01}--></span>
-        <input type="text" name="fax01" value="<!--{$arrForm.fax01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> - 
-        <input type="text" name="fax02" value="<!--{$arrForm.fax02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> - 
+        <input type="text" name="fax01" value="<!--{$arrForm.fax01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> -
+        <input type="text" name="fax02" value="<!--{$arrForm.fax02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> -
         <input type="text" name="fax03" value="<!--{$arrForm.fax03}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax03 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" />
       </td>

branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

@@ -130 +130 @@
                 $arrCalendar[$j][$i]['month'] = $month;
                 $arrCalendar[$j][$i]['day'] = $Day->day;
-                #if ($this->lfCheckHoliday($month, $Day->day) || $Day->first || $Day->last) {
                 if ($this->lfCheckHoliday($year, $month, $Day->day)) {
                     $arrCalendar[$j][$i]['holiday'] = true;
@@ -163 +162 @@
     }
 
-
     // 休日チェック
     function lfCheckHoliday($year, $month, $day) {