[Svn-src-all:1204] [version-2_5-dev 20092] #985 リファクタリング(エラー画面)

yomoro admin @ mail.ec-cube.net
2011年 2月 4日 (金) 18:15:32 JST


Subversion committed to /home/svn/open 20092
http://svn.ec-cube.net/open_trac/changeset/20092
┌────────────────────────────┐
│更新者 :  yomoro                                       │
│更新日時:  2011-02-04 18:15:31 +0900 (金, 04  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#985 リファクタリング(エラー画面)

Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
A   branches/version-2_5-dev/data/Smarty/templates/sphone/error.tpl
U   branches/version-2_5-dev/data/class/pages/error/LC_Page_Error.php
U   branches/version-2_5-dev/html/user_data/packages/sphone/css/common.css

コピーによる追加: branches/version-2_5-dev/data/Smarty/templates/sphone/error.tpl (コピー元: リビジョン 20091, branches/version-2_5-dev/data/Smarty/templates/default/error.tpl)
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/error.tpl	                        (rev 0)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/error.tpl	2011-02-04 09:15:31 UTC (rev 20092)
@@ -0,0 +1,26 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *}-->
+ <!--▼CONTENTS-->
+<div>
+      <p class="error"><!--{$tpl_error}--></p>
+</div>
+<!--▲CONTENTS-->

変更: branches/version-2_5-dev/data/class/pages/error/LC_Page_Error.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/error/LC_Page_Error.php	2011-02-04 07:26:14 UTC (rev 20091)
+++ branches/version-2_5-dev/data/class/pages/error/LC_Page_Error.php	2011-02-04 09:15:31 UTC (rev 20092)
@@ -59,29 +59,28 @@
      * @return void
      */
     function init() {
+		parent::init();
         $this->tpl_mainpage = 'error.tpl';
         $this->tpl_title = 'エラー';
     }
 
     /**
-     * Page のプロセス。
+     * Page のプロセス.
      *
      * @return void
      */
     function process() {
         parent::process();
+        $this->action();
+        $this->sendResponse();
+    }
 
-        // XXX 未使用?
-        if ($this->objSiteSess != "") {
-            $this->objSiteSess->setNowPage('error');
-        }
-
-        if($this->is_mobile === true) {
-            $objView = new SC_MobileView();
-        } else {
-            $objView = new SC_SiteView();
-        }
-
+    /**
+     * Page のプロセス。
+     *
+     * @return void
+     */
+    function action(){
         switch ($this->type) {
             case PRODUCT_NOT_FOUND:
                 $this->tpl_error="ご指定のページはございません。";
@@ -158,9 +157,6 @@
                 $this->tpl_error="エラーが発生しました。";
                 break;
         }
-
-        $objView->assignobj($this);
-        $objView->display(SITE_FRAME);
     }
 
     /**

変更: branches/version-2_5-dev/html/user_data/packages/sphone/css/common.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/sphone/css/common.css	2011-02-04 07:26:14 UTC (rev 20091)
+++ branches/version-2_5-dev/html/user_data/packages/sphone/css/common.css	2011-02-04 09:15:31 UTC (rev 20092)
@@ -250,6 +250,12 @@
 /* error
 ----------------------------------------*/
 
+div .error {
+	text-align:center;
+    padding: 30px 0;
+}
+
+
 /* フォーム
 ----------------------------------------------- */
 input[size="40"] {




Svn-src-all メーリングリストの案内