Changeset 17116

Timestamp:

2008/03/11 11:08:47 (16 years ago)

Author:

pineray

Message:

merge r17096 17104

Location:

branches/comu-ver2

Files:

• data/Smarty/templates/default/site_main.tpl (modified) (5 diffs)
• data/class/helper/SC_Helper_PageLayout.php (modified) (2 diffs)
• data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php (modified) (1 diff)
• data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php (modified) (1 diff)
• data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php (modified) (1 diff)
• html/user_data/packages/default/css/main.css (modified) (2 diffs)
• html/user_data/packages/default/css/under.css (modified) (1 diff)

branches/comu-ver2/data/Smarty/templates/default/site_main.tpl

@@ -42 +42 @@
 <div id="container">
 
-  <!--{if $tpl_column_num > 1}-->
   <!--{* ▼LEFT COLUMN *}-->
+  <!--{if $arrPageLayout.LeftNavi|@count > 0}-->
   <div id="leftcolumn">
-
     <!--{* ▼左ナビ *}-->
-    <!--{if $arrPageLayout.LeftNavi|@count > 0}-->
       <!--{foreach key=LeftNaviKey item=LeftNaviItem from=$arrPageLayout.LeftNavi}-->
         <!-- ▼<!--{$LeftNaviItem.bloc_name}--> ここから-->
@@ -57 +55 @@
         <!-- ▲<!--{$LeftNaviItem.bloc_name}--> ここまで-->
       <!--{/foreach}-->
-    <!--{/if}-->
     <!--{* ▲左ナビ *}-->
   </div>
+  <!--{/if}-->
   <!--{* ▲LEFT COLUMN *}-->
+
+  <!--{* ▼CENTER COLUMN *}-->
+  <!--{if $tpl_column_num == 3}-->
+  <div id="three_maincolumn">
+  <!--{elseif $tpl_column_num == 2}-->
+  <div id="two_maincolumn">
+  <!--{elseif $tpl_column_num == 1}-->
+  <div id="one_maincolumn">
   <!--{/if}-->
-
-  <!--{if $tpl_column_num == 3}-->
-  <!--{* ▼CENTER COLUMN *}-->
-  <div id="centercolumn">
-  <!--{/if}-->
-
     <!--{* ▼メイン上部 *}-->
     <!--{if $arrPageLayout.MainHead|@count > 0}-->
@@ -81 +81 @@
     <!--{/if}-->
     <!--{* ▲メイン上部 *}-->
-
-    <!--{if $tpl_column_num == 1}-->
-    <div id="one_column">
-    <!--{/if}-->
+    
+    <!--{* ▼メイン *}-->
     <!--{include file=$tpl_mainpage}-->
-    <!--{if $tpl_column_num == 1}-->
-    </div>
-    <!--{/if}-->
-
+    <!--{* ▲メイン *}-->
+    
     <!--{* ▼メイン下部 *}-->
     <!--{if $arrPageLayout.MainFoot|@count > 0}-->
@@ -103 +99 @@
     <!--{/if}-->
     <!--{* ▲メイン下部 *}-->
-
-  <!--{if $tpl_column_num == 3}-->
   </div>
   <!--{* ▲CENTER COLUMN *}-->
 
   <!--{* ▼RIGHT COLUMN *}-->
+  <!--{if $arrPageLayout.RightNavi|@count > 0}-->
   <div id="rightcolumn">
     <!--{* ▼右ナビ *}-->
-    <!--{if $arrPageLayout.RightNavi|@count > 0}-->
       <!--{foreach key=RightNaviKey item=RightNaviItem from=$arrPageLayout.RightNavi}-->
         <!-- ▼<!--{$RightNaviItem.bloc_name}--> ここから-->
@@ -121 +115 @@
         <!-- ▲<!--{$RightNaviItem.bloc_name}--> ここまで-->
       <!--{/foreach}-->
-    <!--{/if}-->
     <!--{* ▲右ナビ *}-->
   </div>
+  <!--{/if}-->
   <!--{* ▲RIGHT COLUMN *}-->
-  <!--{/if}-->
 
 </div>

branches/comu-ver2/data/class/helper/SC_Helper_PageLayout.php

@@ -102 +102 @@
         $arrPageLayout['RightNavi'] = $this->lfGetNavi($arrNavi,3); // RIGHT NAVI
         $arrPageLayout['MainFoot']  = $this->lfGetNavi($arrNavi,4); // メイン下部
-        
+
         GC_Utils::gfDebugLog($arrPageLayout);
-                
+        
         $objPage->arrPageLayout = $arrPageLayout;
         
+        // カラム数を取得する
+        $objPage->tpl_column_num = $this->lfGetColumnNum($arrPageLayout);
+
         GC_Utils::gfDebugLog($debug_message);
     }
@@ -233 +236 @@
 
     /**
+     * カラム数を取得する.
+     * 
+     * @param array $arrPageLayout レイアウト情報の配列
+     * @return integer $col_num カラム数
+     */
+    function lfGetColumnNum($arrPageLayout) {
+        // メインは確定
+        $col_num = 1;
+        // LEFT NAVI
+        if (count($arrPageLayout['LeftNavi']) > 0) $col_num++;
+        // RIGHT NAVI
+        if (count($arrPageLayout['RightNavi']) > 0) $col_num++;
+        
+        return $col_num;
+    }
+
+    /**
      * ページ情報を削除する.
      *

branches/comu-ver2/data/class_extends/page_extends/guide/LC_Page_Guide_Charge_Ex.php

@@ -1 @@
-]<?php
+<?php
 /*
  * This file is part of EC-CUBE

branches/comu-ver2/data/class_extends/page_extends/guide/LC_Page_Guide_Kiyaku_Ex.php

@@ -1 @@
-]<?php
+<?php
 /*
  * This file is part of EC-CUBE

branches/comu-ver2/data/class_extends/page_extends/guide/LC_Page_Guide_Privacy_Ex.php

@@ -1 @@
-]<?php
+<?php
 /*
  * This file is part of EC-CUBE

branches/comu-ver2/html/user_data/packages/default/css/main.css

@@ -171 +171 @@
 }
 
-div#centercolumn {
+div#rightcolumn {
+    float: left;
+    width: 166px;
+}
+
+div#rightcolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* メインコンテンツ
+----------------------------------------------- */
+/* 3カラム設定 */
+div#three_maincolumn {
     float: left;
     width: 432px;
@@ -177 +189 @@
 }
 
-div#centercolumn h2 {
-    padding: 15px 0 0 0;
-}
-
-div#rightcolumn {
-    float: left;
-    width: 166px;
-}
-
-div#rightcolumn h2 {
-    padding: 15px 0 0 0;
-}
-
-/* 1カラム設定
------------------------------------------------ */
-div#one_column {
+div#three_maincolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* 2カラム設定 */
+div#two_maincolumn {
+    float: left;
+    width: 598px;
+    padding: 15px 0 0 0;
+}
+
+div#two_maincolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* 1カラム設定 */
+div#one_maincolumn {
     padding: 10px 0 0 0;
 }

branches/comu-ver2/html/user_data/packages/default/css/under.css

@@ -5 +5 @@
 ----------------------------------------------- */
 div#undercolumn {
-    float: right;
     width: 580px;
-    margin: 15px 0 0 0;
+    margin: 15px auto 0 auto;
 }