[Svn-src-all:835] [version-2_5-dev 19722] #748(モバイル/スマートフォンのデザイン管理)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 14日 (火) 17:37:26 JST
Subversion committed to /home/svn/open 19722
http://svn.ec-cube.net/open_trac/changeset/19722
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-14 17:37:25 +0900 (火, 14 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#748(モバイル/スマートフォンのデザイン管理)
* tpl ファイルの取得方法を修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
U branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
U branches/version-2_5-dev/data/class/pages/LC_Page_Index.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
A branches/version-2_5-dev/html/mobile/user_data/packages/
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -24,6 +24,8 @@
<form name="form_bloc" id="form_bloc" method="post" action="?" >
<input type="hidden" name="mode" value="" />
<input type="hidden" name="bloc_id" value="<!--{$bloc_id}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
+
<!--{* ▼ブロック設定ここから *}-->
<!--{if $arrBlocData.tpl_path != '' and $preview == on}-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -25,6 +25,7 @@
<input type="hidden" name="mode" value="" />
<input type="hidden" name="area_row" value="<!--{$area_row}-->" />
<input type="hidden" name="old_css_name" value="<!--{$old_css_name}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
<div id="design" class="contents-main">
<!--▼CSS設定ここから-->
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -46,6 +46,8 @@
<input type="hidden" name="division" value="header" />
<input type="hidden" name="header_row" value="<!--{$header_row}-->" />
<input type="hidden" name="browser_type" value="" />
+ <input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
+
<textarea name="header" rows="<!--{$header_row}-->" wrap="off" style="width: 100%;"><!--{$header_data|smarty:nodefaults}--></textarea>
<div class="btn">
<button type="button" onClick="ChangeSize(this, header, 50, 13, header_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
@@ -74,6 +76,8 @@
<input type="hidden" name="division" value="footer" />
<input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
<input type="hidden" name="browser_type" value="" />
+ <input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
+
<textarea name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|smarty:nodefaults}--></textarea>
<div class="btn">
<button type="button" onClick="ChangeSize(this, footer, 50, 13, footer_row)"><span><!--{if $footer_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -20,6 +20,8 @@
<input type="hidden" name="mode" value="" />
<input type="hidden" name="page_id" value="<!--{$page_id}-->" />
<input type="hidden" name="bloc_cnt" value="<!--{$bloc_cnt}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
+
<div id="design" class="contents-main">
<!--{* ▼レイアウトここから *}-->
<div style="float: left; width: 75%;" align="center">
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -47,6 +47,7 @@
<form name="form_edit" id="form_edit" method="post" action="?" >
<input type="hidden" name="mode" value="" />
<input type="hidden" name="page_id" value="<!--{$page_id}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
<!--{if $arrErr.page_id_err != ""}-->
<div class="message">
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -38,6 +38,7 @@
<input type="hidden" name="mode" value="" />
<input type="hidden" name="template_code_temp" value="" />
<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
<div id="design" class="contents-main">
<p style="margin-bottom: 20px">
テンプレートを選択し、「この内容で登録する」ボタンを押すと、<br />
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl 2010-12-14 08:37:25 UTC (rev 19722)
@@ -37,6 +37,7 @@
<form name="form1" method="post" action="?" enctype="multipart/form-data">
<input type="hidden" name="mode" value="" />
<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
+<input type="hidden" name="device_type_id" value="<!--{$device_type_id|escape}-->" />
<div id="disign" class="contents-main">
<p class="remark">
テンプレートパッケージのアップロードを行います。<br />
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -63,22 +63,19 @@
$arrPageLayout = $arrPageData[0];
- // tpl_mainpageの設定なし、又はトップページの場合
- if (!isset($objPage->tpl_mainpage) || $url == "index.php") {
- // ユーザテンプレートのパスを取得
- $user_tpl = $this->getTemplatePath($device_type_id, true)
- . $arrPageLayout['filename'] . ".tpl";
+ // ユーザテンプレートのパスを取得
+ $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";
+ }
// ページタイトルを設定
if (!isset($objPage->tpl_title)) {
@@ -267,23 +264,72 @@
switch ($device_type_id) {
case DEVICE_TYPE_MOBILE:
$dir = MOBILE_TEMPLATE_DIR;
+ $userPath = HTML_PATH . MOBILE_DIR . USER_DIR;
$templateName = MOBILE_TEMPLATE_NAME;
break;
case DEVICE_TYPE_SMARTPHONE:
$dir = SMARTPHONE_TEMPLATE_DIR;
+ $userPath = HTML_PATH . SMARTPHONE_DIR . USER_DIR;
$templateName = SMARTPHONE_TEMPLATE_NAME;
break;
case DEVICE_TYPE_PC:
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;
+ }
}
?>
変更: branches/version-2_5-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/LC_Page_Index.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/LC_Page_Index.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -43,8 +43,6 @@
*/
function init() {
parent::init();
- $this->tpl_mainpage = 'top.tpl';
- $this->tpl_column_num = 3;
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -259,6 +259,7 @@
$this->tpl_arrBloc = $tpl_arrBloc;
$this->bloc_cnt = count($tpl_arrBloc);
$this->page_id = $page_id;
+ $this->device_type_id = $device_type_id;
// ページ名称を取得
$arrPageData = $objLayout->lfGetPageData('page_id = ? AND device_type_id = ?', array($page_id, $device_type_id));
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -218,6 +218,7 @@
}
break;
}
+ $this->device_type_id = $device_type_id;
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -124,6 +124,7 @@
// ファイルリストを取得
$this->arrCSSList = $this->lfGetCSSList($css_dir);
+ $this->device_type_id = $device_type_id;
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -132,6 +132,7 @@
// テキストエリアに表示
$this->header_data = $header_data;
$this->footer_data = $footer_data;
+ $this->device_type_id = $device_type_id;
if (isset($_POST['header_row']) && $_POST['header_row'] != ''){
$this->header_row = $_POST['header_row'];
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -93,7 +93,7 @@
}
// ページ一覧を取得
- $this->arrPageList = $this->objLayout->lfgetPageData("page_id <> 0 AND device_type_id = ?",
+ $this->arrPageList = $this->objLayout->lfGetPageData("page_id <> 0 AND device_type_id = ?",
array($device_type_id));
// メッセージ表示
@@ -103,28 +103,29 @@
// page_id が指定されている場合にはテンプレートデータの取得
if (is_numeric($page_id) and $page_id != '') {
- $this->lfGetPageData($page_id, $device_type_id, $objView);
+ $this->arrPageData = $this->lfGetPageData($page_id, $device_type_id, $objView);
}
if (!isset($_POST['mode'])) $_POST['mode'] = "";
switch ($_POST['mode']) {
case 'preview':
- $this->lfPreviewPageData($page_id);
+ $this->lfPreviewPageData($page_id, $device_type_id);
exit;
break;
case 'delete':
- if (!$this->objLayout->lfCheckBaseData($page_id)) {
- $this->lfDeletePageData($page_id);
+ if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) {
+ $this->lfDeletePageData($page_id, $device_type_id);
exit;
}
break;
case 'confirm':
- $this->lfConfirmPageData($page_id);
+ $this->lfConfirmPageData($page_id, $device_type_id);
default:
}
+ $this->device_type_id = $device_type_id;
}
/**
@@ -147,6 +148,7 @@
function lfGetPageData($page_id, $device_type_id, $objView){
$arrPageData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
array($page_id, $device_type_id));
+
if (strlen($arrPageData[0]['filename']) == 0) {
$this->arrErr['page_id_err'] = "※ 指定されたページは編集できません。";
@@ -158,12 +160,15 @@
// FIXME
// テンプレートファイルが存在していれば読み込む
- $tpl_file = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl";
+ $templatePath = $this->objLayout->getTemplatePath($device_type_id, true);
+ $tpl_file = $templatePath . $arrPageData[0]['filename'] . ".tpl";
+ $this->p($tpl_file);
if (file_exists($tpl_file)){
$arrPageData[0]['tpl_data'] = file_get_contents($tpl_file);
// 存在してなければ, 指定されたテンプレートのファイルを読み込む
} else {
- $arrPageData[0]['tpl_data'] = file_get_contents(TEMPLATE_DIR . $arrPageData[0]['filename'] . ".tpl");
+ $templatePath = $this->objLayout->getTemplatePath($device_type_id);
+ $arrPageData[0]['tpl_data'] = file_get_contents($templatePath . $arrPageData[0]['filename'] . ".tpl");
}
// チェックボックスの値変更
@@ -173,12 +178,14 @@
// ディレクトリを画面表示用に編集
$arrPageData[0]['directory'] = str_replace(USER_DIR, '', $arrPageData[0]['php_dir']);
- $this->arrPageData = $arrPageData[0];
+ return $arrPageData[0];
}
/**
* プレビュー画面を表示する.
*
+ * FIXME
+ *
* @param integer $page_id ページID
* @param integer $device_type_id 端末種別ID
* @return void
@@ -256,25 +263,27 @@
// エラーがなければ更新処理を行う
if (count($this->arrErr) == 0) {
// DBへデータを更新する
- $this->lfEntryPageData($_POST);
+ $page_id = $this->lfEntryPageData($_POST, $device_type_id);
// ベースデータでなければファイルを削除し、PHPファイルを作成する
if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) {
// PHPファイル作成
- $this->lfCreatePHPFile($_POST['url']);
+ $this->lfCreatePHPFile($_POST['url'], $device_type_id);
}
// FIXME
// TPLファイル作成
- $cre_tpl = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . basename($_POST['url']) . '.tpl';
+ $cre_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . basename($_POST['url']) . '.tpl';
$this->lfCreateFile($cre_tpl, $_POST['tpl_data']);
+ /*
// 新規作成の場合、
if ($page_id == '') {
// ページIDを取得する
$arrPageData = $this->objLayout->lfGetPageData("url = ? AND page_id <> 0" , array(USER_DIR . $_POST['url'] . '.php'));
$page_id = $arrPageData[0]['page_id'];
}
+ */
$this->objDisplay->redirect($this->getLocation("./main_edit.php",
array("page_id" => $page_id,
"device_type_id" => $device_type_id,
@@ -301,11 +310,11 @@
$arrChk = array(); // 排他チェック用
// 更新データの変換
- $sqlval = $this->lfGetUpdData($arrData);
+ $sqlval = $this->lfGetUpdData($arrData, $device_type_id);
// データが存在しているかチェックを行う
if($arrData['page_id'] !== ''){
- $arrChk = $this->objLayout->lfgetPageData("page_id = ? AND device_type_id = ?",
+ $arrChk = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?",
array($arrData['page_id'], $device_type_id));
}
@@ -316,12 +325,15 @@
$sqlval['device_type_id'] = $device_type_id;
$sqlval['create_date'] = 'now()';
$objQuery->insert('dtb_pagelayout', $sqlval);
+ $page_id = $sqlval['page_id'];
}
// データが存在してる場合にはアップデートを行う
else {
$objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ? AND device_type_id = ?',
array($arrData['page_id'], $device_type_id));
+ $page_id = $arrData['page_id'];
}
+ return $page_id;
}
/**
@@ -330,7 +342,7 @@
* @param array $arrData 更新データ
* @return array 更新データ
*/
- function lfGetUpdData($arrData){
+ function lfGetUpdData($arrData, $device_type_id) {
$arrUpdData = array(
'header_chk' => SC_Utils_Ex::sfChangeCheckBox($arrData['header_chk']), // ヘッダー使用
'footer_chk' => SC_Utils_Ex::sfChangeCheckBox($arrData['footer_chk']), // フッター使用
@@ -339,16 +351,16 @@
);
// ベースデータの場合には変更しない。
- if (!$this->objLayout->lfCheckBaseData($arrData['page_id'])) {
+ if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) {
$arrUpdData['page_name'] = $arrData['page_name'] ;
- $arrUpdData['url'] = USER_DIR . $arrData['url'] . '.php';
+ $arrUpdData['url'] = $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php';
$arrUpdData['php_dir'] = dirname($arrUpdData['url']);
if ($arrUpdData['php_dir'] == '.') {
$arrUpdData['php_dir'] = '';
} else {
$arrUpdData['php_dir'] .= '/';
}
- $arrUpdData['tpl_dir'] = substr(TPL_DIR, strlen(URL_DIR));
+ $arrUpdData['tpl_dir'] = substr($this->objLayout->getTemplatePath($devie_type_id, true), strlen(URL_DIR));
$arrUpdData['filename'] = basename($arrData['url']); // 拡張子を付加しない
}
@@ -442,9 +454,9 @@
* @param string $path PHPファイルのパス
* @return void
*/
- function lfCreatePHPFile($url){
+ function lfCreatePHPFile($url, $device_type_id){
- $path = USER_PATH . $url . ".php";
+ $path = $this->objLayout->getUserPath($device_type_id) . $url . ".php";
// カスタマイズを考慮し、上書きしない。(#831)
if (file_exists($path)) {
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -188,6 +188,7 @@
// defaultパラメータのセット
$this->templates = $this->lfGetAllTemplates();
$this->now_template = TEMPLATE_NAME;
+ $this->device_type_id = $device_type_id;
}
/**
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php 2010-12-13 19:56:30 UTC (rev 19721)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php 2010-12-14 08:37:25 UTC (rev 19722)
@@ -118,6 +118,7 @@
default:
break;
}
+ $this->device_type_id = $device_type_id;
}
/**
Svn-src-all メーリングリストの案内