[Svn-src-all:824] [version-2_5-dev 19711] * #748(モバイルのデザイン管理機能)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 7日 (火) 16:26:16 JST
Subversion committed to /home/svn/open 19711
http://svn.ec-cube.net/open_trac/changeset/19711
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-07 16:26:15 +0900 (火, 07 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
* #748(モバイルのデザイン管理機能)
* dtb_pagelayout, dtb_bloc, dtb_blocposition のプライマリーキー変更, device_type_id 追加
* 管理画面のメニュー修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/abouts/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/detail.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/list.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
U branches/version-2_5-dev/data/class/SC_CartSession.php
U branches/version-2_5-dev/data/class/SC_Display.php
U branches/version-2_5-dev/data/class/SC_Product.php
U branches/version-2_5-dev/data/class/SC_Query.php
U branches/version-2_5-dev/data/class/SC_Response.php
U branches/version-2_5-dev/data/class/SC_SmartphoneUserAgent.php
U branches/version-2_5-dev/data/class/SC_View.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_PageLayout.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
U branches/version-2_5-dev/data/class/pages/LC_Page.php
U branches/version-2_5-dev/data/class/pages/LC_Page_Index.php
U branches/version-2_5-dev/data/class/pages/abouts/LC_Page_Abouts.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php
U branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact.php
U branches/version-2_5-dev/data/class/pages/contact/LC_Page_Contact_Complete.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Complete.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.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_News.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_About.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Charge.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Kiyaku.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Order.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Privacy.php
U branches/version-2_5-dev/data/class/pages/guide/LC_Page_Guide_Usage.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_ChangeComplete.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_RefusalComplete.php
U branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
U branches/version-2_5-dev/data/class/pages/preview/LC_Page_Preview.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_CategoryList.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
U branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php
U branches/version-2_5-dev/data/install.php
U branches/version-2_5-dev/data/module/MDB2/Driver/pgsql.php
U branches/version-2_5-dev/data/mtb_constants_init.php
U branches/version-2_5-dev/data/require_classes.php
U branches/version-2_5-dev/html/install/img/_.gif
U branches/version-2_5-dev/html/install/img/back.jpg
U branches/version-2_5-dev/html/install/img/back_off.jpg
U branches/version-2_5-dev/html/install/img/back_on.jpg
U branches/version-2_5-dev/html/install/img/close.gif
U branches/version-2_5-dev/html/install/img/error_bottom.jpg
U branches/version-2_5-dev/html/install/img/error_top.jpg
U branches/version-2_5-dev/html/install/img/footer.jpg
U branches/version-2_5-dev/html/install/img/graph_1_w.gif
U branches/version-2_5-dev/html/install/img/header_bg2.jpg
U branches/version-2_5-dev/html/install/img/header_left.jpg
U branches/version-2_5-dev/html/install/img/header_left_bg.jpg
U branches/version-2_5-dev/html/install/img/header_right.jpg
U branches/version-2_5-dev/html/install/img/header_right_bg.jpg
U branches/version-2_5-dev/html/install/img/left.jpg
U branches/version-2_5-dev/html/install/img/left_bg.jpg
U branches/version-2_5-dev/html/install/img/main_bg.jpg
U branches/version-2_5-dev/html/install/img/main_bottom.jpg
U branches/version-2_5-dev/html/install/img/main_left.jpg
U branches/version-2_5-dev/html/install/img/main_right.jpg
U branches/version-2_5-dev/html/install/img/main_top.jpg
U branches/version-2_5-dev/html/install/img/next.jpg
U branches/version-2_5-dev/html/install/img/next_off.jpg
U branches/version-2_5-dev/html/install/img/next_on.jpg
U branches/version-2_5-dev/html/install/img/pagetop.gif
U branches/version-2_5-dev/html/install/img/right.jpg
U branches/version-2_5-dev/html/install/img/right_bg.jpg
U branches/version-2_5-dev/html/install/img/space_w.gif
U branches/version-2_5-dev/html/install/index.php
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
U branches/version-2_5-dev/html/install/sql/drop_table.sql
U branches/version-2_5-dev/html/install/sql/insert_data.sql
U branches/version-2_5-dev/html/install/templates/install_frame.tpl
U branches/version-2_5-dev/html/install/templates/step0.tpl
U branches/version-2_5-dev/html/install/templates/step0_1.tpl
U branches/version-2_5-dev/html/install/templates/step1.tpl
U branches/version-2_5-dev/html/install/templates/step2.tpl
U branches/version-2_5-dev/html/install/templates/step3.tpl
U branches/version-2_5-dev/html/install/templates/step4.tpl
U branches/version-2_5-dev/html/install/templates/welcome.tpl
U branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
U branches/version-2_5-dev/html/user_data/packages/default/img/button/btn_login.gif
U branches/version-2_5-dev/html/user_data/packages/default/img/button/btn_login_on.gif
U branches/version-2_5-dev/patches/MDB2_Driver_pgsql.php.patch
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-07 07:26:15 UTC (rev 19711)
@@ -22,11 +22,37 @@
*/
*}-->
<ul class="level1">
-<li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>レイアウト設定</span></a></li>
-<li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php"><span>ページ詳細設定</span></a></li>
-<li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php"><span>ブロック編集</span></a></li>
-<li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php"><span>ヘッダー/フッター設定</span></a></li>
-<li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php"><span>CSS編集</span></a></li>
-<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php"><span>テンプレート設定</span></a></li>
-<li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php"><span>テンプレート追加</span></a></li>
+ <li><a><span>PC</span></a>
+ <ul class="level2">
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック編集</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS編集</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
+ </ul>
+ </li>
+ <li><a><span>モバイル</span></a>
+ <ul class="level2">
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック編集</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS編集</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
+ </ul>
+ </li>
+ <li><a><span>スマートフォン</span></a>
+ <ul class="level2">
+ <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
+ <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック編集</span></a></li>
+ <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS編集</span></a></li>
+ <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
+ <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
+ </ul>
+ </li>
</ul>
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php 2010-12-07 07:26:15 UTC (rev 19711)
@@ -6,7 +6,7 @@
* enableかどうかを判別する
* インスタンス化
*/
- public static function load(LC_Page &$lcpage){
+ function load(LC_Page &$lcpage){
//データベースからクラス名を読み込む
$objQuery = new SC_Query();
$col = "*";
@@ -33,7 +33,7 @@
return $arrPluginList;
}
- public static function preProcess(LC_Page &$lcpage){
+ function preProcess(LC_Page &$lcpage){
//プラグインの名前を判別してページ内で有効なプラグインがあれば実行する
$arrPluginList = SC_Helper_Plugin::load($lcpage);
if(count($arrPluginList) > 0){
@@ -48,7 +48,7 @@
/* 読み込んだプラグインの実行用メソッド
*
*/
- public static function process(LC_Page &$lcpage){
+ function process(LC_Page &$lcpage){
//プラグインの名前を判別してページ内で有効なプラグインがあれば実行する
$arrPluginList = SC_Helper_Plugin::load($lcpage);
if(count($arrPluginList) > 0){
@@ -63,7 +63,7 @@
/**
* 稼働中のプラグインを取得する。
*/
- public static function getEnablePlugin(){
+ function getEnablePlugin(){
$objQuery = new SC_Query();
$col = '*';
$table = 'dtb_plugin';
@@ -75,7 +75,7 @@
/**
* インストールされているプラグインを取得する。
*/
- public static function getAllPlugin(){
+ function getAllPlugin(){
$objQuery = new SC_Query();
$col = '*';
$table = 'dtb_plugin';
@@ -84,16 +84,13 @@
return $arrRet;
}
-
- public static function getFilesystemPlugins(){
+ function getFilesystemPlugins(){
$plugin_dir = DATA_PATH."/plugin/";
if($dh = opendir($plugin_dir)){
while(($file = readdir($dh) !== false)){
if(is_dir($plugin_dir."/".$file)){
-
}
}
}
}
}
-
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-07 07:26:15 UTC (rev 19711)
@@ -93,12 +93,12 @@
$sel = ", pos.target_id, pos.bloc_id, pos.bloc_row ,pos.anywhere";
$from = ", dtb_blocposition AS pos";
$where = " where ";
- $where .= "( pos.anywhere = 1 OR (lay.page_id = ? AND ";
+ $where .= "( pos.anywhere = 1 OR (lay.device_type_id = ? AND lay.page_id = ? AND ";
$where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
// $where .= "((lay.page_id = ? AND ";
// $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
- $arrData = array($page_id);
+ $arrData = array($_GET['device_type_id'], $page_id);
$arrBlocPos = $this->lfgetLayoutData($sel, $from, $where, $arrData );
// データの存在チェックを行う
変更: branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Plugin_Ex.php 2010-12-07 07:26:15 UTC (rev 19711)
@@ -34,15 +34,5 @@
* @version $Id: $
*/
class SC_Helper_Plugin_Ex extends SC_Helper_Plugin {
-
- // }}}
- // {{{ constructors
-
- /**
- * デフォルトコンストラクタ.
- */
- function SC_Helper_Plugin_Ex() {
- parent::SC_Helper_Plugin();
- }
}
?>
変更: branches/version-2_5-dev/data/require_classes.php
===================================================================
--- branches/version-2_5-dev/data/require_classes.php 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/data/require_classes.php 2010-12-07 07:26:15 UTC (rev 19711)
@@ -55,5 +55,5 @@
require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mail_Ex.php");
require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Mobile_Ex.php");
require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Purchase_Ex.php");
-// require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Plugin_Ex.php");
+require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_Plugin_Ex.php");
?>
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2010-12-07 07:26:15 UTC (rev 19711)
@@ -782,6 +782,7 @@
) TYPE=InnoDB;
CREATE TABLE dtb_pagelayout (
+ device_type_id int NOT NULL,
page_id int NOT NULL,
page_name text,
url text NOT NULL,
@@ -797,10 +798,11 @@
update_url text,
create_date datetime NOT NULL,
update_date datetime NOT NULL,
- PRIMARY KEY (page_id)
+ PRIMARY KEY (device_type_id, page_id)
) TYPE=InnoDB;
CREATE TABLE dtb_bloc (
+ device_type_id int NOT NULL,
bloc_id int NOT NULL,
bloc_name text,
tpl_path text,
@@ -809,16 +811,18 @@
update_date datetime NOT NULL,
php_path text,
del_flg smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (bloc_id)
+ PRIMARY KEY (device_type_id, bloc_id)
) TYPE=InnoDB;
CREATE TABLE dtb_blocposition (
+ device_type_id int NOT NULL,
page_id int NOT NULL,
- target_id int,
- bloc_id int,
+ target_id int NOT NULL,
+ bloc_id int NOT NULL,
bloc_row int,
filename text,
- anywhere int DEFAULT 0 NOT NULL
+ anywhere int DEFAULT 0 NOT NULL,
+ PRIMARY KEY (device_type_id, page_id, target_id, bloc_id)
) TYPE=InnoDB;
CREATE TABLE dtb_csv (
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2010-12-07 07:26:15 UTC (rev 19711)
@@ -784,6 +784,7 @@
);
CREATE TABLE dtb_pagelayout (
+ device_type_id int NOT NULL,
page_id int NOT NULL,
page_name text,
url text NOT NULL,
@@ -799,10 +800,11 @@
update_url text,
create_date timestamp NOT NULL DEFAULT now(),
update_date timestamp NOT NULL DEFAULT now(),
- PRIMARY KEY (page_id)
+ PRIMARY KEY (device_type_id, page_id)
);
CREATE TABLE dtb_bloc (
+ device_type_id int NOT NULL,
bloc_id int NOT NULL,
bloc_name text,
tpl_path text,
@@ -811,16 +813,18 @@
update_date timestamp NOT NULL DEFAULT now(),
php_path text,
del_flg smallint NOT NULL DEFAULT 0,
- PRIMARY KEY (bloc_id)
+ PRIMARY KEY (device_type_id, bloc_id)
);
CREATE TABLE dtb_blocposition (
+ device_type_id int NOT NULL,
page_id int NOT NULL,
target_id int,
bloc_id int,
bloc_row int,
filename text,
- anywhere smallint DEFAULT 0 NOT NULL
+ anywhere smallint DEFAULT 0 NOT NULL,
+ PRIMARY KEY (device_type_id, page_id, target_id, bloc_id)
);
CREATE TABLE dtb_csv (
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2010-12-07 07:26:15 UTC (rev 19711)
@@ -1,25 +1,25 @@
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (1, 'カテゴリ', 'bloc/category.tpl', 'category', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/category.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (2, '利用ガイド', 'bloc/guide.tpl', 'guide', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (3, 'かごの中', 'bloc/cart.tpl', 'cart', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/cart.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (4, '商品検索', 'bloc/search_products.tpl', 'search_products', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/search_products.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (5, '新着情報', 'bloc/news.tpl', 'news', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/news.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (6, 'ログイン', 'bloc/login.tpl', 'login', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/login.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (7, 'おすすめ商品', 'bloc/best5.tpl', 'best5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/best5.php', 1);
-INSERT INTO dtb_bloc (bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (8, 'カレンダー', 'bloc/calendar.tpl', 'calendar', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/calendar.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 1, 'カテゴリ', 'bloc/category.tpl', 'category', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/category.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 2, '利用ガイド', 'bloc/guide.tpl', 'guide', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 3, 'かごの中', 'bloc/cart.tpl', 'cart', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/cart.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 4, '商品検索', 'bloc/search_products.tpl', 'search_products', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/search_products.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 5, '新着情報', 'bloc/news.tpl', 'news', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/news.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 6, 'ログイン', 'bloc/login.tpl', 'login', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/login.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 7, 'おすすめ商品', 'bloc/best5.tpl', 'best5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/best5.php', 1);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, del_flg) VALUES (10, 8, 'カレンダー', 'bloc/calendar.tpl', 'calendar', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/calendar.php', 1);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 1, 1, 2, 'category', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 1, 2, 3, 'guide', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 1, 3, 1, 'cart', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 3, 4, 2, 'search_products', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 4, 5, 1, 'news', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 3, 6, 1, 'login', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (1, 4, 7, 2, 'best5', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (2, 1, 1, 2, 'category', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (2, 1, 2, 3, 'guide', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (2, 1, 3, 1, 'cart', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (3, 1, 1, 2, 'category', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (3, 1, 2, 3, 'guide', 0);
-INSERT INTO dtb_blocposition (page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (3, 1, 3, 1, 'cart', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 1, 1, 2, 'category', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 1, 2, 3, 'guide', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 1, 3, 1, 'cart', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 3, 4, 2, 'search_products', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 4, 5, 1, 'news', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 3, 6, 1, 'login', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 1, 4, 7, 2, 'best5', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 2, 1, 1, 2, 'category', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 2, 1, 2, 3, 'guide', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 2, 1, 3, 1, 'cart', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 3, 1, 1, 2, 'category', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 3, 1, 2, 3, 'guide', 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, filename, anywhere) VALUES (10, 3, 1, 3, 1, 'cart', 0);
INSERT INTO dtb_category (category_id, category_name, parent_category_id, level, rank, creator_id, create_date, update_date, del_flg) VALUES (1, '食品', 0, 1, 4, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
INSERT INTO dtb_category (category_id, category_name, parent_category_id, level, rank, creator_id, create_date, update_date, del_flg) VALUES (2, '雑貨', 0, 1, 5, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
@@ -373,11 +373,11 @@
INSERT INTO dtb_news (news_id, news_date, rank, news_title, news_comment, news_url, news_select, link_method, creator_id, create_date, update_date, del_flg) VALUES (1, '2010-08-19 00:00:00', 1, 'サイトオープンいたしました!', '一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！一人暮らしからオフィスなどさまざまなシーンで あなたの生活をサポートするグッズをご家庭へお届けします！', NULL, 0, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 'TOPページ', 'index.php', ' ', 'user_data/templates/', 'top', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, '商品一覧ページ', 'products/list.php', ' ', 'user_data/templates/', 'list', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (3, '商品詳細ページ', 'products/detail.php', ' ', 'user_data/templates/', 'detail', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (4, 'MYページ', 'mypage/index.php', ' ', NULL, NULL, 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_pagelayout (page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (0, 'プレビューデータ', 'preview', NULL, NULL, NULL, 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 1, 'TOPページ', 'index.php', ' ', 'user_data/templates/', 'top', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 2, '商品一覧ページ', 'products/list.php', ' ', 'user_data/templates/', 'list', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 3, '商品詳細ページ', 'products/detail.php', ' ', 'user_data/templates/', 'detail', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 4, 'MYページ', 'mypage/index.php', ' ', NULL, NULL, 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 0, 'プレビューデータ', 'preview', NULL, NULL, NULL, 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, 'クレジット', 0, NULL, 5, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (2, '郵便振替', 0, NULL, 4, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
変更: branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css 2010-12-06 05:09:14 UTC (rev 19710)
+++ branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css 2010-12-07 07:26:15 UTC (rev 19711)
@@ -171,7 +171,7 @@
#navi li.sfhover li a:hover, #navi li li.sfhover a:hover { background: #AACCCC; }
#navi li ul ul {
- margin: -1.75em 0 0 12em;
+ margin: -1.75em 0 0 14.5em;
}
#navi li:hover ul ul, #navi li:hover ul ul ul, #navi li.sfhover ul ul, #navi li.sfhover ul ul ul {
left: -999em;
Svn-src-all メーリングリストの案内