「QRコード」ウィジェット更新。

diff --git a/include/sql/update_widgets.sql b/include/sql/update_widgets.sql
index e6b44f5..37ffd34 100644 (file)
--- a/include/sql/update_widgets.sql
+++ b/include/sql/update_widgets.sql
@@ -321,8 +321,9 @@ INSERT INTO _widgets
 (wd_id,       wd_name,            wd_template_type, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description, wd_add_script_lib, wd_add_script_lib_a, wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
 ('contactus', '簡易お問い合わせ', 'bootstrap',      '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10, 'お問い合わせの入力データをメールで送る。', '', 'ckeditor_m3toolbar',         true,         true,        true,        false,               false,true,               0, 0, 0, '2014-04-11', now(),    now());\r
 DELETE FROM _widgets WHERE wd_id = 'qrcode';\r
-INSERT INTO _widgets (wd_id, wd_name, wd_type, wd_version, wd_params, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_read_scripts, wd_read_css, wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES\r
-('qrcode',           'QRコード',               'QRVW', '1.0.0',  '',        'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'QRコードを作成表示。',         false,           false,       true,         true,        true,        true,               false,true,           0, 1, -1, now(), now());\r
+INSERT INTO _widgets\r
+(wd_id,    wd_name,    wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,         wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
+('qrcode', 'QRコード', '1.1.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'QRコードを作成表示。', true,         true,        true,         true,                false,               true,           '2015-07-03',  now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'youtube2';\r
 INSERT INTO _widgets (wd_id, wd_name, wd_type, wd_version, wd_params, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_read_scripts, wd_read_css, wd_available, wd_editable, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES\r
 ('youtube2',     'YouTube2',           'YOUT', '1.0.0',  '',        'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'YouTubeの投稿動画を表示。',         false,           false,       true,         true,        true,        false,               true,true,           0, 1, 1, now(), now());\r

diff --git a/widgets/qrcode/include/container/admin_qrcodeWidgetContainer.php b/widgets/qrcode/include/container/admin_qrcodeWidgetContainer.php
index a1d03d1..e948e56 100644 (file)
--- a/widgets/qrcode/include/container/admin_qrcodeWidgetContainer.php
+++ b/widgets/qrcode/include/container/admin_qrcodeWidgetContainer.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_qrcodeWidgetContainer.php 5168 2012-09-06 01:35:37Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 require_once($gEnvManager->getContainerPath() .                        '/baseAdminWidgetContainer.php');
@@ -87,5 +87,19 @@ class admin_qrcodeWidgetContainer extends BaseAdminWidgetContainer
                $this->tmpl->addVar("_widget", "desc", $desc);                          // 説明
                $this->tmpl->addVar("_widget", "gurl", $this->getUrl($generateUrl));            // QRコード生成URL
        }
+       /**
+        * テンプレートにデータ埋め込む
+        *
+        * _setTemplate()で指定したテンプレートファイルにデータを埋め込む。
+        *
+        * @param RequestManager $request               HTTPリクエスト処理クラス
+        * @param object         $param                 任意使用パラメータ。_setTemplate()と共有。
+        * @return                                                              なし
+        */
+       function _postAssign($request, &$param)
+       {
+               // メニューバー、パンくずリスト作成(簡易版)
+               $this->createBasicConfigMenubar($request);
+       }
 }
 ?>

diff --git a/widgets/qrcode/include/container/qrcodeWidgetContainer.php b/widgets/qrcode/include/container/qrcodeWidgetContainer.php
index 9bbb546..bbfe80c 100644 (file)
--- a/widgets/qrcode/include/container/qrcodeWidgetContainer.php
+++ b/widgets/qrcode/include/container/qrcodeWidgetContainer.php
@@ -8,9 +8,9 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2009 Magic3 Project.
+ * @copyright  Copyright 2006-2015 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: qrcodeWidgetContainer.php 2263 2009-08-28 05:21:34Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 require_once($gEnvManager->getContainerPath() .                        '/baseWidgetContainer.php');
@@ -63,7 +63,13 @@ class qrcodeWidgetContainer extends BaseWidgetContainer
                
                $act = $request->trimValueOf('act');
                if ($act == 'genarate'){                        // QRコード生成のとき
+                       // ページ作成処理中断
+                       $this->gPage->abortPage();
+               
                        require_once($this->gEnv->getLibPath() .        '/qr_img0.50g/php/qr_img.php');
+                       
+                       // システム強制終了
+                       $this->gPage->exitSystem();
                } else {
                        // QRコード生成パスを設定
                        $urlparam  = M3_REQUEST_PARAM_OPERATION_COMMAND . '=' . M3_REQUEST_CMD_DO_WIDGET . '&';

diff --git a/widgets/qrcode/include/template/admin.tmpl.html b/widgets/qrcode/include/template/admin.tmpl.html
index 7dc1a5f..4f4728c 100644 (file)
--- a/widgets/qrcode/include/template/admin.tmpl.html
+++ b/widgets/qrcode/include/template/admin.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2014 Magic3 Project.\r
+ * @copyright  Copyright 2006-2015 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -19,35 +19,36 @@ function updateItem(){
        document.main.submit();\r
        return true;\r
 }\r
+$(function(){\r
+       // テーブル作成\r
+       m3SetConfigTable('mainconfig');\r
+});\r
 //]]>\r
 </script>\r
-<div align="center">\r
+<div class="m3config_container">\r
 <!-- m3:ErrorMessage -->\r
 <form method="post" name="main">\r
 <input type="hidden" name="act" />\r
-<table class="simple-table" width="950">\r
-<caption>QRコード作成</caption>\r
+<h3 class="m3config_h">基本設定</h3>\r
+<table id="mainconfig">\r
     <tbody>\r
-        <tr>\r
-           <td class="table-headside" width="150">説明</td>\r
-           <td><input type="text" name="desc" value="{DESC}" size="100" maxlength="100" style="width:100%;" /></td>\r
+    <tr>\r
+           <th>説明</th>\r
+           <td><input type="text" name="desc" value="{DESC}" maxlength="100" /></td>\r
        </tr>\r
-        <tr class="even">\r
-           <td class="table-headside">QRコード化するデータ</td>\r
-           <td><input type="text" name="qr_data" value="{QR_DATA}" size="100" maxlength="100" style="width:100%;" /></td>\r
+    <tr>\r
+           <th>QRコード化するデータ</th>\r
+           <td><input type="text" name="qr_data" value="{QR_DATA}" maxlength="100" /></td>\r
        </tr>\r
-        <tr>\r
-           <td class="table-headside">QRコード画像作成用URL</td>\r
+<!--    <tr>\r
+           <th>QRコード画像作成用URL</th>\r
            <td>{GURL}</td>\r
-       </tr>\r
-       <tr class="even">\r
-       <td colspan="2" align="right">\r
-               <input type="button" class="button" onclick="updateItem();" value="更新" />\r
-       </td>\r
-       </tr>\r
+       </tr>-->\r
     </tbody>\r
 </table>\r
-\r
+<div class="well m3config_update_buttons">\r
+<input type="button" class="button" onclick="updateItem();" value="更新" />\r
+</div>\r
 </form>\r
 </div>\r
 </patTemplate:tmpl>\r