Changeset 21719


Ignore:
Timestamp:
2012/04/09 04:32:30 (9 years ago)
Author:
Seasoft
Message:

#1431 (用語の揺れ)

  • 所在地

#1613 (typo修正・ソース整形・ソースコメントの改善)

Location:
branches/version-2_12-dev
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl

    r21695 r21719  
    4343                    $("#longitude").val(latlng.lng()); 
    4444                } else { 
    45                     alert('住所の場所が見つかりません'); 
     45                    alert('所在地の場所が見つかりません'); 
    4646                } 
    4747            }); 
    4848        } else { 
    49             alert('住所の場所が見つかりません'); 
     49            alert('所在地の場所が見つかりません'); 
    5050        } 
    5151    }); 
     
    163163                <span class="attention"><!--{$arrErr.zip02}--></span> 
    164164                〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="3" size="6" class="box6" style="<!--{if $arrErr.zip01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="4"    size="6" class="box6" style="<!--{if $arrErr.zip02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> 
    165                 <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">住所入力</a> 
    166             </td> 
    167         </tr> 
    168         <tr> 
    169             <th>SHOP住所<span class="attention"> *</span></th> 
     165                <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">所在地入力</a> 
     166            </td> 
     167        </tr> 
     168        <tr> 
     169            <th>SHOP所在地<span class="attention"> *</span></th> 
    170170            <td> 
    171171                <p> 
     
    315315                緯度: <input type="text" name="latitude" value="<!--{$arrForm.latitude|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.latitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="latitude" /> 
    316316                経度: <input type="text" name="longitude" value="<!--{$arrForm.longitude|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.longitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="longitude" /> 
    317                 <a class="btn-normal" href="javascript:;" name="codeAddress" id="codeAddress" onclick="">住所より自動取得</a> 
     317                <a class="btn-normal" href="javascript:;" name="codeAddress" id="codeAddress" onclick="">所在地より自動取得</a> 
    318318                <a href="#maparea" id="mapAddress">地図で設定</a> 
    319319            </td> 
  • branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl

    r21539 r21719  
    5959            - 
    6060            <input type="text"    name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"    size="6" class="box6" /> 
    61             <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01'); return false;">住所入力</a> 
     61            <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01'); return false;">所在地入力</a> 
    6262            </td> 
    6363        </tr> 
  • branches/version-2_12-dev/data/Smarty/templates/default/abouts/index.tpl

    r21539 r21719  
    7474            <!--{if strlen($objSiteInfo->data.zip01)}--> 
    7575                <tr> 
    76                     <th>住所</th> 
     76                    <th>所在地</th> 
    7777                    <td>〒<!--{$objSiteInfo->data.zip01|h}-->-<!--{$objSiteInfo->data.zip02|h}--><br /><!--{$objSiteInfo->data.pref|h}--><!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></td> 
    7878                </tr> 
  • branches/version-2_12-dev/data/Smarty/templates/mobile/guide/about.tpl

    r21537 r21719  
    3535    <!--{if $arrSiteInfo.zip01 != ""}--> 
    3636        <br> 
    37         [emoji:121]住所<br> 
     37        [emoji:121]所在地<br> 
    3838        〒<!--{$arrSiteInfo.zip01|h}-->-<!--{$arrSiteInfo.zip02|h}--><br> 
    3939        <!--{$arrPref[$arrSiteInfo.pref]}--><!--{$arrSiteInfo.addr01|h}--><!--{$arrSiteInfo.addr02|h}--><br> 
  • branches/version-2_12-dev/data/Smarty/templates/sphone/abouts/index.tpl

    r21537 r21719  
    6666 
    6767        <!--{if strlen($objSiteInfo->data.zip01)}--> 
    68             <dt>住所</dt> 
     68            <dt>所在地</dt> 
    6969            <dd>〒<!--{$objSiteInfo->data.zip01|h}-->-<!--{$objSiteInfo->data.zip02|h}--><br /> 
    7070                <!--{$objSiteInfo->data.pref|h}--><!--{$objSiteInfo->data.addr01|h}--><!--{$objSiteInfo->data.addr02|h}--></dd> 
  • branches/version-2_12-dev/data/class/SC_Fpdf.php

    r21684 r21719  
    104104        $arrInfo = $objDb->sfGetBasisData(); 
    105105 
    106         $this->lfText(125, 60, $arrInfo['shop_name'], 8, 'B');          //ショップ名 
    107         $this->lfText(125, 63, $arrInfo['law_url'], 8);          //URL 
    108         $this->lfText(125, 68, $arrInfo['law_company'], 8);        //会社名 
    109         $text = '〒 '.$arrInfo['law_zip01'].' - '.$arrInfo['law_zip02']; 
    110         $this->lfText(125, 71, $text, 8);  //郵便番号 
    111         $text = $this->arrPref[$arrInfo['law_pref']].$arrInfo['law_addr01']; 
    112         $this->lfText(125, 74, $text, 8);  //都道府県+住所1 
    113         $this->lfText(125, 77, $arrInfo['law_addr02'], 8);          //住所2 
     106        // ショップ名 
     107        $this->lfText(125, 60, $arrInfo['shop_name'], 8, 'B'); 
     108        // URL 
     109        $this->lfText(125, 63, $arrInfo['law_url'], 8); 
     110        // 会社名 
     111        $this->lfText(125, 68, $arrInfo['law_company'], 8); 
     112        // 郵便番号 
     113        $text = '〒 ' . $arrInfo['law_zip01'] . ' - ' . $arrInfo['law_zip02']; 
     114        $this->lfText(125, 71, $text, 8); 
     115        // 都道府県+所在地 
     116        $text = $this->arrPref[$arrInfo['law_pref']] . $arrInfo['law_addr01']; 
     117        $this->lfText(125, 74, $text, 8); 
     118        $this->lfText(125, 77, $arrInfo['law_addr02'], 8); 
    114119 
    115120        $text = 'TEL: '.$arrInfo['law_tel01'].'-'.$arrInfo['law_tel02'].'-'.$arrInfo['law_tel03']; 
  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

    r21693 r21719  
    227227        $objFormParam->addParam('郵便番号1', 'zip01', ZIP01_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); 
    228228        $objFormParam->addParam('郵便番号2', 'zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK','NUM_COUNT_CHECK')); 
    229         // 住所チェック 
     229        // 所在地チェック 
    230230        $objFormParam->addParam('都道府県', 'pref', '', 'n', array('EXIST_CHECK')); 
    231         $objFormParam->addParam('住所1', 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    232         $objFormParam->addParam('住所2', 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     231        $objFormParam->addParam('所在地1', 'addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     232        $objFormParam->addParam('所在地2', 'addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    233233        // メールチェック 
    234234        $objFormParam->addParam('商品注文受付メールアドレス', 'email01', null, 'a', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); 
  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php

    r21693 r21719  
    134134        $objFormParam->addParam('郵便番号2', 'law_zip02', ZIP02_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'NUM_COUNT_CHECK')); 
    135135        $objFormParam->addParam('都道府県', 'law_pref', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); 
    136         $objFormParam->addParam('住所1', 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    137         $objFormParam->addParam('住所2', 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     136        $objFormParam->addParam('所在地1', 'law_addr01', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
     137        $objFormParam->addParam('所在地2', 'law_addr02', MTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    138138        $objFormParam->addParam('電話番号1', 'law_tel01', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); 
    139139        $objFormParam->addParam('電話番号2', 'law_tel02', TEL_ITEM_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK' ,'NUM_CHECK')); 
  • branches/version-2_12-dev/html/install/sql/insert_data.sql

    r21718 r21719  
    350350INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (114, 3, 'order_zip02', '郵便番号2', 16, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP02_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK'); 
    351351INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (115, 3, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_order.order_pref) as pref', '都道府県', 17, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK'); 
    352 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (116, 3, 'order_addr01', '住所', 18, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK'); 
    353 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (117, 3, 'order_addr02', '住所', 19, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK'); 
     352INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (116, 3, 'order_addr01', '住所1', 18, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK'); 
     353INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (117, 3, 'order_addr02', '住所2', 19, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK'); 
    354354INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (118, 3, 'order_sex', '性別', 20, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK'); 
    355355INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (119, 3, 'order_birth', '生年月日', 21, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK'); 
Note: See TracChangeset for help on using the changeset viewer.