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

Timestamp:

2010/12/14 17:37:25 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/design/bloc.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fbloc.tpl
data/Smarty/templates/admin/design/css.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fcss.tpl
data/Smarty/templates/admin/design/header.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fheader.tpl
data/Smarty/templates/admin/design/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Findex.tpl
data/Smarty/templates/admin/design/main_edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fmain_edit.tpl
data/Smarty/templates/admin/design/template.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Ftemplate.tpl
data/Smarty/templates/admin/design/up_down.tpl 16677@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fup_down.tpl
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_Index.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page_Index.php
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 15689@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_CSS.php
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 15688@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Header.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/class/pages/admin/design/LC_Page_Admin_Design_Template.php 16430@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Template.php
data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php 16677@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Up_Down.php
html/mobile/user_data/packages packages-20101214083119-2dp9jrcb0559zf59-1

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2451

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/design/bloc.tpl [email protected]
data/Smarty/templates/admin/design/css.tpl [email protected]
data/Smarty/templates/admin/design/header.tpl [email protected]
data/Smarty/templates/admin/design/index.tpl [email protected]
data/Smarty/templates/admin/design/main_edit.tpl [email protected]
data/Smarty/templates/admin/design/template.tpl [email protected]
data/Smarty/templates/admin/design/up_down.tpl [email protected]
data/class/helper/SC_Helper_PageLayout.php [email protected]
data/class/pages/LC_Page_Index.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php [email protected]
html/mobile/user_data/packages [email protected]

bzr:timestamp:

2010-12-14 17:37:18.494999886 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-14T08:37:18.495000Z

Message:

#748(モバイル/スマートフォンのデザイン管理)

• tpl ファイルの取得方法を修正

File:

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

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

@@ -64 +64 @@
         $arrPageLayout = $arrPageData[0];
 
-        // tpl_mainpageの設定なし、又はトップページの場合
-        if (!isset($objPage->tpl_mainpage) || $url == "index.php") {
-            // ユーザテンプレートのパスを取得
-            $user_tpl =  $this->getTemplatePath($device_type_id, true)
+        // ユーザテンプレートのパスを取得
+        $user_tpl =  $this->getTemplatePath($device_type_id, true)
+            . $arrPageLayout['filename'] . ".tpl";
+
+        // ユーザテンプレートの存在チェック
+        if (is_file($user_tpl)) {
+            $objPage->tpl_mainpage = $user_tpl;
+        }
+        // 存在しない場合は指定テンプレートを使用
+        else {
+            $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id)
                 . $arrPageLayout['filename'] . ".tpl";
-
-            // ユーザテンプレートの存在チェック
-            if (is_file($user_tpl)) {
-                $objPage->tpl_mainpage = $user_tpl;
-            }
-            // 存在しない場合は指定テンプレートを使用
-            else {
-                $objPage->tpl_mainpage = $this->getTemplatePath($device_type_id)
-                    . $arrPageLayout['filename'] . ".tpl";
-            }
         }
 
@@ -268 +265 @@
         case DEVICE_TYPE_MOBILE:
             $dir = MOBILE_TEMPLATE_DIR;
+            $userPath = HTML_PATH . MOBILE_DIR . USER_DIR;
             $templateName = MOBILE_TEMPLATE_NAME;
             break;
@@ -273 +271 @@
         case DEVICE_TYPE_SMARTPHONE:
             $dir = SMARTPHONE_TEMPLATE_DIR;
+            $userPath = HTML_PATH . SMARTPHONE_DIR . USER_DIR;
             $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
@@ -279 +278 @@
         default:
             $dir = TEMPLATE_DIR;
+            $userPath = USER_PATH;
             $templateName = TEMPLATE_NAME;
         }
         if ($isUser) {
-            $dir = USER_TEMPLATE_DIR . $templateName . "/";
+            $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_PATH . MOBILE_DIR . USER_DIR;
+            break;
+
+        case DEVICE_TYPE_SMARTPHONE:
+            return HTML_PATH . SMARTPHONE_DIR . USER_DIR;
+            break;
+
+        case DEVICE_TYPE_PC:
+        default:
+        }
+        return USER_PATH;
+    }
+
+    /**
+     * DocumentRoot から user_data のパスを取得する.
+     *
+     * @param integer $device_type_id 端末種別ID
+     * @return string 端末に応じた DocumentRoot から user_data までのパス
+     */
+    function getUserDir($device_type_id = DEVICE_TYPE_PC) {
+        switch ($device_type_id) {
+        case DEVICE_TYPE_MOBILE:
+            $userDir = URL_DIR . MOBILE_DIR . USER_DIR;
+            $templateName = MOBILE_TEMPLATE_NAME;
+            break;
+
+        case DEVICE_TYPE_SMARTPHONE:
+            $userDir = URL_DIR . SMARTPHONE_DIR . USER_DIR;
+            break;
+
+        case DEVICE_TYPE_PC:
+        default:
+            $userDir = URL_DIR . USER_DIR;
+        }
+        return $userDir;
     }
 }