Eコマース機能更新。

diff --git a/widgets/ec_main/include/container/admin_ec_mainDelivmethodWidgetContainer.php b/widgets/ec_main/include/container/admin_ec_mainDelivmethodWidgetContainer.php
index fe4927c..f588df5 100644 (file)
--- a/widgets/ec_main/include/container/admin_ec_mainDelivmethodWidgetContainer.php
+++ b/widgets/ec_main/include/container/admin_ec_mainDelivmethodWidgetContainer.php
@@ -8,12 +8,11 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2012 Magic3 Project.
+ * @copyright  Copyright 2006-2015 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: admin_ec_mainDelivmethodWidgetContainer.php 5440 2012-12-08 09:37:39Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
-//require_once($gEnvManager->getCurrentWidgetContainerPath() . '/admin_ec_mainBaseWidgetContainer.php');
 require_once($gEnvManager->getCurrentWidgetContainerPath() . '/admin_ec_mainBaseWidgetContainer.php');
 require_once($gEnvManager->getCurrentWidgetDbPath() .  '/ec_mainDelivMethodDb.php');
 
@@ -249,7 +248,7 @@ class admin_ec_mainDelivmethodWidgetContainer extends admin_ec_mainBaseWidgetCon
                }
                
                if (empty($this->serialNo)){            // シリアル番号が空のときは新規とする
-                       $this->tmpl->addVar("_widget", "id_label", '新規');                   // 選択項目のIDラベル
+                       $this->tmpl->addVar("_widget", "id_label", '');                 // 選択項目のIDラベル
                        $this->tmpl->addVar("_widget", "new_selected", 'checked');// ユーザIDが0のときは新規追加をチェック状態にする
                        
                        $this->tmpl->setAttribute('add_id_field', 'visibility', 'visible');// 新規ID入力フィールド表示

diff --git a/widgets/ec_main/include/container/admin_ec_mainPaymethodWidgetContainer.php b/widgets/ec_main/include/container/admin_ec_mainPaymethodWidgetContainer.php
index 3a50dcf..ea8788d 100644 (file)
--- a/widgets/ec_main/include/container/admin_ec_mainPaymethodWidgetContainer.php
+++ b/widgets/ec_main/include/container/admin_ec_mainPaymethodWidgetContainer.php
@@ -8,9 +8,9 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2012 Magic3 Project.
+ * @copyright  Copyright 2006-2015 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: admin_ec_mainPaymethodWidgetContainer.php 5440 2012-12-08 09:37:39Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 require_once($gEnvManager->getCurrentWidgetContainerPath() . '/admin_ec_mainBaseWidgetContainer.php');
@@ -248,7 +248,7 @@ class admin_ec_mainPaymethodWidgetContainer extends admin_ec_mainBaseWidgetConta
                }
                
                if (empty($this->serialNo)){            // シリアル番号が空のときは新規とする
-                       $this->tmpl->addVar("_widget", "id_label", '新規');                   // 選択項目のIDラベル
+                       $this->tmpl->addVar("_widget", "id_label", '');                 // 選択項目のIDラベル
                        $this->tmpl->addVar("_widget", "new_selected", 'checked');// ユーザIDが0のときは新規追加をチェック状態にする
                        
                        $this->tmpl->setAttribute('add_id_field', 'visibility', 'visible');// 新規ID入力フィールド表示

diff --git a/widgets/ec_main/include/template/admin_delivery.tmpl.html b/widgets/ec_main/include/template/admin_delivery.tmpl.html
index 26f67ed..268853a 100644 (file)
--- a/widgets/ec_main/include/template/admin_delivery.tmpl.html
+++ b/widgets/ec_main/include/template/admin_delivery.tmpl.html
@@ -84,8 +84,7 @@ $(function(){
 <input type="hidden" name="serial" />\r
 <input type="hidden" name="seriallist" value="{SERIAL_LIST}" />\r
 \r
-<h3 class="m3config_h"><span {_HELP_DELIVMETHOD_LIST}>配送方法一覧</span>\r
-</h3>\r
+<h3 class="m3config_h"><span {_HELP_DELIVMETHOD_LIST}>配送方法一覧</span></h3>\r
 <div class="m3config_h_side_buttons pull-right"><div {_HELP_ENTRY_BUTTONS}><div class="btn-group">\r
 <input type="button" class="button" onclick="newItem();" value="新規" /><input type="button" class="button" onclick="editItem();" value="編集" /><input type="button" class="button" onclick="delItem();" value="削除" />\r
 </div></div></div>\r
@@ -106,7 +105,7 @@ $(function(){
     <tbody>\r
     <patTemplate:tmpl name="delivmethod_list">\r
     <tr>\r
-        <td><input type="checkbox" name="item{INDEX}_selected" /></td>\r
+        <td class="select"><input type="checkbox" name="item{INDEX}_selected" /></td>\r
            <td>{ID}</td>\r
            <td><a href="#" onclick="editItemBySerial({SERIAL});">{NAME}</a></td>\r
            <td>{VIEW_INDEX}</td>\r

diff --git a/widgets/ec_main/include/template/admin_delivery_detail.tmpl.html b/widgets/ec_main/include/template/admin_delivery_detail.tmpl.html
index 91c4fb9..717cea7 100644 (file)
--- a/widgets/ec_main/include/template/admin_delivery_detail.tmpl.html
+++ b/widgets/ec_main/include/template/admin_delivery_detail.tmpl.html
@@ -69,17 +69,17 @@ $(function(){
            <th><span {_HELP_DELIVMETHOD_ID}>ID</span></th>\r
            <td style="width:200px;">{ID_LABEL}\r
            <patTemplate:tmpl name="add_id_field" visibility="hidden">\r
-           <input type="text" name="item_id" value="{ADD_ID}" size="20" maxlength="20" />\r
+           <input type="text" name="item_id" value="{ADD_ID}" maxlength="20" />\r
            </patTemplate:tmpl>\r
            </td>\r
            <th><span {_HELP_DELIVMETHOD_NAME}>名前</span></th>\r
-           <td><input type="text" name="item_name" value="{NAME}" size="30" maxlength="40" /></td>\r
+           <td><input type="text" name="item_name" value="{NAME}" maxlength="40" /></td>\r
        </tr>\r
     <tr>\r
            <th><span {_HELP_DELIVMETHOD_VISIBLE}>公開</span></th>\r
            <td><input type="checkbox" name="item_visible" {VISIBLE} /></td>\r
            <th><span {_HELP_DELIVMETHOD_INDEX}>表示順</span></th>\r
-           <td><input type="text" name="item_index" value="{INDEX}" size="3" maxlength="3" onkeypress="return m3_numericKey(event,true);" /></td>\r
+           <td><div class="col-sm-2 m3config_item"><input type="text" name="item_index" value="{INDEX}" maxlength="3" onkeypress="return m3_numericKey(event,true);" /></div></td>\r
        </tr>\r
     <tr>\r
            <th><span {_HELP_DELIVMETHOD_DESC}>説明</span></th>\r

diff --git a/widgets/ec_main/include/template/admin_paymethod.tmpl.html b/widgets/ec_main/include/template/admin_paymethod.tmpl.html
index f27265f..b6590ec 100644 (file)
--- a/widgets/ec_main/include/template/admin_paymethod.tmpl.html
+++ b/widgets/ec_main/include/template/admin_paymethod.tmpl.html
@@ -5,9 +5,9 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2012 Magic3 Project.\r
+ * @copyright  Copyright 2006-2015 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id: admin.tmpl.html 4845 2012-04-13 04:47:07Z fishbone $\r
+ * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
@@ -71,53 +71,50 @@ function previewInOtherWindow()
        return true;\r
 }\r
 $(function(){\r
-       // ã\82¹ã\82¯ã\83­ã\83¼ã\83«ã\83\90ã\83¼ä»\98ã\81\8dã\81®ã\83\86ã\83¼ã\83\96ã\83«ã\82\92作成\r
-       m3_tableWithScrollbar('itemlist', -1, 0);\r
+       // ã\83\86ã\83¼ã\83\96ã\83«作成\r
+       m3SetConfigTable('itemlist');\r
 });\r
 //]]>\r
 </script>\r
-<div align="center">\r
-{MENU_ITEMS}\r
+<div class="m3config_container">\r
 <!-- m3:ErrorMessage -->\r
 <form method="post" name="main">\r
 <input type="hidden" name="task" value="paymethod" />\r
 <input type="hidden" name="act" />\r
 <input type="hidden" name="serial" />\r
 <input type="hidden" name="seriallist" value="{SERIAL_LIST}" />\r
-<table width="90%">\r
-<tr><td>\r
-<label><span {_HELP_PAYMETHOD_LIST}>支払方法一覧</span></label>\r
-</td><td align="right">\r
-<span {_HELP_PAYMETHOD_PREVIEW_BTN}><input type="button" class="button" onclick="previewInOtherWindow();" value="プレビュー" /></span>&nbsp;&nbsp;\r
-<span {_HELP_PAYMETHOD_NEW_BTN}><input type="button" class="button" onclick="newItem();" value="新規" /></span><span {_HELP_PAYMETHOD_EDIT_BTN}><input type="button" class="button" onclick="editItem();" value="編集" /></span><span {_HELP_PAYMETHOD_DEL_BTN}><input type="button" class="button" onclick="delItem();" value="削除" /></span>\r
-</td></tr>\r
-<tr><td colspan="2">\r
-<table id="itemlist" class="simple-table" width="100%">\r
+\r
+<h3 class="m3config_h"><span {_HELP_PAYMETHOD_LIST}>支払方法一覧</span></h3>\r
+<div class="m3config_h_side_buttons pull-right"><div {_HELP_ENTRY_BUTTONS}><div class="btn-group">\r
+<input type="button" class="button" onclick="newItem();" value="新規" /><input type="button" class="button" onclick="editItem();" value="編集" /><input type="button" class="button" onclick="delItem();" value="削除" />\r
+</div></div></div>\r
+<div class="m3config_h_side_buttons pull-right" style="margin-right:10px;"><div {_HELP_PAYMETHOD_PREVIEW_BTN}><div class="btn-group">\r
+<input type="button" class="button" onclick="previewInOtherWindow();" value="プレビュー" />\r
+</div></div></div>\r
+\r
+<table id="itemlist">\r
     <thead>\r
-        <tr>\r
-           <th width="35" align="center"><span {_HELP_PAYMETHOD_CHECK}>選択</span></th>\r
-           <th width="100" align="center"><span {_HELP_PAYMETHOD_ID}>ID</span></th>\r
+    <tr>\r
+           <th class="select"><span {_HELP_PAYMETHOD_CHECK}>選択</span></th>\r
+           <th><span {_HELP_PAYMETHOD_ID}>ID</span></th>\r
            <th><span {_HELP_PAYMETHOD_NAME}>表示名</span></th>\r
-           <th width="50" align="center"><span {_HELP_PAYMETHOD_INDEX}>表示順</span></th>\r
+           <th><span {_HELP_PAYMETHOD_INDEX}>表示順</span></th>\r
            <th><span {_HELP_PAYMETHOD_VISIBLE}>公開</span></th>\r
        </tr>\r
     </thead>\r
     <tbody>\r
-        <patTemplate:tmpl name="paymethod_list">\r
-        <tr>\r
-            <td align="center"><input type="checkbox" name="item{INDEX}_selected" /></td>\r
+    <patTemplate:tmpl name="paymethod_list">\r
+    <tr>\r
+        <td class="select"><input type="checkbox" name="item{INDEX}_selected" /></td>\r
            <td>{ID}</td>\r
            <td><a href="#" onclick="editItemBySerial({SERIAL});">{NAME}</a></td>\r
-           <td align="center">{VIEW_INDEX}</td>\r
-           <td align="center"><input type="checkbox" {VISIBLE} disabled /></td>\r
+           <td>{VIEW_INDEX}</td>\r
+           <td><input type="checkbox" {VISIBLE} disabled /></td>\r
        </tr>\r
        </patTemplate:tmpl>\r
     </tbody>\r
 </table>\r
 \r
-</td></tr>\r
-</table>\r
-\r
 </form>\r
 </div>\r
 </patTemplate:tmpl>\r

diff --git a/widgets/ec_main/include/template/admin_paymethod_detail.tmpl.html b/widgets/ec_main/include/template/admin_paymethod_detail.tmpl.html
index 298402e..689a166 100644 (file)
--- a/widgets/ec_main/include/template/admin_paymethod_detail.tmpl.html
+++ b/widgets/ec_main/include/template/admin_paymethod_detail.tmpl.html
@@ -5,9 +5,9 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2012 Magic3 Project.\r
+ * @copyright  Copyright 2006-2015 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id: admin.tmpl.html 4845 2012-04-13 04:47:07Z fishbone $\r
+ * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
@@ -52,65 +52,67 @@ function selectMenu(){
        return true;\r
 }\r
 $(function(){\r
+       // テーブルを作成\r
+       m3SetConfigTable('mainconfig');\r
+       \r
        // WYSIWYGエディター作成\r
-       //m3_setHtmlEditor('item_desc');\r
        m3SetWysiwygEditor('item_desc', 250/* 高さ */);\r
 });\r
 //]]>\r
 </script>\r
-<div align="center">\r
-{MENU_ITEMS}\r
+<div class="m3config_container">\r
 <!-- m3:ErrorMessage -->\r
 <form method="post" name="main">\r
 <input type="hidden" name="task" value="paymethod_detail" />\r
 <input type="hidden" name="act" />\r
 <input type="hidden" name="serial" value="{SERIAL}" />\r
 <input type="hidden" name="id" value="{ID}" />\r
-<table width="90%">\r
-<tr><td>\r
-<label><span {_HELP_PAYMETHOD_DETAIL}>支払方法詳細</span></label>\r
-</td>\r
-<td align="right"><span {_HELP_PAYMETHOD_RET_BTN}><input type="button" class="button" onclick="cancelItem();" value="戻る" /></span>\r
-</td></tr>\r
-<tr><td colspan="2">\r
-<table class="simple-table">\r
+\r
+<h3 class="m3config_h"><span {_HELP_PAYMETHOD_DETAIL}>支払方法詳細</span></h3>\r
+<div class="m3config_h_side_buttons pull-right"><div class="btn-group">\r
+<input type="button" class="button" onclick="cancelItem();" value="戻る" />\r
+</div></div>\r
+\r
+<table id="mainconfig">\r
     <tbody>\r
-        <tr>\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_ID}>ID</span></td>\r
-           <td>{ID_LABEL}\r
+    <tr>\r
+           <th><span {_HELP_PAYMETHOD_ID}>ID</span></th>\r
+           <td style="width:200px;">{ID_LABEL}\r
            <patTemplate:tmpl name="add_id_field" visibility="hidden">\r
-           <input type="text" name="item_id" value="{ADD_ID}" size="20" maxlength="20" />\r
+           <input type="text" name="item_id" value="{ADD_ID}" maxlength="20" />\r
            </patTemplate:tmpl>\r
            </td>\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_NAME}>名前</span></td>\r
-           <td><input type="text" name="item_name" value="{NAME}" size="30" maxlength="40" /></td>\r
+           <th><span {_HELP_PAYMETHOD_NAME}>名前</span></th>\r
+           <td><input type="text" name="item_name" value="{NAME}" maxlength="40" /></td>\r
        </tr>\r
-        <tr class="even">\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_VISIBLE}>公開</span></td>\r
+    <tr>\r
+           <th><span {_HELP_PAYMETHOD_VISIBLE}>公開</span></th>\r
            <td><input type="checkbox" name="item_visible" {VISIBLE} /></td>\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_INDEX}>表示順</span></td>\r
-           <td><input type="text" name="item_index" value="{INDEX}" size="3" maxlength="3" onkeypress="return m3_numericKey(event,true);" /></td>\r
+           <th><span {_HELP_PAYMETHOD_INDEX}>表示順</span></th>\r
+           <td><div class="col-sm-2 m3config_item"><input type="text" name="item_index" value="{INDEX}" maxlength="3" onkeypress="return m3_numericKey(event,true);" /></div></td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_DESC}>説明</span></td>\r
-           <td colspan="3"><textarea name="item_desc">{DESC}</textarea></td>\r
+    <tr>\r
+           <th><span {_HELP_PAYMETHOD_DESC}>説明</span></th>\r
+           <td class="ckeditor" colspan="3"><textarea name="item_desc">{DESC}</textarea></td>\r
        </tr>\r
-        <tr class="even">\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_CALC}>支払方法</span></td>\r
+    <tr>\r
+           <th><span {_HELP_PAYMETHOD_CALC}>支払方法</span></th>\r
            <td colspan="3">\r
+               <div class="col-sm-6 m3config_item">\r
 <select name="item_iwidget"onchange="selectIWidget();">\r
 <option value="">-- 未選択 --</option>\r
 <patTemplate:tmpl name="iwidget_list">\r
 <option value="{VALUE}" {SELECTED}>{NAME}</option>\r
 </patTemplate:tmpl>\r
 </select>\r
+           </div>\r
            </td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside"><span {_HELP_PAYMETHOD_CALC_DETAIL}>支払方法詳細</span></td>\r
+    <tr>\r
+           <th><span {_HELP_PAYMETHOD_CALC_DETAIL}>支払方法詳細</span></th>\r
            <td colspan="3">{IWIDGET}</td>\r
        </tr>\r
-        <tr class="even">\r
+    <tr>\r
            <td colspan="4" align="right">\r
 <patTemplate:tmpl name="add_button" visibility="hidden">\r
            <input type="button" class="button" onclick="addItem();" value="新規登録" />\r
@@ -124,8 +126,7 @@ $(function(){
     </tbody>\r
 </table>\r
 \r
-</td></tr>\r
-</table>\r
+\r
 </form>\r
 </div>\r
 </patTemplate:tmpl>\r