Yammy日記

$ svn merge -r [破棄するリビジョン]:[戻すリビジョン] [ファイル名など]
U  [ファイル名]
$ svn ci [ファイル名]

Date: 2008-04-02 17:02:03 +0900 (Wed, 02 Apr 2008)
New Revision: 41
 
Modified:
   eccube2/trunk/data/class/pages/products/LC_Page_Products_List.php
   eccube2/trunk/data/class/util/SC_Utils.php
Log:
auto commit
 
Modified: eccube2/trunk/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- eccube2/trunk/data/class/pages/products/LC_Page_Products_List.php	2008-04-01 06:01:43 UTC (rev 40)
+++ eccube2/trunk/data/class/pages/products/LC_Page_Products_List.php	2008-04-02 08:02:03 UTC (rev 41)
@@ -72,9 +72,14 @@
      * @return void
      */
     function process() {
+        $objView = new SC_SiteView();
         $conn = new SC_DBConn();
         $objDb = new SC_Helper_DB_Ex();
 
+        // レイアウトデザインを取得
+        $helper = new SC_Helper_PageLayout_Ex();
+        $helper->sfGetPageLayout($this, false, DEF_LAYOUT);
+
         //表示件数の選択
         if(isset($_POST['disp_number'])
            && SC_Utils_Ex::sfIsInt($_POST['disp_number'])) {
@@ -190,7 +195,8 @@
         $this->category_id = $arrCategory_id[0];
         $this->arrSearch = $arrSearch;
 
-        SC_Utils_Ex::sfCustomDisplay($this);
+        $objView->assignobj($this);
+        $objView->display(SITE_FRAME);
     }
 
     /**
@@ -210,6 +216,7 @@
      * @return void
      */
     function mobileProcess() {
+        $objView = new SC_MobileView();
         $conn = new SC_DBConn();
         $objDb = new SC_Helper_DB_Ex();
 
@@ -335,7 +342,6 @@
             $this->tpl_next_page = $objURL->path . '?' . $objURL->getQueryString();
         }
 
-
         $this->tpl_subtitle = $tpl_subtitle;
         $this->tpl_search_mode = $tpl_search_mode;
 
@@ -347,7 +353,9 @@
         $this->category_id = $arrCategory_id[0];
         $this->arrSearch = $arrSearch;
         $this->tpl_mainpage = MOBILE_TEMPLATE_DIR . "products/list.tpl";
-        SC_Utils_Ex::sfCustomDisplay($this, true);
+        
+        $objView->assignobj($this);
+        $objView->display(SITE_FRAME);
     }
 
     /**
 
Modified: eccube2/trunk/data/class/util/SC_Utils.php
===================================================================
--- eccube2/trunk/data/class/util/SC_Utils.php	2008-04-01 06:01:43 UTC (rev 40)
+++ eccube2/trunk/data/class/util/SC_Utils.php	2008-04-02 08:02:03 UTC (rev 41)
@@ -1220,10 +1220,11 @@
         return $time;
     }
 
-    // 出力の際にテンプレートを切り替えられる
-    /*
-        index.php?tpl=test.tpl
-    */
+    /**
+     * テンプレートを切り替えて出力する
+     *
+     * @deprecated 2008/04/02以降使用不可
+     */
     function sfCustomDisplay(&$objPage, $is_mobile = false) {
         $basename = basename($_SERVER["REQUEST_URI"]);
 
@@ -1242,7 +1243,7 @@
         }
 
         $template_path = TEMPLATE_FTP_DIR . $tpl_name;
-
+echo $template_path;
         if($is_mobile === true) {
             $objView = new SC_MobileView();
             $objView->assignobj($objPage);

Date: 2008-04-02 21:01:28 +0900 (Wed, 02 Apr 2008)
New Revision: 42
 
Modified:
   eccube2/trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
Log:
auto commit
 
Modified: eccube2/trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2008-04-02 08:02:03 UTC (rev 41)
+++ eccube2/trunk/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php	2008-04-02 12:01:28 UTC (rev 42)
@@ -31,7 +31,7 @@
  *
  * @package Page
  * @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Admin_Design_Template.php 17180 2008-03-24 12:20:05Z satou $
+ * @version $Id: LC_Page_Admin_Design_Template.php 17200 2008-04-02 11:24:29Z satou $
  */
 class LC_Page_Admin_Design_Template extends LC_Page {
 
@@ -137,7 +137,7 @@
 		    }
 
 		    $template_code = $objForm->getValue('template_code_temp');
-		    if ($template_code == $this->lfGetNowTemplate()) {
+		    if ($template_code == DEFAULT_TEMPLATE_NAME) {
 		        $this->tpl_onload = "alert('選択中のテンプレートは削除出来ません');";
 		        break;
 		    }
@@ -172,7 +172,7 @@
 
 		// defaultパラメータのセット
 		$this->templates = $this->lfGetAllTemplates();
-		$this->now_template = $this->lfGetNowtemplate();
+		$this->now_template = DEFAULT_TEMPLATE_NAME;
 
 		// 画面の表示
 		$objView->assignobj($this);
@@ -226,21 +226,6 @@
 	}
 
 	/**
-	 * 現在適用しているテンプレートパッケージ名を取得する.
-	 *
-	 * @param void
-	 * @return string テンプレートパッケージ名
-	 */
-	function lfGetNowTemplate() {
-	    $objQuery = new SC_Query();
-	    $arrRet = $objQuery->select('top_tpl', 'dtb_baseinfo');
-	    if (isset($arrRet[0]['top_tpl'])) {
-	        return $arrRet[0]['top_tpl'];
-	    }
-	    return null;
-	}
-
-	/**
 	 * 使用するテンプレートをDBへ登録する
 	 */
 	function lfRegisterTemplate($template_code) {

Generated by tDiary version 2.2.1
Powered by Ruby version 1.8.7