Ignore:
Timestamp:
2010/12/14 17:37:25 (13 years ago)
Author:
nanasess
bzr:base-revision:
nanasess@fsm.ne.jp-20101213195626-w9aix1ioq9h42puh
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/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:

ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20101214083718-188dvd71kvb0gt22
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 ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/css.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/header.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/index.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/main_edit.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/template.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/Smarty/templates/admin/design/up_down.tpl ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/helper/SC_Helper_PageLayout.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/LC_Page_Index.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_Header.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
html/mobile/user_data/packages ohkouchi@loop-az.jp-20101214083530-m2f6yk25nh6f83ql
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php

    r19715 r19722  
    9494 
    9595        // ページ一覧を取得 
    96         $this->arrPageList = $this->objLayout->lfgetPageData("page_id <> 0 AND device_type_id = ?", 
     96        $this->arrPageList = $this->objLayout->lfGetPageData("page_id <> 0 AND device_type_id = ?", 
    9797                                                             array($device_type_id)); 
    9898 
     
    104104        // page_id が指定されている場合にはテンプレートデータの取得 
    105105        if (is_numeric($page_id) and $page_id != '') { 
    106             $this->lfGetPageData($page_id, $device_type_id, $objView); 
     106            $this->arrPageData = $this->lfGetPageData($page_id, $device_type_id, $objView); 
    107107        } 
    108108 
     
    111111        switch ($_POST['mode']) { 
    112112            case 'preview': 
    113                 $this->lfPreviewPageData($page_id); 
     113                $this->lfPreviewPageData($page_id, $device_type_id); 
    114114                exit; 
    115115                break; 
    116116 
    117117        case 'delete': 
    118             if (!$this->objLayout->lfCheckBaseData($page_id)) { 
    119                 $this->lfDeletePageData($page_id); 
     118            if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) { 
     119                $this->lfDeletePageData($page_id, $device_type_id); 
    120120                exit; 
    121121            } 
     
    123123 
    124124        case 'confirm': 
    125             $this->lfConfirmPageData($page_id); 
     125            $this->lfConfirmPageData($page_id, $device_type_id); 
    126126        default: 
    127127        } 
     128        $this->device_type_id = $device_type_id; 
    128129    } 
    129130 
     
    148149        $arrPageData = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", 
    149150                                                       array($page_id, $device_type_id)); 
     151         
    150152 
    151153        if (strlen($arrPageData[0]['filename']) == 0) { 
     
    159161        // FIXME 
    160162        // テンプレートファイルが存在していれば読み込む 
    161         $tpl_file =  USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . $arrPageData[0]['filename'] . ".tpl"; 
     163        $templatePath = $this->objLayout->getTemplatePath($device_type_id, true); 
     164        $tpl_file =  $templatePath . $arrPageData[0]['filename'] . ".tpl"; 
     165        $this->p($tpl_file); 
    162166        if (file_exists($tpl_file)){ 
    163167            $arrPageData[0]['tpl_data'] = file_get_contents($tpl_file); 
    164168        // 存在してなければ, 指定されたテンプレートのファイルを読み込む 
    165169        } else { 
    166             $arrPageData[0]['tpl_data'] = file_get_contents(TEMPLATE_DIR . $arrPageData[0]['filename'] . ".tpl"); 
     170            $templatePath = $this->objLayout->getTemplatePath($device_type_id); 
     171            $arrPageData[0]['tpl_data'] = file_get_contents($templatePath . $arrPageData[0]['filename'] . ".tpl"); 
    167172        } 
    168173 
     
    174179        $arrPageData[0]['directory'] = str_replace(USER_DIR, '', $arrPageData[0]['php_dir']); 
    175180 
    176         $this->arrPageData = $arrPageData[0]; 
     181        return $arrPageData[0]; 
    177182    } 
    178183 
    179184    /** 
    180185     * プレビュー画面を表示する. 
     186     * 
     187     * FIXME 
    181188     * 
    182189     * @param integer $page_id ページID 
     
    257264        if (count($this->arrErr) == 0) { 
    258265            // DBへデータを更新する 
    259             $this->lfEntryPageData($_POST); 
     266            $page_id = $this->lfEntryPageData($_POST, $device_type_id); 
    260267 
    261268            // ベースデータでなければファイルを削除し、PHPファイルを作成する 
    262269            if (!$this->objLayout->lfCheckBaseData($page_id, $device_type_id)) { 
    263270                // PHPファイル作成 
    264                 $this->lfCreatePHPFile($_POST['url']); 
     271                $this->lfCreatePHPFile($_POST['url'], $device_type_id); 
    265272            } 
    266273 
    267274            // FIXME 
    268275            // TPLファイル作成 
    269             $cre_tpl = USER_TEMPLATE_PATH . "/" . TEMPLATE_NAME . "/" . basename($_POST['url']) . '.tpl'; 
     276            $cre_tpl = $this->objLayout->getTemplatePath($device_type_id, true) . basename($_POST['url']) . '.tpl'; 
    270277            $this->lfCreateFile($cre_tpl, $_POST['tpl_data']); 
    271278 
     279            /* 
    272280            // 新規作成の場合、 
    273281            if ($page_id == '') { 
     
    276284                $page_id = $arrPageData[0]['page_id']; 
    277285            } 
     286            */ 
    278287            $this->objDisplay->redirect($this->getLocation("./main_edit.php", 
    279288                                    array("page_id" => $page_id, 
     
    302311 
    303312        // 更新データの変換 
    304         $sqlval = $this->lfGetUpdData($arrData); 
     313        $sqlval = $this->lfGetUpdData($arrData, $device_type_id); 
    305314 
    306315        // データが存在しているかチェックを行う 
    307316        if($arrData['page_id'] !== ''){ 
    308             $arrChk = $this->objLayout->lfgetPageData("page_id = ? AND device_type_id = ?", 
     317            $arrChk = $this->objLayout->lfGetPageData("page_id = ? AND device_type_id = ?", 
    309318                                                      array($arrData['page_id'], $device_type_id)); 
    310319        } 
     
    317326            $sqlval['create_date'] = 'now()'; 
    318327            $objQuery->insert('dtb_pagelayout', $sqlval); 
     328            $page_id = $sqlval['page_id']; 
    319329        } 
    320330        // データが存在してる場合にはアップデートを行う 
     
    322332            $objQuery->update('dtb_pagelayout', $sqlval, 'page_id = ? AND device_type_id = ?', 
    323333                              array($arrData['page_id'], $device_type_id)); 
    324         } 
     334            $page_id = $arrData['page_id']; 
     335        } 
     336        return $page_id; 
    325337    } 
    326338 
     
    331343     * @return array 更新データ 
    332344     */ 
    333     function lfGetUpdData($arrData){ 
     345    function lfGetUpdData($arrData, $device_type_id) { 
    334346        $arrUpdData = array( 
    335347            'header_chk'    => SC_Utils_Ex::sfChangeCheckBox($arrData['header_chk']),   // ヘッダー使用 
     
    340352 
    341353        // ベースデータの場合には変更しない。 
    342         if (!$this->objLayout->lfCheckBaseData($arrData['page_id'])) { 
     354        if (!$this->objLayout->lfCheckBaseData($arrData['page_id'], $device_type_id)) { 
    343355            $arrUpdData['page_name']    = $arrData['page_name'] ; 
    344             $arrUpdData['url']          = USER_DIR . $arrData['url'] . '.php'; 
     356            $arrUpdData['url']          = $this->objLayout->getUserDir($device_type_id) . $arrData['url'] . '.php'; 
    345357            $arrUpdData['php_dir']      = dirname($arrUpdData['url']); 
    346358            if ($arrUpdData['php_dir'] == '.') { 
     
    349361                $arrUpdData['php_dir'] .= '/'; 
    350362            } 
    351             $arrUpdData['tpl_dir']      = substr(TPL_DIR, strlen(URL_DIR)); 
     363            $arrUpdData['tpl_dir']      = substr($this->objLayout->getTemplatePath($devie_type_id, true), strlen(URL_DIR)); 
    352364            $arrUpdData['filename']     = basename($arrData['url']); // 拡張子を付加しない 
    353365        } 
     
    443455     * @return void 
    444456     */ 
    445     function lfCreatePHPFile($url){ 
    446  
    447         $path = USER_PATH . $url . ".php"; 
     457    function lfCreatePHPFile($url, $device_type_id){ 
     458 
     459        $path = $this->objLayout->getUserPath($device_type_id) . $url . ".php"; 
    448460 
    449461        // カスタマイズを考慮し、上書きしない。(#831) 
Note: See TracChangeset for help on using the changeset viewer.