[Svn-src-all:811] [version-2_5-dev 19698] #787 スマートフォン対応

[nanasess]

Subversion committed to /home/svn/open 19698
http://svn.ec-cube.net/open_trac/changeset/19698
┌────────────────────────────┐
│更新者　:  nanasess                                     │
│更新日時:  2010-12-01 15:26:56 +0900 (水, 01 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#787 スマートフォン対応
 * 「当サイトについて」が表示できなかったのを修正


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/default/abouts/index.tpl
U   branches/version-2_5-dev/data/class/SC_View.php
U   branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php

変更: branches/version-2_5-dev/data/Smarty/templates/default/abouts/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/abouts/index.tpl	2010-12-01 03:33:54 UTC (rev 19697)
+++ branches/version-2_5-dev/data/Smarty/templates/default/abouts/index.tpl	2010-12-01 06:26:56 UTC (rev 19698)
@@ -54,66 +54,66 @@
 
     <table summary="当サイトについて">
 
-      <!--{if strlen($_site.shop_name)}-->
+      <!--{if strlen($objSiteInfo->data.shop_name)}-->
         <tr>
           <th>店名</th>
-          <td><!--{$_site.shop_name|escape}--></td>
+          <td><!--{$objSiteInfo->data.shop_name|escape}--></td>
         </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.company_name)}-->
+      <!--{if strlen($objSiteInfo->data.company_name)}-->
       <tr>
         <th>会社名</th>
-        <td><!--{$_site.company_name|escape}--></td>
+        <td><!--{$objSiteInfo->data.company_name|escape}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.zip01)}-->
+      <!--{if strlen($objSiteInfo->data.zip01)}-->
       <tr>
         <th>住所</th>
-        <td>〒<!--{$_site.zip01|escape}-->-<!--{$_site.zip02|escape}--><br /><!--{$_site.pref|escape}--><!--{$_site.addr01|escape}--><!--{$_site.addr02|escape}--></td>
+        <td>〒<!--{$objSiteInfo->data.zip01|escape}-->-<!--{$objSiteInfo->data.zip02|escape}--><br /><!--{$objSiteInfo->data.pref|escape}--><!--{$objSiteInfo->data.addr01|escape}--><!--{$objSiteInfo->data.addr02|escape}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.tel01)}-->
+      <!--{if strlen($objSiteInfo->data.tel01)}-->
       <tr>
         <th>電話番号</th>
-        <td><!--{$_site.tel01|escape}-->-<!--{$_site.tel02|escape}-->-<!--{$_site.tel03|escape}--></td>
+        <td><!--{$objSiteInfo->data.tel01|escape}-->-<!--{$objSiteInfo->data.tel02|escape}-->-<!--{$objSiteInfo->data.tel03|escape}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.fax01)}-->
+      <!--{if strlen($objSiteInfo->data.fax01)}-->
       <tr>
         <th>FAX番号</th>
-        <td><!--{$_site.fax01|escape}-->-<!--{$_site.fax02|escape}-->-<!--{$_site.fax03|escape}--></td>
+        <td><!--{$objSiteInfo->data.fax01|escape}-->-<!--{$objSiteInfo->data.fax02|escape}-->-<!--{$objSiteInfo->data.fax03|escape}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.email02)}-->
+      <!--{if strlen($objSiteInfo->data.email02)}-->
       <tr>
         <th>メールアドレス</th>
-        <td><a href="mailto:<!--{$_site.email02|escape:'hex'}-->"><!--{$_site.email02|escape:'hexentity'}--></a></td>
+        <td><a href="mailto:<!--{$objSiteInfo->data.email02|escape:'hex'}-->"><!--{$objSiteInfo->data.email02|escape:'hexentity'}--></a></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.business_hour)}-->
+      <!--{if strlen($objSiteInfo->data.business_hour)}-->
       <tr>
         <th>営業時間</th>
-        <td><!--{$_site.business_hour|escape}--></td>
+        <td><!--{$objSiteInfo->data.business_hour|escape}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.good_traded)}-->
+      <!--{if strlen($objSiteInfo->data.good_traded)}-->
       <tr>
         <th>取扱商品</th>
-        <td><!--{$_site.good_traded|escape|nl2br}--></td>
+        <td><!--{$objSiteInfo->data.good_traded|escape|nl2br}--></td>
       </tr>
       <!--{/if}-->
 
-      <!--{if strlen($_site.message)}-->
+      <!--{if strlen($objSiteInfo->data.message)}-->
       <tr>
         <th>メッセージ</th>
-        <td><!--{$_site.message|escape|nl2br}--></td>
+        <td><!--{$objSiteInfo->data.message|escape|nl2br}--></td>
       </tr>
       <!--{/if}-->
 

変更: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php	2010-12-01 03:33:54 UTC (rev 19697)
+++ branches/version-2_5-dev/data/class/SC_View.php	2010-12-01 06:26:56 UTC (rev 19698)
@@ -68,6 +68,7 @@
         }
 
         // サイト情報を取得する
+        // XXX 要動作確認. 不要の可能性有り
         if($siteinfo) {
             if(!defined('LOAD_SITEINFO')) {
                 $this->objSiteInfo = new SC_SiteInfo();

変更: branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php	2010-12-01 03:33:54 UTC (rev 19697)
+++ branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php	2010-12-01 06:26:56 UTC (rev 19698)
@@ -46,6 +46,8 @@
         $this->tpl_mainpage = 'abouts/index.tpl';
         $this->tpl_page_category = 'abouts';
         $this->tpl_title = '当サイトについて';
+        $masterData = new SC_DB_MasterData_Ex();
+        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
     }
 
     /**
@@ -68,6 +70,11 @@
         // レイアウトデザインを取得
         $layout = new SC_Helper_PageLayout_Ex();
         $layout->sfGetPageLayout($this, false, DEF_LAYOUT);
+
+        $this->objSiteInfo = new SC_SiteInfo();
+        $this->objSiteInfo->data['pref'] =
+            isset($this->arrPref[$this->objSiteInfo->data['pref']])
+            ? $this->arrPref[$this->objSiteInfo->data['pref']] : "";
     }
 
     /**