Changeset 19725 for branches/version-2_5-dev/data/class/SC_View.php

Timestamp:

2010/12/15 18:06:23 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19724

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/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.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/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

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2454

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-12-15 18:06:11.522000074 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-15T09:06:11.522000Z

Message:

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

• テンプレートの取得方法を修正

File:

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

branches/version-2_5-dev/data/class/SC_View.php

@@ -173 +173 @@
     }
 
+    /**
+     * テンプレートパスをアサインする.
+     *
+     * @param integer $device_type_id 端末種別ID
+     */
+    function assignTemplatePath($device_type_id) {
+
+        // テンプレート変数を割り当て
+        $this->assign("TPL_DIR", SC_Helper_PageLayout_Ex::getUserDir($device_type_id, true));
+
+        // ヘッダとフッタを割り当て
+        $templatePath = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id, true);
+        $header_tpl = $templatePath . "header.tpl";
+        $footer_tpl = $templatePath . "footer.tpl";
+
+        // ユーザー作成のテンプレートが無ければ, 指定テンプレートを割り当て
+        $templatePath = SC_Helper_PageLayout_Ex::getTemplatePath($device_type_id);
+        if (!$this->_smarty->template_exists($header_tpl)) {
+            $header_tpl = $templatePath . "header.tpl";
+        }
+        if (!$this->_smarty->template_exists($footer_tpl)) {
+            $footer_tpl = $templatePath . "footer.tpl";
+        }
+
+        $this->assign("header_tpl", $header_tpl);
+        $this->assign("footer_tpl", $footer_tpl);
+    }
+
     // デバッグ
     function debug($var = true){
@@ -185 +213 @@
         $this->_smarty->compile_dir = COMPILE_ADMIN_DIR;
         $this->assign('TPL_DIR_DEFAULT', URL_DIR . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/');
-        $this->assign('TPL_DIR', URL_DIR . USER_DIR . USER_PACKAGE_DIR . 'admin/');
+        $this->assign('TPL_DIR', URL_DIR . USER_DIR . USER_PACKAGE_DIR . ADMIN_DIR);
         $this->initpath();
     }
@@ -197 +225 @@
         $this->_smarty->compile_dir = COMPILE_DIR;
 
-        // テンプレート変数を割り当て
-        $this->assign("TPL_DIR", URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
-
-        // ヘッダとフッタを割り当て
-        $header_tpl = USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . "header.tpl";
-        $footer_tpl = USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . "footer.tpl";
-
-        // ユーザー作成のテンプレートが無ければ, 指定テンプレートを割り当て
-        if (!$this->_smarty->template_exists($header_tpl)) {
-            $header_tpl = TEMPLATE_DIR . "header.tpl";
-        }
-        if (!$this->_smarty->template_exists($footer_tpl)) {
-            $footer_tpl = TEMPLATE_DIR . "footer.tpl";
-        }
-
-        $this->assign("header_tpl", $header_tpl);
-        $this->assign("footer_tpl", $footer_tpl);
-
+        $this->assignTemplatePath(DEVICE_TYPE_PC);
         $this->initpath();
 
@@ -245 +256 @@
         $this->_smarty->template_dir = MOBILE_TEMPLATE_DIR;
         $this->_smarty->compile_dir = MOBILE_COMPILE_DIR;
-        // テンプレート変数を割り当て
-        $this->assign("TPL_DIR", URL_DIR . MOBILE_DIR . USER_DIR . USER_PACKAGE_DIR . MOBILE_TEMPLATE_NAME . "/");
+        $this->assignTemplatePath(DEVICE_TYPE_MOBILE);
     }
 }
@@ -255 +265 @@
         $this->_smarty->template_dir = SMARTPHONE_TEMPLATE_DIR;
         $this->_smarty->compile_dir = SMARTPHONE_COMPILE_DIR;
-        // テンプレート変数を割り当て
-        $this->assign("TPL_DIR", URL_DIR . SMARTPHONE_DIR . USER_DIR . USER_PACKAGE_DIR . SMARTPHONE_TEMPLATE_NAME . "/");
+        $this->assignTemplatePath(DEVICE_TYPE_SMARTPHONE);
     }
 }