Index: branches/version-2_5-dev/data/mtb_constants_init.php =================================================================== --- branches/version-2_5-dev/data/mtb_constants_init.php (revision 19966) +++ branches/version-2_5-dev/data/mtb_constants_init.php (revision 19972) @@ -67,5 +67,5 @@ define('GRAPH_REALDIR', HTML_REALDIR . "upload/graph_image/"); /** グラフURL */ -define('GRAPH_URLPATH', URL_PATH . "upload/graph_image/"); +define('GRAPH_URLPATH', ROOT_URLPATH . "upload/graph_image/"); /** 円グラフ最大表示数 */ define('GRAPH_PIE_MAX', 10); @@ -227,7 +227,7 @@ define('IMAGE_SAVE_REALDIR', HTML_REALDIR . "upload/save_image/"); /** 画像一時保存URL */ -define('IMAGE_TEMP_URLPATH', URL_PATH . "upload/temp_image/"); +define('IMAGE_TEMP_URLPATH', ROOT_URLPATH . "upload/temp_image/"); /** 画像保存先URL */ -define('IMAGE_SAVE_URLPATH', URL_PATH . "upload/save_image/"); +define('IMAGE_SAVE_URLPATH', ROOT_URLPATH . "upload/save_image/"); /** RSS用画像一時保存URL */ define('IMAGE_TEMP_RSS_URL', HTTP_URL . "upload/temp_image/"); @@ -239,27 +239,27 @@ define('NO_IMAGE_DIR', USER_TEMPLATE_REALDIR . "img/picture/img_blank.gif"); /** システム管理トップ */ -define('ADMIN_SYSTEM_URLPATH', URL_PATH . ADMIN_DIR . "system/" . DIR_INDEX_URL); +define('ADMIN_SYSTEM_URLPATH', ROOT_URLPATH . ADMIN_DIR . "system/" . DIR_INDEX_URL); /** 規格登録 */ -define('ADMIN_CLASS_REGIST_URLPATH', URL_PATH . ADMIN_DIR . "products/class.php"); +define('ADMIN_CLASS_REGIST_URLPATH', ROOT_URLPATH . ADMIN_DIR . "products/class.php"); /** 郵便番号入力 */ -define('INPUT_ZIP_URLPATH', URL_PATH . "input_zip.php"); +define('INPUT_ZIP_URLPATH', ROOT_URLPATH . "input_zip.php"); /** 配送業者登録 */ -define('ADMIN_DELIVERY_URLPATH', URL_PATH . ADMIN_DIR . "basis/delivery.php"); +define('ADMIN_DELIVERY_URLPATH', ROOT_URLPATH . ADMIN_DIR . "basis/delivery.php"); /** 支払い方法登録 */ -define('ADMIN_PAYMENT_URLPATH', URL_PATH . ADMIN_DIR . "basis/payment.php"); +define('ADMIN_PAYMENT_URLPATH', ROOT_URLPATH . ADMIN_DIR . "basis/payment.php"); /** ホーム */ -define('ADMIN_HOME_URLPATH', URL_PATH . ADMIN_DIR . "home.php"); +define('ADMIN_HOME_URLPATH', ROOT_URLPATH . ADMIN_DIR . "home.php"); /** ログインページ */ -define('ADMIN_LOGIN_URLPATH', URL_PATH . ADMIN_DIR . DIR_INDEX_URL); +define('ADMIN_LOGIN_URLPATH', ROOT_URLPATH . ADMIN_DIR . DIR_INDEX_URL); /** 商品検索ページ */ -define('ADMIN_PRODUCTS_URLPATH', URL_PATH . ADMIN_DIR . "products/" . DIR_INDEX_URL); +define('ADMIN_PRODUCTS_URLPATH', ROOT_URLPATH . ADMIN_DIR . "products/" . DIR_INDEX_URL); /** 注文編集ページ */ -define('ADMIN_ORDER_EDIT_URLPATH', URL_PATH . ADMIN_DIR . "order/edit.php"); +define('ADMIN_ORDER_EDIT_URLPATH', ROOT_URLPATH . ADMIN_DIR . "order/edit.php"); /** 注文編集ページ */ -define('ADMIN_ORDER_URLPATH', URL_PATH . ADMIN_DIR . "order/" . DIR_INDEX_URL); +define('ADMIN_ORDER_URLPATH', ROOT_URLPATH . ADMIN_DIR . "order/" . DIR_INDEX_URL); /** 注文編集ページ */ -define('ADMIN_ORDER_MAIL_URLPATH', URL_PATH . ADMIN_DIR . "order/mail.php"); +define('ADMIN_ORDER_MAIL_URLPATH', ROOT_URLPATH . ADMIN_DIR . "order/mail.php"); /** ログアウトページ */ -define('ADMIN_LOGOUT_URLPATH', URL_PATH . ADMIN_DIR . "logout.php"); +define('ADMIN_LOGOUT_URLPATH', ROOT_URLPATH . ADMIN_DIR . "logout.php"); /** アクセス成功 */ define('SUCCESS', 0); @@ -332,25 +332,25 @@ define('ENTRY_URL', HTTPS_URL . "entry/" . DIR_INDEX_URL); /** サイトトップ */ -define('TOP_URLPATH', URL_PATH . DIR_INDEX_URL); +define('TOP_URLPATH', ROOT_URLPATH . DIR_INDEX_URL); /** カートトップ */ -define('CART_URLPATH', URL_PATH . "cart/" . DIR_INDEX_URL); +define('CART_URLPATH', ROOT_URLPATH . "cart/" . DIR_INDEX_URL); /** お届け先設定 */ -define('DELIV_URLPATH', URL_PATH . "shopping/deliv.php"); +define('DELIV_URLPATH', ROOT_URLPATH . "shopping/deliv.php"); /** 複数お届け先設定 */ -define('MULTIPLE_URLPATH', URL_PATH . "shopping/multiple.php"); +define('MULTIPLE_URLPATH', ROOT_URLPATH . "shopping/multiple.php"); /** Myページトップ */ define('URL_MYPAGE_TOP', HTTPS_URL . "mypage/login.php"); /** 購入確認ページ */ -define('SHOPPING_CONFIRM_URLPATH', URL_PATH . "shopping/confirm.php"); +define('SHOPPING_CONFIRM_URLPATH', ROOT_URLPATH . "shopping/confirm.php"); /** お支払い方法選択ページ */ -define('SHOPPING_PAYMENT_URLPATH', URL_PATH . "shopping/payment.php"); +define('SHOPPING_PAYMENT_URLPATH', ROOT_URLPATH . "shopping/payment.php"); /** 購入完了画面 */ -define('SHOPPING_COMPLETE_URLPATH', URL_PATH . "shopping/complete.php"); +define('SHOPPING_COMPLETE_URLPATH', ROOT_URLPATH . "shopping/complete.php"); /** モジュール追加用画面 */ -define('SHOPPING_MODULE_URLPATH', URL_PATH . "shopping/load_payment_module.php"); +define('SHOPPING_MODULE_URLPATH', ROOT_URLPATH . "shopping/load_payment_module.php"); /** 商品詳細(HTML出力) */ -define('P_DETAIL_URLPATH', URL_PATH . "products/detail.php?product_id="); +define('P_DETAIL_URLPATH', ROOT_URLPATH . "products/detail.php?product_id="); /** マイページお届け先URL */ -define('MYPAGE_DELIVADDR_URLPATH', URL_PATH . "mypage/delivery.php"); +define('MYPAGE_DELIVADDR_URLPATH', ROOT_URLPATH . "mypage/delivery.php"); /** メールアドレス種別 */ define('MAIL_TYPE_PC', 1); @@ -456,5 +456,5 @@ define('MOBILE_IMAGE_REALDIR', HTML_REALDIR . "upload/mobile_image/"); /** 携帯電話向け変換画像保存ディレクトリ */ -define('MOBILE_IMAGE_URLPATH', URL_PATH . "upload/mobile_image/"); +define('MOBILE_IMAGE_URLPATH', ROOT_URLPATH . "upload/mobile_image/"); /** モバイルURL */ define('MOBILE_TOP_URLPATH', MOBILE_URLPATH . DIR_INDEX_URL); Index: branches/version-2_5-dev/data/class/SC_Initial.php =================================================================== --- branches/version-2_5-dev/data/class/SC_Initial.php (revision 19943) +++ branches/version-2_5-dev/data/class/SC_Initial.php (revision 19972) @@ -81,5 +81,5 @@ define('MOBILE_HTTP_URL', HTTP_URL . MOBILE_DIR); define('MOBILE_HTTPS_URL', HTTPS_URL . MOBILE_DIR); - define('MOBILE_URLPATH', URL_PATH . MOBILE_DIR); + define('MOBILE_URLPATH', ROOT_URLPATH . MOBILE_DIR); define('SMARTPHONE_DIR', ''); @@ -87,5 +87,5 @@ define('SMARTPHONE_HTTP_URL', HTTP_URL . SMARTPHONE_DIR); define('SMARTPHONE_HTTPS_URL', HTTPS_URL . SMARTPHONE_DIR); - define('SMARTPHONE_URLPATH', URL_PATH . SMARTPHONE_DIR); + define('SMARTPHONE_URLPATH', ROOT_URLPATH . SMARTPHONE_DIR); } } Index: branches/version-2_5-dev/data/class/SC_Response.php =================================================================== --- branches/version-2_5-dev/data/class/SC_Response.php (revision 19924) +++ branches/version-2_5-dev/data/class/SC_Response.php (revision 19972) @@ -170,5 +170,5 @@ */ function sendRedirectFromUrlPath($location, $arrQueryString = array(), $inheritQueryString = false, $useSsl = null) { - $location = URL_PATH . ltrim($location, '/'); + $location = ROOT_URLPATH . ltrim($location, '/'); SC_Response_Ex::sendRedirect($location, $arrQueryString, $inheritQueryString, $useSsl); } Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php =================================================================== --- branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php (revision 19943) +++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php (revision 19972) @@ -43,5 +43,5 @@ function lfMobileCheckCompatibility() { if (!SC_MobileUserAgent::isSupported()) { - header('Location: ' . URL_PATH . 'unsupported/' . DIR_INDEX_URL); + header('Location: ' . ROOT_URLPATH . 'unsupported/' . DIR_INDEX_URL); exit; } @@ -86,5 +86,5 @@ */ function lfMobileGetExtSessionId() { - if (!preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) { + if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) { return null; } Index: branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php =================================================================== --- branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (revision 19807) +++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (revision 19972) @@ -51,5 +51,5 @@ // 現在のURLの取得 if ($preview === false) { - $url = preg_replace('|^' . preg_quote(URL_PATH) . '|', '', $url); + $url = preg_replace('|^' . preg_quote(ROOT_URLPATH) . '|', '', $url); // URLを元にページデザインを取得 @@ -305,10 +305,10 @@ switch ($device_type_id) { case DEVICE_TYPE_MOBILE: - $userDir = URL_PATH . MOBILE_DIR . USER_DIR; + $userDir = ROOT_URLPATH . MOBILE_DIR . USER_DIR; $templateName = MOBILE_TEMPLATE_NAME; break; case DEVICE_TYPE_SMARTPHONE: - $userDir = URL_PATH . SMARTPHONE_DIR . USER_DIR; + $userDir = ROOT_URLPATH . SMARTPHONE_DIR . USER_DIR; $templateName = SMARTPHONE_TEMPLATE_NAME; break; @@ -316,5 +316,5 @@ case DEVICE_TYPE_PC: default: - $userDir = URL_PATH . USER_DIR; + $userDir = ROOT_URLPATH . USER_DIR; $templateName = TEMPLATE_NAME; } Index: branches/version-2_5-dev/data/class/SC_View.php =================================================================== --- branches/version-2_5-dev/data/class/SC_View.php (revision 19938) +++ branches/version-2_5-dev/data/class/SC_View.php (revision 19972) @@ -200,6 +200,6 @@ $this->_smarty->template_dir = TEMPLATE_ADMIN_REALDIR; $this->_smarty->compile_dir = COMPILE_ADMIN_REALDIR; - $this->assign('TPL_DIR_DEFAULT', URL_PATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/'); - $this->assign('TPL_DIR', URL_PATH . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR); + $this->assign('TPL_DIR_DEFAULT', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/'); + $this->assign('TPL_DIR', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR); $this->initpath(); } Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php =================================================================== --- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 19962) +++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 19972) @@ -207,5 +207,5 @@ $objCartSess->saveCurrentCart($objSiteSess->getUniqId()); - SC_Response_Ex::sendRedirect(URL_PATH . USER_DIR . 'gmopg_oneclick_confirm.php', array(), false, true); + SC_Response_Ex::sendRedirect(ROOT_URLPATH . USER_DIR . 'gmopg_oneclick_confirm.php', array(), false, true); exit; } Index: branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php =================================================================== --- branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php (revision 19943) +++ branches/version-2_5-dev/data/class/pages/tb/LC_Page_TrackBack.php (revision 19972) @@ -309,5 +309,5 @@ print("" . $retProduct[0]["name"] . ""); print(""); - print(HTTP_URL . substr(P_DETAIL_URLPATH, strlen(URL_PATH)) . $product_id); + print(HTTP_URL . substr(P_DETAIL_URLPATH, strlen(ROOT_URLPATH)) . $product_id); print(""); print(""); Index: branches/version-2_5-dev/data/class/pages/LC_Page.php =================================================================== --- branches/version-2_5-dev/data/class/pages/LC_Page.php (revision 19921) +++ branches/version-2_5-dev/data/class/pages/LC_Page.php (revision 19972) @@ -351,5 +351,5 @@ // $path が / で始まっている場合 if (substr($path, 0, 1) == '/') { - $realPath = realpath($htmlPath . substr_replace($path, '', 0, strlen(URL_PATH))); + $realPath = realpath($htmlPath . substr_replace($path, '', 0, strlen(ROOT_URLPATH))); // 相対パスの場合 } else { Index: branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 19943) +++ branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php (revision 19972) @@ -53,5 +53,5 @@ $this->tpl_subnavi = 'total/subnavi.tpl'; $this->tpl_graphsubtitle = 'total/subtitle.tpl'; - $this->tpl_titleimage = URL_PATH.'img/title/title_sale.jpg'; + $this->tpl_titleimage = ROOT_URLPATH.'img/title/title_sale.jpg'; $this->tpl_mainno = 'total'; Index: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 19937) +++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 19972) @@ -260,5 +260,5 @@ //権限チェック if(!is_writable(HTML_REALDIR . ADMIN_DIR)){ - $this->arrErr["admin_dir"] .= URL_PATH.ADMIN_DIR."のディレクトリ名を変更する権限がありません。"; + $this->arrErr["admin_dir"] .= ROOT_URLPATH.ADMIN_DIR."のディレクトリ名を変更する権限がありません。"; } if(!is_writable(USER_TEMPLATE_REALDIR . ADMIN_DIR)){ Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 19834) +++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php (revision 19972) @@ -319,5 +319,5 @@ if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) { $arrUpdData['page_name'] = $arrData['page_name'] ; - $arrUpdData['url'] = preg_replace('|^' . preg_quote(URL_PATH) . '|', '', + $arrUpdData['url'] = preg_replace('|^' . preg_quote(ROOT_URLPATH) . '|', '', $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php'); $arrUpdData['php_dir'] = dirname($arrUpdData['url']); Index: branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php =================================================================== --- branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php (revision 19943) +++ branches/version-2_5-dev/data/class/pages/LC_Page_Sitemap.php (revision 19972) @@ -252,10 +252,10 @@ $page["update_date"] = $row['update_date']; - $page["url"] = HTTP_URL . substr(P_DETAIL_URLPATH, strlen(URL_PATH)) . $row['product_id']; + $page["url"] = HTTP_URL . substr(P_DETAIL_URLPATH, strlen(ROOT_URLPATH)) . $row['product_id']; $arrRet[] = $page; // モバイルサイト if (USE_MOBILE !== false) { - $page["url"] = HTTP_URL . substr(MOBILE_P_DETAIL_URLPATH, strlen(URL_PATH)) . $row['product_id']; + $page["url"] = HTTP_URL . substr(MOBILE_P_DETAIL_URLPATH, strlen(ROOT_URLPATH)) . $row['product_id']; $arrRet[] = $page; } Index: branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php =================================================================== --- branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php (revision 19802) +++ branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php (revision 19972) @@ -91,5 +91,5 @@ // XXX サニタイズ必要？ - $url .= (preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['REQUEST_URI'], $matches)) + $url .= (preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['REQUEST_URI'], $matches)) ? $matches[1] : '' Index: branches/version-2_5-dev/data/class/util/SC_Utils.php =================================================================== --- branches/version-2_5-dev/data/class/util/SC_Utils.php (revision 19947) +++ branches/version-2_5-dev/data/class/util/SC_Utils.php (revision 19972) @@ -403,7 +403,7 @@ function sfReload($get = "") { if ($_SERVER["SERVER_PORT"] == "443" ){ - $url = ereg_replace(URL_PATH . "$", "", HTTPS_URL); - } else { - $url = ereg_replace(URL_PATH . "$", "", HTTP_URL); + $url = ereg_replace(ROOT_URLPATH . "$", "", HTTPS_URL); + } else { + $url = ereg_replace(ROOT_URLPATH . "$", "", HTTP_URL); } Index: branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php =================================================================== --- branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php (revision 19943) +++ branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php (revision 19972) @@ -79,5 +79,5 @@ */ function getExtSessionId() { - if (!preg_match('|^' . URL_PATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) { + if (!preg_match('|^' . ROOT_URLPATH . '(.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) { return null; } Index: branches/version-2_5-dev/data/class/SC_MobileImage.php =================================================================== --- branches/version-2_5-dev/data/class/SC_MobileImage.php (revision 19943) +++ branches/version-2_5-dev/data/class/SC_MobileImage.php (revision 19972) @@ -92,5 +92,5 @@ foreach ($images[1] as $key => $path) { $realpath = html_entity_decode($path, ENT_QUOTES); - $realpath = preg_replace('|^' . URL_PATH . '|', HTML_REALDIR, $realpath); + $realpath = preg_replace('|^' . ROOT_URLPATH . '|', HTML_REALDIR, $realpath); $converted = $imageConverter->execute($realpath); if (isset($converted['outputImageName'])) { Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl (revision 19972) @@ -21,7 +21,7 @@ *}--> - - - + + + - + + - + + - + + - - - + + + + Index: branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl (revision 19902) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl (revision 19972) @@ -33,8 +33,8 @@ - - - - + + + + Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl (revision 19807) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl (revision 19972) @@ -60,5 +60,5 @@ 円 - 詳細 + 詳細 Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl (revision 19886) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl (revision 19972) @@ -58,5 +58,5 @@

パスワードを忘れた方はこちらからパスワードの再発行を行ってください。
- メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。 + メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。

@@ -67,5 +67,5 @@

- + 会員登録をする 
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl (revision 19972) @@ -59,5 +59,5 @@ 削除 - + Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl (revision 19972) @@ -61,5 +61,5 @@ - ダウンロード + ダウンロード ダウンロード商品
（入金確認中） Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl (revision 19835) +++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl (revision 19972) @@ -35,5 +35,5 @@

- 新しいお届け先を追加 + 新しいお届け先を追加

Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl (revision 19972) @@ -24,5 +24,5 @@ 新着情報
-

☆★☆ 新着情報はRSSで配信しています。★☆★

+

☆★☆ 新着情報はRSSで配信しています。★☆★

Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl (revision 19972) @@ -44,5 +44,5 @@ -
  • class="onlink">() +
  • class="onlink">() Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl (revision 19972) @@ -25,5 +25,5 @@
    • - selected" >当サイトについて
      • @@ -33,5 +33,5 @@ >お問い合わせ
    • - selected" >特定商取引に関する法律
      • Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl (revision 19972) @@ -29,5 +29,5 @@ - <!--{$arrBestProducts[cnt].name|h}--> + <!--{$arrBestProducts[cnt].name|h}-->

      @@ -50,5 +50,5 @@ - <!--{$arrBestProducts[$cnt2].name|h}--> + <!--{$arrBestProducts[$cnt2].name|h}-->

      Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl (revision 19972) @@ -25,5 +25,5 @@
      -
      +

      商品カテゴリから選ぶ Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl (revision 19972) @@ -59,5 +59,5 @@ 〒  -   郵便番号検索 -

      住所自動入力 +

      住所自動入力  郵便番号を入力後、クリックしてください。

      Index: branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl (revision 19972) @@ -20,6 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> - - + + - - - - + + + + + + <!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--> - - - - - + + + + + <!--{$arrSiteInfo.shop_name|h}--><!--{if $tpl_subtitle|strlen >= 1}--> / <!--{$tpl_subtitle|h}--><!--{elseif $tpl_title|strlen >= 1}--> / <!--{$tpl_title|h}--><!--{/if}--> Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl (revision 19972) @@ -61,5 +61,5 @@ - ダウンロード + ダウンロード ダウンロード商品
      （入金確認中） Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl (revision 19835) +++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl (revision 19972) @@ -35,5 +35,5 @@

      - 新しいお届け先を追加 + 新しいお届け先を追加

      Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl (revision 19807) +++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl (revision 19972) @@ -60,5 +60,5 @@ 円 - 詳細 + 詳細 Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl (revision 19972) @@ -58,5 +58,5 @@

      パスワードを忘れた方はこちらからパスワードの再発行を行ってください。
      - メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。 + メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。

      @@ -69,5 +69,5 @@

      - + 会員登録をする
      Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/favorite.tpl (revision 19972) @@ -59,5 +59,5 @@ 削除 - + Index: branches/version-2_5-dev/data/Smarty/templates/default/header.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/header.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/header.tpl (revision 19972) @@ -52,5 +52,5 @@
    • - Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl (revision 19802) +++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl (revision 19972) @@ -54,5 +54,5 @@

      パスワードを忘れた方はこちらからパスワードの再発行を行ってください。
      - メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。 + メールアドレスを忘れた方は、お手数ですが、お問い合わせページからお問い合わせください。

    • @@ -69,5 +69,5 @@

    - + 会員登録をする Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl (revision 19943) +++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl (revision 19972) @@ -21,7 +21,7 @@ *}--> - - - + + + - + + - + + - + + 管理機能 Index: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl (revision 19909) +++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl (revision 19972) @@ -30,10 +30,10 @@ - - - - + + + + - + - - - - + + + + - + <!--{$smarty.const.ADMIN_TITLE}--> @@ -86,41 +86,41 @@