[Svn-src-all:851] [version-2_5-dev 19738] #841(管理画面のディレクトリ名をパラメータに)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 17日 (金) 19:06:34 JST
Subversion committed to /home/svn/open 19738
http://svn.ec-cube.net/open_trac/changeset/19738
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-17 19:06:33 +0900 (金, 17 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#841(管理画面のディレクトリ名をパラメータに)
* "admin/" とベタ書きになっていた箇所を ADMIN_DIR に置きかえ
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl
U branches/version-2_5-dev/data/class/SC_Initial.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php
U branches/version-2_5-dev/data/mtb_constants_init.php
U branches/version-2_5-dev/html/install/sql/insert_data.sql
U branches/version-2_5-dev/html/upgrade/index.php
U branches/version-2_5-dev/html/user_data/plugins/google_analytics/admin/index.php
U branches/version-2_5-dev/html/user_data/plugins/recommend/admin/index.php
変更: branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,15 +22,15 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-basis-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>SHOPマスタ</span></a></li>
-<li<!--{if $tpl_subno == 'tradelaw'}--> class="on"<!--{/if}--> id="navi-basis-tradelaw"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/tradelaw.php"><span>特定商取引法</span></a></li>
-<li<!--{if $tpl_subno == 'delivery'}--> class="on"<!--{/if}--> id="navi-basis-delivery"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/delivery.php"><span>配送設定</span></a></li>
-<li<!--{if $tpl_subno == 'payment'}--> class="on"<!--{/if}--> id="navi-basis-payment"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/payment.php"><span>支払方法設定</span></a></li>
-<li<!--{if $tpl_subno == 'point'}--> class="on"<!--{/if}--> id="navi-basis-point"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/point.php"><span>ポイント設定</span></a></li>
-<li<!--{if $tpl_subno == 'mail'}--> class="on"<!--{/if}--> id="navi-basis-mail"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/mail.php"><span>メール設定</span></a></li>
-<li<!--{if $tpl_subno == 'seo'}--> class="on"<!--{/if}--> id="navi-basis-seo"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/seo.php"><span>SEO管理</span></a></li>
-<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/kiyaku.php"><span>会員規約設定</span></a></li>
-<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
-<li<!--{if $tpl_subno == 'control'}--> class="on"<!--{/if}--> id="navi-basis-control"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/control.php"><span>サイト管理設定</span></a></li>
-<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/holiday.php"><span>定休日管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-basis-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>SHOPマスタ</span></a></li>
+<li<!--{if $tpl_subno == 'tradelaw'}--> class="on"<!--{/if}--> id="navi-basis-tradelaw"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/tradelaw.php"><span>特定商取引法</span></a></li>
+<li<!--{if $tpl_subno == 'delivery'}--> class="on"<!--{/if}--> id="navi-basis-delivery"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/delivery.php"><span>配送設定</span></a></li>
+<li<!--{if $tpl_subno == 'payment'}--> class="on"<!--{/if}--> id="navi-basis-payment"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/payment.php"><span>支払方法設定</span></a></li>
+<li<!--{if $tpl_subno == 'point'}--> class="on"<!--{/if}--> id="navi-basis-point"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/point.php"><span>ポイント設定</span></a></li>
+<li<!--{if $tpl_subno == 'mail'}--> class="on"<!--{/if}--> id="navi-basis-mail"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/mail.php"><span>メール設定</span></a></li>
+<li<!--{if $tpl_subno == 'seo'}--> class="on"<!--{/if}--> id="navi-basis-seo"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/seo.php"><span>SEO管理</span></a></li>
+<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/kiyaku.php"><span>会員規約設定</span></a></li>
+<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
+<li<!--{if $tpl_subno == 'control'}--> class="on"<!--{/if}--> id="navi-basis-control"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/control.php"><span>サイト管理設定</span></a></li>
+<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->basis/holiday.php"><span>定休日管理</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,16 +22,16 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>新着情報管理</span></a></li>
-<li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/recommend.php"><span>おすすめ商品管理</span></a></li>
-<li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/file_manager.php"><span>ファイル管理</span></a></li>
-<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> id="navi-contents-csv"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php"><span>CSV出力項目設定</span></a>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>新着情報管理</span></a></li>
+<li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>おすすめ商品管理</span></a></li>
+<li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>ファイル管理</span></a></li>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> id="navi-contents-csv"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
<ul id="navi-csv-sub" class="level2">
- <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
- <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=customer"><span>顧客管理</span></a></li>
- <li<!--{if $tpl_subno_csv == 'order'}--> class="on"<!--{/if}--> id="navi-csv-order"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=order"><span>受注管理</span></a></li>
- <li<!--{if $tpl_subno_csv == 'category'}--> class="on"<!--{/if}--> id="navi-csv-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=category"><span>カテゴリ</span></a></li>
- <li<!--{if $tpl_subno_csv == 'csv_sql'}--> class="on"<!--{/if}--> id="navi-csv-sql"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv_sql.php"><span>高度な設定</span></a></li>
+ <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
+ <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=customer"><span>顧客管理</span></a></li>
+ <li<!--{if $tpl_subno_csv == 'order'}--> class="on"<!--{/if}--> id="navi-csv-order"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=order"><span>受注管理</span></a></li>
+ <li<!--{if $tpl_subno_csv == 'category'}--> class="on"<!--{/if}--> id="navi-csv-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=category"><span>カテゴリ</span></a></li>
+ <li<!--{if $tpl_subno_csv == 'csv_sql'}--> class="on"<!--{/if}--> id="navi-csv-sql"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv_sql.php"><span>高度な設定</span></a></li>
</ul>
</li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -52,7 +52,7 @@
<body bgcolor="#ffffff" text="#494E5F" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
<!--{$GLOBAL_ERR}-->
<noscript>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->admin/css/common.css" type="text/css" >
+<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->css/common.css" type="text/css" >
</noscript>
<!--▼CONTENTS-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,5 +22,5 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -24,35 +24,35 @@
<ul class="level1">
<li><a><span>PC</span></a>
<ul class="level2">
- <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
- <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
- <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック設定</span></a></li>
- <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
- <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS設定</span></a></li>
- <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
- <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック設定</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS設定</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
</ul>
</li>
<li><a><span>モバイル</span></a>
<ul class="level2">
- <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
- <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
- <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック設定</span></a></li>
- <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
- <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS設定</span></a></li>
- <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
- <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック設定</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS設定</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
</ul>
</li>
<li><a><span>スマートフォン</span></a>
<ul class="level2">
- <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
- <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
- <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック設定</span></a></li>
- <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ヘッダー/フッター設定</span></a></li>
- <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS設定</span></a></li>
- <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
- <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート追加</span></a></li>
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック設定</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS設定</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート追加</span></a></li>
</ul>
</li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -57,7 +57,7 @@
</tr>
<tr>
<th>詳細</td>
- <td><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php">システム設定＞システム情報</a></td>
+ <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php">システム設定＞システム情報</a></td>
</tr>
</table>
<!--{* システム情報ここまで *}-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,7 +22,7 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-mail-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>配信内容設定</span></a></li>
-<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-mail-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/template.php"><span>テンプレート設定</span></a></li>
-<li<!--{if $tpl_subno == 'history'}--> class="on"<!--{/if}--> id="navi-mail-history"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/history.php"><span>配信履歴</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-mail-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>配信内容設定</span></a></li>
+<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-mail-template"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/template.php"><span>テンプレート設定</span></a></li>
+<li<!--{if $tpl_subno == 'history'}--> class="on"<!--{/if}--> id="navi-mail-history"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->mail/history.php"><span>配信履歴</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -66,7 +66,7 @@
<!--{* ▼HEADER *}-->
<div id="header">
- <div id="logo"><a href="<!--{$smarty.const.URL_DIR}-->admin/home.php"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
+ <div id="logo"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->home.php"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
<ul id="sites">
<li><a href="<!--{$smarty.const.URL_HOME}-->"><span>MAIN PAGE</span></a></li>
<li><a href="<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank"><span>SITE CHECK</span></a></li>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -24,7 +24,7 @@
<script type="text/javascript">
<!--
function fnEdit(customer_id) {
- document.form1.action = '<!--{$smarty.const.URL_DIR}-->admin/customer/edit.php';
+ document.form1.action = '<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->customer/edit.php';
document.form1.mode.value = "edit"
document.form1['edit_customer_id'].value = customer_id;
document.form1.submit();
@@ -133,7 +133,7 @@
<!--{/foreach}-->
<h2>お客様情報
<!--{if $tpl_mode == 'add'}-->
- <input type="button" name="address_input" value="顧客検索" onclick="fnOpenWindow('<!--{$smarty.const.SITE_URL}-->admin/customer/search_customer.php','search','500','650'); return false;" />
+ <input type="button" name="address_input" value="顧客検索" onclick="fnOpenWindow('<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.ADMIN_DIR}-->customer/search_customer.php','search','500','650'); return false;" />
<!--{/if}-->
</h2>
<table class="form">
@@ -304,7 +304,7 @@
<h2 id="order_products">
<a name="order_products">受注商品情報</a>
<input type="button" name="cheek" value="計算結果の確認" onclick="fnModeSubmit('cheek','anchor_key','order_products');" />
- <input type="button" name="add_product" value="商品の追加" onclick="win03('<!--{$smarty.const.URL_DIR}-->admin/order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+ <input type="button" name="add_product" value="商品の追加" onclick="win03('<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
</h2>
<!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
<span class="attention"><!--{$arrErr.product_id}--></span>
@@ -333,7 +333,7 @@
<input type="hidden" name="classcategory_name1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name1.value[$key]}-->" id="classcategory_name1_<!--{$key}-->" />
<input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
<br />
- <input type="button" name="change" value="変更" onclick="win03('<!--{$smarty.const.URL_DIR}-->admin/order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+ <input type="button" name="change" value="変更" onclick="win03('<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
<!--{if $product_count > 1}-->
<input type="button" name="delete" value="削除" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');" />
<!--{/if}-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -24,11 +24,11 @@
<ul class="level1">
<li id="navi-order-index"
class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'index'}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a></li>
<li id="navi-order-add"
class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'add'}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/edit.php?mode=add"><span>新規受注入力</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/edit.php?mode=add"><span>新規受注入力</span></a></li>
<li id="navi-order-status"
class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'status'}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/status.php"><span>ステータス管理</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->order/status.php"><span>ステータス管理</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -40,7 +40,7 @@
<td><!--{if $log.error_flg}-->失敗<!--{else}-->成功<!--{/if}--></td>
<td class="left"><!--{$log.update_date|sfDispDBDate|escape}--></td>
<td>
- <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/log.php?mode=detail&log_id=<!--{$log.log_id}-->">
+ <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php?mode=detail&log_id=<!--{$log.log_id}-->">
詳細</a>
</td>
<!--{*<td><!--{$log.log_id}--></td>*}-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -23,9 +23,9 @@
*}-->
<ul class="level1">
<li id="navi-ownersstore-index" class="<!--{if $tpl_subno == 'index'}-->on<!--{/if}-->">
- <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>購入商品一覧</span></a></li>
+ <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>購入商品一覧</span></a></li>
<li id="navi-ownersstore-settings" class="<!--{if $tpl_subno == 'settings'}-->on<!--{/if}-->">
- <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/settings.php"><span>認証キー設定</span></a></li>
+ <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/settings.php"><span>認証キー設定</span></a></li>
<li id="navi-ownersstore-log" class="<!--{if $tpl_subno == 'log'}-->on<!--{/if}-->">
- <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/log.php"><span>ログ管理</span></a></li>
+ <a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/log.php"><span>ログ管理</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -40,7 +40,7 @@
<td><!--{$plugin.path|escape}--></td>
<td><!--{$plugin.info.version|escape}--></td>
<td><!--{$plugin.info.auther|escape}--></td>
- <td><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/uninstall.php?path=<!--{$plugin.path|escape}-->">アンインストール</a></td>
+ <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/uninstall.php?path=<!--{$plugin.path|escape}-->">アンインストール</a></td>
</tr>
<!--{if $smarty.foreach.installedPlugin.last}-->
</table>
@@ -66,7 +66,7 @@
<td><!--{$plugin.path|escape}--></td>
<td><!--{$plugin.info.version|escape}--></td>
<td><!--{$plugin.info.auther|escape}--></td>
- <td><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/install.php?path=<!--{$plugin.path|escape}-->">インストール</a></td>
+ <td><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/install.php?path=<!--{$plugin.path|escape}-->">インストール</a></td>
</tr>
<!--{if $smarty.foreach.installablePlugin.last}-->
</table>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -25,6 +25,6 @@
<div class="contents-main">
<h2>結果</h2>
<div><!--{$tpl_result|escape|nl2br}--></div>
- <div><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+ <div><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
</div>
</form>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,8 +22,8 @@
*/
*}-->
<ul class="level1">
- <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-plugin-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>プラグイン管理</span></a></li>
+ <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-plugin-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>プラグイン管理</span></a></li>
<!--{foreach from=$smarty.env.pluginsXml->plugin item="plugin"}-->
- <li<!--{if $tpl_subno == $plugin->path}--> class="on"<!--{/if}--> id="navi-plugin-<!--{$plugin->path|escape}-->"><a href="<!--{$smarty.const.PLUGIN_URL}--><!--{$plugin->path|escape}-->/admin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span><!--{$plugin->name|escape}--></span></a></li>
+ <li<!--{if $tpl_subno == $plugin->path}--> class="on"<!--{/if}--> id="navi-plugin-<!--{$plugin->path|escape}-->"><a href="<!--{$smarty.const.PLUGIN_URL}--><!--{$plugin->path|escape}-->/<!--{$smarty.const.ADMIN_DIR}--><!--{$smarty.const.DIR_INDEX_URL}-->"><span><!--{$plugin->name|escape}--></span></a></li>
<!--{/foreach}-->
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -25,6 +25,6 @@
<div class="contents-main">
<h2>結果</h2>
<div><!--{$tpl_result|escape|nl2br}--></div>
- <div><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+ <div><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
</div>
</form>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,14 +22,14 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-products-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品マスタ</span></a></li>
-<li<!--{if $tpl_subno == 'product'}--> class="on"<!--{/if}--> id="navi-products-product"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/product.php"><span>商品登録</span></a></li>
-<li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/upload_csv.php"><span>商品登録CSV</span></a></li>
-<li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/class.php"><span>規格管理</span></a></li>
-<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/category.php"><span>カテゴリ管理</span></a></li>
-<li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
-<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/maker.php"><span>メーカー管理</span></a></li>
-<li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/product_rank.php"><span>商品並び替え</span></a></li>
-<li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/review.php"><span>レビュー管理</span></a></li>
-<li<!--{if $tpl_subno == 'trackback'}--> class="on"<!--{/if}--> id="navi-products-trackback"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/trackback.php"><span>トラックバック管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-products-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'product'}--> class="on"<!--{/if}--> id="navi-products-product"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/product.php"><span>商品登録</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv.php"><span>商品登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/class.php"><span>規格管理</span></a></li>
+<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/category.php"><span>カテゴリ管理</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/maker.php"><span>メーカー管理</span></a></li>
+<li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/product_rank.php"><span>商品並び替え</span></a></li>
+<li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/review.php"><span>レビュー管理</span></a></li>
+<li<!--{if $tpl_subno == 'trackback'}--> class="on"<!--{/if}--> id="navi-products-trackback"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->products/trackback.php"><span>トラックバック管理</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -22,12 +22,12 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-system-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メンバー管理</span></a></li>
-<li<!--{if $tpl_subno == 'bkup'}--> class="on"<!--{/if}--> id="navi-system-bkup"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/bkup.php"><span>バックアップ管理</span></a></li>
-<li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/parameter.php"><span>パラメータ設定</span></a></li>
-<li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/masterdata.php"><span>マスタデータ管理</span></a></li>
-<li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php"><span>システム情報</span></a></li>
-<li<!--{if $tpl_subno == 'plugin'}--> class="on"<!--{/if}--> id="navi-system-plugin"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/plugin.php"><span>プラグイン管理</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/log.php"><span>EC-CUBE ログ表示</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/editdb.php"><span>高度なデータベース管理</span></a></li>
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-system-index"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メンバー管理</span></a></li>
+<li<!--{if $tpl_subno == 'bkup'}--> class="on"<!--{/if}--> id="navi-system-bkup"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/bkup.php"><span>バックアップ管理</span></a></li>
+<li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/parameter.php"><span>パラメータ設定</span></a></li>
+<li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/masterdata.php"><span>マスタデータ管理</span></a></li>
+<li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/system.php"><span>システム情報</span></a></li>
+<li<!--{if $tpl_subno == 'plugin'}--> class="on"<!--{/if}--> id="navi-system-plugin"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/plugin.php"><span>プラグイン管理</span></a></li>
+<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/log.php"><span>EC-CUBE ログ表示</span></a></li>
+<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->system/editdb.php"><span>高度なデータベース管理</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl 2010-12-17 10:06:33 UTC (rev 19738)
@@ -24,17 +24,17 @@
<ul class="level1">
<li id="navi-total-term"
class="<!--{if ($tpl_mainno == 'total' && ($arrForm.page.value == 'term' || $arrForm.page.value == ''))}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=term"><span>期間別集計</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=term"><span>期間別集計</span></a></li>
<li id="navi-total-products"
class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'products')}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=products"><span>商品別集計</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=products"><span>商品別集計</span></a></li>
<li id="navi-total-age"
class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'age')}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=age"><span>年代別集計</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=age"><span>年代別集計</span></a></li>
<li id="navi-total-job"
class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'job')}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=job"><span>職業別集計</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=job"><span>職業別集計</span></a></li>
<li id="navi-total-member"
class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'member')}-->on<!--{/if}-->"
- ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=member"><span>会員別集計</span></a></li>
+ ><a href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=member"><span>会員別集計</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/class/SC_Initial.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Initial.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/class/SC_Initial.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -84,7 +84,7 @@
define('SMARTPHONE_SSL_URL', SSL_URL . SMARTPHONE_DIR);
define('SMARTPHONE_URL_DIR', URL_DIR . SMARTPHONE_DIR);
- define('ADMIN_DIR', 'admin/'); // TODO
+ define('ADMIN_DIR', 'admin/');
}
}
変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -54,7 +54,7 @@
$objSess = new SC_Session();
$objSess->logout();
- $this->objDisplay->redirect($this->getLocation(URL_DIR . "admin/" . DIR_INDEX_URL));
+ $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . DIR_INDEX_URL));
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -183,7 +183,7 @@
// 一部のIEは256バイト以上受け取ってから表示を開始する。
SC_Utils_Ex::sfFlush(true);
- echo "<img src='" . $img_path . "admin/basis/zip_install_progress.gif'><br />";
+ echo "<img src='" . $img_path . ADMIN_DIR . "basis/zip_install_progress.gif'><br />";
echo "<img src='" . $img_path . "install/space_w.gif'>";
SC_Utils_Ex::sfFlush();
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -363,9 +363,9 @@
$sendId = $this->lfRegistData($objQuery, $this->list_data);
if (MELMAGA_SEND) {
if (MELMAGA_BATCH_MODE) {
- $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/history.php'));
+ $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
} else {
- $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
+ $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
}
exit;
} else {
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -177,7 +177,7 @@
}
}
if ($_GET['mode'] == 'now') {
- $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/history.php'));
+ $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
}
echo "complete\n";
}
変更: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/data/mtb_constants_init.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -258,35 +258,35 @@
/** 画像がない場合に表示 */
define('NO_IMAGE_DIR', HTML_PATH . "misc/blank.gif");
/** システム管理トップ */
-define('URL_SYSTEM_TOP', URL_DIR . "admin/system/" . DIR_INDEX_URL);
+define('URL_SYSTEM_TOP', URL_DIR . ADMIN_DIR . "system/" . DIR_INDEX_URL);
/** 規格登録 */
-define('URL_CLASS_REGIST', URL_DIR . "admin/products/class.php");
+define('URL_CLASS_REGIST', URL_DIR . ADMIN_DIR . "products/class.php");
/** 郵便番号入力 */
define('URL_INPUT_ZIP', URL_DIR . "input_zip.php");
/** 配送業者登録 */
-define('URL_DELIVERY_TOP', URL_DIR . "admin/basis/delivery.php");
+define('URL_DELIVERY_TOP', URL_DIR . ADMIN_DIR . "basis/delivery.php");
/** 支払い方法登録 */
-define('URL_PAYMENT_TOP', URL_DIR . "admin/basis/payment.php");
+define('URL_PAYMENT_TOP', URL_DIR . ADMIN_DIR . "basis/payment.php");
/** サイト管理情報登録 */
-define('URL_CONTROL_TOP', URL_DIR . "admin/basis/control.php");
+define('URL_CONTROL_TOP', URL_DIR . ADMIN_DIR . "basis/control.php");
/** ホーム */
-define('URL_HOME', URL_DIR . "admin/home.php");
+define('URL_HOME', URL_DIR . ADMIN_DIR . "home.php");
/** ログインページ */
-define('URL_LOGIN', URL_DIR . "admin/" . DIR_INDEX_URL);
+define('URL_LOGIN', URL_DIR . ADMIN_DIR . "" . DIR_INDEX_URL);
/** 商品検索ページ */
-define('URL_SEARCH_TOP', URL_DIR . "admin/products/" . DIR_INDEX_URL);
+define('URL_SEARCH_TOP', URL_DIR . ADMIN_DIR . "products/" . DIR_INDEX_URL);
/** 注文編集ページ */
-define('URL_ORDER_EDIT', URL_DIR . "admin/order/edit.php");
+define('URL_ORDER_EDIT', URL_DIR . ADMIN_DIR . "order/edit.php");
/** 注文編集ページ */
-define('URL_SEARCH_ORDER', URL_DIR . "admin/order/" . DIR_INDEX_URL);
+define('URL_SEARCH_ORDER', URL_DIR . ADMIN_DIR . "order/" . DIR_INDEX_URL);
/** 注文編集ページ */
-define('URL_ORDER_MAIL', URL_DIR . "admin/order/mail.php");
+define('URL_ORDER_MAIL', URL_DIR . ADMIN_DIR . "order/mail.php");
/** ログアウトページ */
-define('URL_LOGOUT', URL_DIR . "admin/logout.php");
+define('URL_LOGOUT', URL_DIR . ADMIN_DIR . "logout.php");
/** システム管理CSV出力ページ */
-define('URL_SYSTEM_CSV', URL_DIR . "admin/system/member_csv.php");
+define('URL_SYSTEM_CSV', URL_DIR . ADMIN_DIR . "system/member_csv.php");
/** 管理機能用CSS保管ディレクトリ */
-define('URL_ADMIN_CSS', URL_DIR . "admin/css/");
+define('URL_ADMIN_CSS', URL_DIR . ADMIN_DIR . "css/");
/** アクセス成功 */
define('SUCCESS', 0);
/** メンバー管理ページ表示行数 */
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-17 10:06:33 UTC (rev 19738)
@@ -1147,21 +1147,21 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CSV_TEMP_DIR', 'DATA_PATH . "upload/csv/"', 156, 'エンコードCSVの一時保存先');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NO_IMAGE_URL', 'URL_DIR . "misc/blank.gif"', 157, '画像がない場合に表示');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('NO_IMAGE_DIR', 'HTML_PATH . "misc/blank.gif"', 158, '画像がない場合に表示');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_TOP', 'URL_DIR . "admin/system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CLASS_REGIST', 'URL_DIR . "admin/products/class.php"', 160, '規格登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_TOP', 'URL_DIR . ADMIN_DIR . "system/" . DIR_INDEX_URL', 159, 'システム管理トップ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CLASS_REGIST', 'URL_DIR . ADMIN_DIR . "products/class.php"', 160, '規格登録');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_INPUT_ZIP', 'URL_DIR . "input_zip.php"', 161, '郵便番号入力');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIVERY_TOP', 'URL_DIR . "admin/basis/delivery.php"', 162, '配送業者登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_PAYMENT_TOP', 'URL_DIR . "admin/basis/payment.php"', 163, '支払い方法登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CONTROL_TOP', 'URL_DIR . "admin/basis/control.php"', 164, 'サイト管理情報登録');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_HOME', 'URL_DIR . "admin/home.php"', 165, 'ホーム');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGIN', 'URL_DIR . "admin/" . DIR_INDEX_URL', 166, 'ログインページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_TOP', 'URL_DIR . "admin/products/" . DIR_INDEX_URL', 167, '商品検索ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_EDIT', 'URL_DIR . "admin/order/edit.php"', 168, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_ORDER', 'URL_DIR . "admin/order/" . DIR_INDEX_URL', 169, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_MAIL', 'URL_DIR . "admin/order/mail.php"', 170, '注文編集ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGOUT', 'URL_DIR . "admin/logout.php"', 171, 'ログアウトページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_CSV', 'URL_DIR . "admin/system/member_csv.php"', 172, 'システム管理CSV出力ページ');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ADMIN_CSS', 'URL_DIR . "admin/css/"', 173, '管理機能用CSS保管ディレクトリ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_DELIVERY_TOP', 'URL_DIR . ADMIN_DIR . "basis/delivery.php"', 162, '配送業者登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_PAYMENT_TOP', 'URL_DIR . ADMIN_DIR . "basis/payment.php"', 163, '支払い方法登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_CONTROL_TOP', 'URL_DIR . ADMIN_DIR . "basis/control.php"', 164, 'サイト管理情報登録');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_HOME', 'URL_DIR . ADMIN_DIR . "home.php"', 165, 'ホーム');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGIN', 'URL_DIR . ADMIN_DIR . "" . DIR_INDEX_URL', 166, 'ログインページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_TOP', 'URL_DIR . ADMIN_DIR . "products/" . DIR_INDEX_URL', 167, '商品検索ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_EDIT', 'URL_DIR . ADMIN_DIR . "order/edit.php"', 168, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SEARCH_ORDER', 'URL_DIR . ADMIN_DIR . "order/" . DIR_INDEX_URL', 169, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ORDER_MAIL', 'URL_DIR . ADMIN_DIR . "order/mail.php"', 170, '注文編集ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_LOGOUT', 'URL_DIR . ADMIN_DIR . "logout.php"', 171, 'ログアウトページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_SYSTEM_CSV', 'URL_DIR . ADMIN_DIR . "system/member_csv.php"', 172, 'システム管理CSV出力ページ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('URL_ADMIN_CSS', 'URL_DIR . ADMIN_DIR . "css/"', 173, '管理機能用CSS保管ディレクトリ');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SUCCESS', '0', 176, 'アクセス成功');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MEMBER_PMAX', '10', 182, 'メンバー管理ページ表示行数');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SEARCH_PMAX', '10', 183, '検索ページ表示行数');
変更: branches/version-2_5-dev/html/upgrade/index.php
===================================================================
--- branches/version-2_5-dev/html/upgrade/index.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/html/upgrade/index.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -30,7 +30,7 @@
// {{{ requires
require_once '../require.php';
-require_once '../admin/require.php';
+require_once '../' . ADMIN_DIR . 'require.php';
// }}}
// {{{ generate page
変更: branches/version-2_5-dev/html/user_data/plugins/google_analytics/admin/index.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/google_analytics/admin/index.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/html/user_data/plugins/google_analytics/admin/index.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// {{{ requires
-require_once '../../../../admin/require.php';
+require_once '../../../../' . ADMIN_DIR . 'require.php';
$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo('../plugin_info.php');
require_once $arrPluginInfo['fullpath'] . 'classes/pages/LC_Page_Admin_GoogleAnalytics.php';
変更: branches/version-2_5-dev/html/user_data/plugins/recommend/admin/index.php
===================================================================
--- branches/version-2_5-dev/html/user_data/plugins/recommend/admin/index.php 2010-12-17 05:43:37 UTC (rev 19737)
+++ branches/version-2_5-dev/html/user_data/plugins/recommend/admin/index.php 2010-12-17 10:06:33 UTC (rev 19738)
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-require_once '../../../../admin/require.php';
+require_once '../../../../' ADMIN_DIR . 'require.php';
$arrPluginInfo = SC_Utils_Ex::sfLoadPluginInfo('../plugin_info.php');
require_once $arrPluginInfo['fullpath'] . 'classes/LC_Page_Admin_Plugin_Recommend.php';
Svn-src-all メーリングリストの案内