Changeset 20462 for branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

Timestamp:

2011/03/02 16:35:59 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/mobile/entry/email_mobile.tpl 19870@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fmobile%2Fentry%2Femail_mobile.tpl
data/Smarty/templates/mobile/entry/kiyaku.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fentry%2Fkiyaku.tpl
data/Smarty/templates/mobile/footer.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Ffooter.tpl
data/Smarty/templates/mobile/frontparts/bloc/category.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Ffrontparts%2Fbloc%2Fcategory.tpl
data/Smarty/templates/mobile/index.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fmobile%2Findex.tpl
data/Smarty/templates/mobile/mail_templates/customer_mail.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmail_templates%2Fcustomer_mail.tpl
data/Smarty/templates/mobile/mypage/login.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Flogin.tpl
data/Smarty/templates/mobile/products/category_list.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fproducts%2Fcategory_list.tpl
data/Smarty/templates/mobile/products/search.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fproducts%2Fsearch.tpl
data/Smarty/templates/mobile/regist/complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fregist%2Fcomplete.tpl
data/Smarty/templates/mobile/shopping/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Findex.tpl
data/Smarty/templates/sphone/footer.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Ffooter.tpl
data/Smarty/templates/sphone/frontparts/bloc/category.tpl 19798@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fbloc%2Fcategory.tpl
data/Smarty/templates/sphone/frontparts/bloc/login.tpl 19798@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fbloc%2Flogin.tpl
data/Smarty/templates/sphone/frontparts/bloc/news.tpl 19798@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fbloc%2Fnews.tpl
data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl 20403@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Ffrontparts%2Fbloc%2Frecommend.tpl
data/Smarty/templates/sphone/index.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Findex.tpl
data/Smarty/templates/sphone/popup_header.tpl 19898@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Fpopup_header.tpl
data/Smarty/templates/sphone/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Fproducts%2Fdetail.tpl
data/Smarty/templates/sphone/site_main.tpl 19634@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsphone%2Fsite_main.tpl
data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
data/class/SC_SmartphoneUserAgent.php 19029@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcamp%2Fcamp-2_5-E%2Fdata%2Fclass%2FSC_SmartphoneUserAgent.php
data/class/helper/SC_Helper_Mobile.php 15277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mobile.php
data/class/helper/SC_Helper_PageLayout.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_PageLayout.php
data/class/pages/LC_Page_Sitemap.php 16385@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_Sitemap.php
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 15682@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_MainEdit.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3189

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/mobile/entry/email_mobile.tpl [email protected]
data/Smarty/templates/mobile/entry/kiyaku.tpl [email protected]
data/Smarty/templates/mobile/footer.tpl [email protected]
data/Smarty/templates/mobile/frontparts/bloc/category.tpl [email protected]
data/Smarty/templates/mobile/index.tpl [email protected]
data/Smarty/templates/mobile/mail_templates/customer_mail.tpl [email protected]
data/Smarty/templates/mobile/mypage/login.tpl [email protected]
data/Smarty/templates/mobile/products/category_list.tpl [email protected]
data/Smarty/templates/mobile/products/search.tpl [email protected]
data/Smarty/templates/mobile/regist/complete.tpl [email protected]
data/Smarty/templates/mobile/shopping/index.tpl [email protected]
data/Smarty/templates/sphone/footer.tpl [email protected]
data/Smarty/templates/sphone/frontparts/bloc/category.tpl [email protected]
data/Smarty/templates/sphone/frontparts/bloc/login.tpl [email protected]
data/Smarty/templates/sphone/frontparts/bloc/news.tpl [email protected]
data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl [email protected]
data/Smarty/templates/sphone/index.tpl [email protected]
data/Smarty/templates/sphone/popup_header.tpl [email protected]
data/Smarty/templates/sphone/products/detail.tpl [email protected]
data/Smarty/templates/sphone/site_main.tpl [email protected]
data/class/SC_Initial.php [email protected]
data/class/SC_SmartphoneUserAgent.php [email protected]
data/class/helper/SC_Helper_Mobile.php [email protected]
data/class/helper/SC_Helper_PageLayout.php [email protected]
data/class/pages/LC_Page_Sitemap.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php [email protected]
data/mtb_constants_init.php [email protected]
html/install/sql/insert_data.sql [email protected]

bzr:timestamp:

2011-03-02 16:35:38.773000002 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-02T07:35:38.773000Z

Message:

#880(mobile/sphoneディレクトリを削除)

• 不要な MOBILE_*, SMARTPHONE_* 定数を削除

#793 (非推奨機能の削除)

• モバイル空メール関連削除

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php (modified) (5 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php

@@ -248 +248 @@
         case DEVICE_TYPE_MOBILE:
             $dir = MOBILE_TEMPLATE_REALDIR;
-            $userPath = HTML_REALDIR . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
@@ -254 +253 @@
         case DEVICE_TYPE_SMARTPHONE:
             $dir = SMARTPHONE_TEMPLATE_REALDIR;
-            $userPath = HTML_REALDIR . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
@@ -261 +259 @@
         default:
             $dir = TEMPLATE_REALDIR;
-            $userPath = USER_REALDIR;
             $templateName = TEMPLATE_NAME;
         }
+        $userPath = USER_REALDIR;
         if ($isUser) {
             $dir = $userPath . USER_PACKAGE_DIR . $templateName . "/";
         }
         return $dir;
-    }
-
-    /**
-     * user_data の絶対パスを返す.
-     *
-     * @param integer $device_type_id 端末種別ID
-     * @return string 端末に応じた user_data の絶対パス
-     */
-    function getUserPath($device_type_id = DEVICE_TYPE_PC) {
-        switch ($device_type_id) {
-        case DEVICE_TYPE_MOBILE:
-            return HTML_REALDIR . MOBILE_DIR . USER_DIR;
-            break;
-
-        case DEVICE_TYPE_SMARTPHONE:
-            return HTML_REALDIR . SMARTPHONE_DIR . USER_DIR;
-            break;
-
-        case DEVICE_TYPE_PC:
-        default:
-        }
-        return USER_REALDIR;
     }
 
@@ -305 +281 @@
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
-            $userDir = ROOT_URLPATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
 
         case DEVICE_TYPE_SMARTPHONE:
-            $userDir = ROOT_URLPATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
@@ -316 +290 @@
         case DEVICE_TYPE_PC:
         default:
-            $userDir = ROOT_URLPATH . USER_DIR;
             $templateName = TEMPLATE_NAME;
         }
+        $userDir = ROOT_URLPATH . USER_DIR;
         if ($hasPackage) {
             return $userDir . USER_PACKAGE_DIR . $templateName . "/";