Changeset 19725 for branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php

Timestamp:

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

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

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:

ohkouchi@loop-az.jp-20101215090611-0mqtkfcbju06ba0c

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/pages/admin/design/LC_Page_Admin_Design_Header.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php

@@ -75 +75 @@
         SC_Utils_Ex::sfIsSuccess($objSess);
 
+        $this->objLayout = new SC_Helper_PageLayout_Ex();
+
+        // 端末種別IDを取得
+        if (isset($_REQUEST['device_type_id'])
+            && is_numeric($_REQUEST['device_type_id'])) {
+            $device_type_id = $_REQUEST['device_type_id'];
+        } else {
+            $device_type_id = DEVICE_TYPE_PC;
+        }
+
         $division = isset($_POST['division']) ? $_POST['division'] : "";
         $pre_DIR = USER_INC_PATH . 'preview/';
@@ -87 +97 @@
             // 登録時はプレビュー用テンプレートをコピーする
             if ($_POST['mode'] == 'confirm'){
-                copy($pre_DIR.$division.".tpl", USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . $division . ".tpl");
+                copy($pre_DIR.$division.".tpl", $this->objLayout->getTemplatePath($device_type_id, true) . $division . ".tpl");
                 // 完了メッセージ（プレビュー時は表示しない）
                 $this->tpl_onload="alert('登録が完了しました。');";
@@ -112 +122 @@
             // ユーザーパスにテンプレートが存在しなければ,
             // 指定テンプレートから読み込む
-            $header_tpl = USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . "header.tpl";
+            $header_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . "header.tpl";
             if (!is_file($header_tpl)) {
-                $header_tpl = TEMPLATE_DIR . "header.tpl";
+                $header_tpl = $this->objLayout->getTemplatePath($device_type_id) . "header.tpl";
             }
-            $footer_tpl = USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/" . "footer.tpl";
+            $footer_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . "footer.tpl";
             if (!is_file($footer_tpl)) {
-                $footer_tpl = TEMPLATE_DIR . "footer.tpl";
+                $footer_tpl = $this->objLayout->getTemplatePath($device_type_id) . "footer.tpl";
             }