Changeset 18039


Ignore:
Timestamp:
2009/06/04 01:55:16 (12 years ago)
Author:
Seasoft
Message:

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

Location:
branches/comu-ver2/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/Smarty/templates/default/admin/basis/index.tpl

    r17997 r18039  
    7575        <p> 
    7676          <span class="attention"><!--{$arrErr.pref}--></span> 
    77           <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" >               
     77          <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" > 
    7878            <option value="" selected="selected">都道府県を選択</option> 
    7979            <!--{html_options options=$arrPref selected=$arrForm.pref}--> 
     
    9696      <td> 
    9797        <span class="attention"><!--{$arrErr.tel01}--></span> 
    98         <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}-->" /> -  
    99         <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}-->" /> -  
     98        <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}-->" /> - 
     99        <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}-->" /> - 
    100100        <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}-->" /> 
    101101      </td> 
     
    105105      <td> 
    106106        <span class="attention"><!--{$arrErr.fax01}--></span> 
    107         <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}-->" /> -  
    108         <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}-->" /> -  
     107        <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}-->" /> - 
     108        <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}-->" /> - 
    109109        <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}-->" /> 
    110110      </td> 
  • branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

    r17713 r18039  
    130130                $arrCalendar[$j][$i]['month'] = $month; 
    131131                $arrCalendar[$j][$i]['day'] = $Day->day; 
    132                 #if ($this->lfCheckHoliday($month, $Day->day) || $Day->first || $Day->last) { 
    133132                if ($this->lfCheckHoliday($year, $month, $Day->day)) { 
    134133                    $arrCalendar[$j][$i]['holiday'] = true; 
     
    163162    } 
    164163 
    165  
    166164    // 休日チェック 
    167165    function lfCheckHoliday($year, $month, $day) { 
Note: See TracChangeset for help on using the changeset viewer.