[Svn-src-all:839] [version-2_5-dev 19726] * #787(スマートフォン対応)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 15日 (水) 19:43:41 JST
Subversion committed to /home/svn/open 19726
http://svn.ec-cube.net/open_trac/changeset/19726
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-15 19:43:40 +0900 (水, 15 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
* #787(スマートフォン対応)
* 端末に応じてブロックを出力するよう修正
* #832(SC_Helper_PageLayout#sfGetPageLayout の呼び出しに無駄が多い)
* ブロックでは呼ばれないよう修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
U branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
U branches/version-2_5-dev/html/frontparts/bloc/best5.php
U branches/version-2_5-dev/html/frontparts/bloc/calendar.php
U branches/version-2_5-dev/html/frontparts/bloc/cart.php
U branches/version-2_5-dev/html/frontparts/bloc/category.php
U branches/version-2_5-dev/html/frontparts/bloc/login.php
U branches/version-2_5-dev/html/frontparts/bloc/news.php
U branches/version-2_5-dev/html/frontparts/bloc/search_products.php
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -32,6 +32,22 @@
* @version $Id$
*/
class LC_Page_FrontParts_Bloc extends LC_Page {
+
+ // TODO
+ function init() {
+ // 開始時刻を設定する。
+ $this->timeStart = SC_Utils_Ex::sfMicrotimeFloat();
+
+ $this->tpl_authority = $_SESSION['authority'];
+
+ // ディスプレイクラス生成
+ $this->objDisplay = new SC_Display();
+
+ // プラグインクラス生成
+ $this->objPlugin = new SC_Helper_Plugin_Ex();
+ $this->objPlugin->preProcess($this);
+ }
+
/**
* ブロックファイルに応じて tpl_mainpage を設定する
*
@@ -43,13 +59,15 @@
if (substr($bloc_file, 0, 1) == '/') {
$this->tpl_mainpage = $bloc_file;
} else {
- $user_bloc_path = USER_TEMPLATE_PATH . TEMPLATE_NAME . "/" . BLOC_DIR . $bloc_file;
+ $user_bloc_path = SC_Helper_PageLayout_Ex::getTemplatePath($this->objDisplay->detectDevice(), true) . BLOC_DIR . $bloc_file;
if (is_file($user_bloc_path)) {
$this->tpl_mainpage = $user_bloc_path;
} else {
- $this->tpl_mainpage = BLOC_PATH . $bloc_file;
+ $this->tpl_mainpage = SC_Helper_PageLayout_Ex::getTemplatePath($this->objDisplay->detectDevice()) . BLOC_DIR . $bloc_file;
}
}
+
+ $this->setTemplate($this->tpl_mainpage);
$debug_message = "block：" . $this->tpl_mainpage . "\n";
GC_Utils::gfDebugLog($debug_message);
}
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'best5.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('best5.tpl');
}
/**
@@ -53,20 +52,23 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView(false);
- $objSiteInfo = $objView->objSiteInfo;
+ $this->action();
+ $this->sendResponse();
+ }
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
+
// 基本情報を渡す
$objSiteInfo = new SC_SiteInfo();
$this->arrInfo = $objSiteInfo->data;
//おすすめ商品表示
$this->arrBestProducts = $this->lfGetRanking();
-
- if (!empty($this->arrBestProducts)) {
- $objView->assignobj($this);
- $objView->display($this->tpl_mainpage);
- }
}
/**
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -46,8 +46,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'calendar.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('calendar.tpl');
}
/**
@@ -56,19 +55,22 @@
* @return void
*/
function process() {
- $objView = new SC_SiteView(false);
+ $this->action();
+ $this->sendResponse();
+ }
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
// 休日取得取得
$this->arrHoliday = $this->lfGetHoliday();
-
// 定休日取得取得
$this->arrRegularHoliday = $this->lfGetRegularHoliday();
-
// カレンダーデータ取得
$this->arrCalendar = $this->lfGetCalendar(2);
-
- $objView->assignobj($this);
- $objView->display($this->tpl_mainpage);
}
/**
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'cart.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('cart.tpl');
}
/**
@@ -53,7 +52,16 @@
* @return void
*/
function process() {
- $objSubView = new SC_SiteView(false);
+ $this->action();
+ $this->sendResponse();
+ }
+
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
$objCart = new SC_CartSession();
$objSiteInfo = new SC_SiteInfo;
@@ -89,9 +97,6 @@
$this->arrCartList = $arrCartList;
}
-
- $objSubView->assignobj($this);
- $objSubView->display($this->tpl_mainpage);
}
/**
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'category.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('category.tpl');
}
/**
@@ -53,7 +52,16 @@
* @return void
*/
function process() {
- $objSubView = new SC_SiteView(false);
+ $this->action();
+ $this->sendResponse();
+ }
+
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
$objDb = new SC_Helper_DB_Ex();
// 選択中のカテゴリIDを判定する
@@ -62,9 +70,6 @@
// 選択中のカテゴリID
$this->tpl_category_id = empty($arrCategory_id) ? array(0) : $arrCategory_id;;
$this->lfGetCatTree($this->tpl_category_id, true, $this);
-
- $objSubView->assignobj($this);
- $objSubView->display($this->tpl_mainpage);
}
/**
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Login.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'login.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('login.tpl');
$this->tpl_login = false;
$this->tpl_disable_logout = false;
$this->httpCacheControl('nocache');
@@ -56,6 +55,16 @@
* @return void
*/
function process() {
+ $this->action();
+ $this->sendResponse();
+ }
+
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
$objCustomer = new SC_Customer();
// クッキー管理クラス
$objCookie = new SC_Cookie(COOKIE_EXPIRE);
@@ -80,10 +89,7 @@
}
$this->tpl_disable_logout = $this->lfCheckDisableLogout();
- $objSubView = new SC_SiteView(false);
$this->transactionid = SC_Helper_Session_Ex::getToken();
- $objSubView->assignobj($this);
- $objSubView->display($this->tpl_mainpage);
}
/**
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'news.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('news.tpl');
}
/**
@@ -53,13 +52,17 @@
* @return void
*/
function process() {
- $objSubView = new SC_SiteView(false);
+ $this->action();
+ $this->sendResponse();
+ }
- //新着情報取得
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
$this->arrNews = $this->lfGetNews();
-
- $objSubView->assignobj($this);
- $objSubView->display($this->tpl_mainpage);
}
変更: branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -43,8 +43,7 @@
*/
function init() {
parent::init();
- $bloc_file = 'search_products.tpl';
- $this->setTplMainpage($bloc_file);
+ $this->setTplMainpage('search_products.tpl');
}
/**
@@ -53,6 +52,16 @@
* @return void
*/
function process() {
+ $this->action();
+ $this->sendResponse();
+ }
+
+ /**
+ * Page のアクション.
+ *
+ * @return void
+ */
+ function action() {
$arrSearch = array(); // 検索項目表示用
$objDb = new SC_Helper_DB_Ex();
// 選択中のカテゴリIDを判定する
@@ -80,10 +89,6 @@
}
}
$this->arrMakerList = $arrRet;
-
- $objSubView = new SC_SiteView(false);
- $objSubView->assignobj($this);
- $objSubView->display($this->tpl_mainpage);
}
/**
変更: branches/version-2_5-dev/html/frontparts/bloc/best5.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/best5.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/best5.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -22,6 +22,7 @@
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/calendar.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/calendar.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/calendar.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -22,6 +22,7 @@
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/cart.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/cart.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/cart.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -22,6 +22,7 @@
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/category.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/category.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/category.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -22,6 +22,7 @@
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Category_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/login.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/login.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/login.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -22,6 +22,7 @@
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/news.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/news.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/news.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -21,6 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_News_Ex.php");
// }}}
変更: branches/version-2_5-dev/html/frontparts/bloc/search_products.php
===================================================================
--- branches/version-2_5-dev/html/frontparts/bloc/search_products.php 2010-12-15 09:06:23 UTC (rev 19725)
+++ branches/version-2_5-dev/html/frontparts/bloc/search_products.php 2010-12-15 10:43:40 UTC (rev 19726)
@@ -21,6 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
require_once(CLASS_EX_PATH . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_SearchProducts_Ex.php");
// }}}
Svn-src-all メーリングリストの案内