Changeset 23409


Ignore:
Timestamp:
2014/05/12 15:52:35 (6 years ago)
Author:
pineray
Message:

#2544 公開側のViewクラスをひとつにまとめる

Location:
branches/version-2_13-dev/data/class
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/class/SC_Display.php

    r23124 r23409  
    116116                } 
    117117                $this->response->setContentType('text/html'); 
    118                 $this->setView(new SC_MobileView_Ex()); 
     118                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_MOBILE)); 
    119119                break; 
    120120            case DEVICE_TYPE_SMARTPHONE: 
    121                 $this->setView(new SC_SmartphoneView_Ex()); 
     121                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_SMARTPHONE)); 
    122122                break; 
    123123            case DEVICE_TYPE_PC: 
    124                 $this->setView(new SC_SiteView_Ex()); 
     124                $this->setView(new SC_SiteView_Ex(true, DEVICE_TYPE_PC)); 
    125125                break; 
    126126            case DEVICE_TYPE_ADMIN: 
  • branches/version-2_13-dev/data/class/SC_SiteView.php

    r23370 r23409  
    2424class SC_SiteView extends SC_View_Ex 
    2525{ 
    26     public function __construct($setPrevURL = true) 
     26    public function __construct($setPrevURL = true, $device = DEVICE_TYPE_PC) 
    2727    { 
    2828        parent::__construct(); 
     29 
     30        switch ($device) { 
     31            case DEVICE_TYPE_MOBILE: 
     32                $this->_smarty->template_dir = realpath(MOBILE_TEMPLATE_REALDIR); 
     33                $this->_smarty->compile_dir = realpath(MOBILE_COMPILE_REALDIR); 
     34                $this->assignTemplatePath(DEVICE_TYPE_MOBILE); 
     35                break; 
     36 
     37            case DEVICE_TYPE_SMARTPHONE: 
     38                $this->_smarty->template_dir = realpath(SMARTPHONE_TEMPLATE_REALDIR); 
     39                $this->_smarty->compile_dir = realpath(SMARTPHONE_COMPILE_REALDIR); 
     40                $this->assignTemplatePath(DEVICE_TYPE_SMARTPHONE); 
     41                break; 
     42 
     43            case DEVICE_TYPE_PC: 
     44                $this->_smarty->template_dir = realpath(TEMPLATE_REALDIR); 
     45                $this->_smarty->compile_dir = realpath(COMPILE_REALDIR); 
     46                $this->assignTemplatePath(DEVICE_TYPE_PC); 
     47                break; 
     48        } 
    2949 
    3050        if ($setPrevURL) { 
    3151            $this->setPrevURL(); 
    3252        } 
    33     } 
    3453 
    35     public function init() 
    36     { 
    37         parent::init(); 
    38  
    39         $this->_smarty->template_dir = realpath(TEMPLATE_REALDIR); 
    40         $this->_smarty->compile_dir = realpath(COMPILE_REALDIR); 
    41  
    42         $this->assignTemplatePath(DEVICE_TYPE_PC); 
     54        SC_Helper_Plugin_Ex::hook("SC_SiteView_Construct_After", array($this)); 
    4355    } 
    4456 
  • branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php

    r23360 r23409  
    174174        $objMailView = null; 
    175175        if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) { 
    176             $objMailView = new SC_MobileView_Ex(); 
     176            $objMailView = new SC_SiteView_Ex(true, DEVICE_TYPE_MOBILE); 
    177177        } else { 
    178178            $objMailView = new SC_SiteView_Ex(); 
Note: See TracChangeset for help on using the changeset viewer.