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

Timestamp:

2010/12/15 18:06:23 (15 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/helper/SC_Helper_PageLayout.php (modified) (3 diffs)

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

@@ -312 +312 @@
      * DocumentRoot から user_data のパスを取得する.
      *
-     * @param integer $device_type_id 端末種別ID
+     * 引数 $hasPackage を true にした場合は, user_data/packages/template_name
+     * を取得する.
+     *
+     * @param integer $device_type_id 端末種別ID
+     * @param boolean $hasPackage パッケージのパスも含める場合 true
      * @return string 端末に応じた DocumentRoot から user_data までのパス
      */
-    function getUserDir($device_type_id = DEVICE_TYPE_PC) {
+    function getUserDir($device_type_id = DEVICE_TYPE_PC, $hasPackage = false) {
         switch ($device_type_id) {
         case DEVICE_TYPE_MOBILE:
@@ -324 +328 @@
         case DEVICE_TYPE_SMARTPHONE:
             $userDir = URL_DIR . SMARTPHONE_DIR . USER_DIR;
+            $templateName = SMARTPHONE_TEMPLATE_NAME;
             break;
 
@@ -329 +334 @@
         default:
             $userDir = URL_DIR . USER_DIR;
+            $templateName = TEMPLATE_NAME;
+        }
+        if ($hasPackage) {
+            return $userDir . USER_PACKAGE_DIR . $templateName . "/";
         }
         return $userDir;