ウィジェットカテゴリーの並び順調整。

diff --git a/include/db/systemDb.php b/include/db/systemDb.php
index ebdfc6f..fca5d18 100644 (file)
--- a/include/db/systemDb.php
+++ b/include/db/systemDb.php
@@ -655,7 +655,7 @@ class SystemDb extends BaseDb
                
                $params = array();
                $queryStr .=    'AND wd_device_type = ? '; $params[] = $type;
-               $queryStr .=   'ORDER BY category.wt_sort_order, wd_sort_order, wd_id';
+               $queryStr .=   'ORDER BY pcategory.wt_sort_order, category.wt_sort_order, wd_sort_order, wd_id';
                $retValue = $this->selectRecords($queryStr, $params, $rows);
                return $retValue;
        }

diff --git a/include/sql/update/2018110101_to_2018110501.sql b/include/sql/update/2018110101_to_2018110501.sql
new file mode 100644 (file)
index 0000000..8cb53a8
--- /dev/null
+++ b/include/sql/update/2018110101_to_2018110501.sql
@@ -0,0 +1,45 @@
+-- *
+-- * バージョンアップ用スクリプト
+-- *
+-- * PHP versions 5
+-- *
+-- * LICENSE: This source file is licensed under the terms of the GNU General Public License.
+-- *
+-- * @package    Magic3 Framework
+-- * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
+-- * @copyright  Copyright 2006-2018 Magic3 Project.
+-- * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
+-- * @version    SVN: $Id$
+-- * @link       http://www.magic3.org
+-- *
+-- --------------------------------------------------------------------------------------------------
+-- バージョンアップ用スクリプト
+-- --------------------------------------------------------------------------------------------------
+
+-- *** システムベーステーブル ***
+-- ウィジェットカテゴリマスター
+DELETE FROM _widget_category;
+INSERT INTO _widget_category
+(wt_id,         wt_parent_id,  wt_name,                wt_sort_order, wt_visible) VALUES
+('',            '',            'その他',               100,           true),
+('content',     'content',     '汎用コンテンツ',       1,             true),
+('blog',        'blog',        'ブログ',               2,             true),
+('bbs',         'bbs',         'BBS',                  3,             false),
+('commerce',    'commerce',    'Eコマース',            4,             false),
+('photo',       'photo',       'フォトギャラリー',     5,             false),
+('event',       'event',       'イベント情報',         6,             false),
+('wiki',        'wiki',        'Wiki',                 7,             false),
+('member',      'member',      '会員',                 9,             false),
+('subcontent',  'subcontent',  '補助コンテンツ',       20,            true),
+('searchform/', 'searchform/', '検索・お問い合わせ',   21,            true),
+('search',      'searchform/', '検索',                 22,            true),
+('form',        'searchform/', 'お問い合わせ',         23,            true),
+('menu',        'menu',        'メニュー',             24,            true),
+('image',       'image',       '画像',                 25,            true),
+('design',      'design',      'デザイン',             26,            true),
+('meta',        '',            'メタ機能',             27,            true),
+('analytics',   '',            'サイト解析',           28,            true),
+('admin',       'admin',       '管理画面用',           50,            true);
+
+
+-- *** システム標準テーブル ***

diff --git a/include/sql/update_widgets.sql b/include/sql/update_widgets.sql
index 751ed4d..74085c1 100644 (file)
--- a/include/sql/update_widgets.sql
+++ b/include/sql/update_widgets.sql
@@ -311,20 +311,20 @@ INSERT INTO _widgets
 ('phpcode', 'PHPコード実行', '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'PHPのプログラムコードを実行。', 'jquery.codepress',   false,        true,        true,        false,               true,true,           0, '2016-07-10', now(), now());\r
 DELETE FROM _widgets WHERE wd_id = 'g_analytics';\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_has_admin, wd_initialized, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
-('g_analytics', 'Google Analytics', '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'Google Analyticsトラッキングコードを出力する。', false,        true,         true,           '2015-04-20',  now(),         now());\r
+(wd_id,         wd_name,            wd_category_id, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                                   wd_available, wd_has_admin, wd_initialized, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
+('g_analytics', 'Google Analytics', 'analytics',         '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'Google Analyticsトラッキングコードを出力する。', false,        true,         true,           '2015-04-20',  now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'g_analytics2';\r
 INSERT INTO _widgets\r
-(wd_id,          wd_name,             wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                                    wd_has_admin, wd_initialized, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
-('g_analytics2', 'Google Analytics2', '0.9.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'グローバルサイトタグ(gtag.js)タイプのGoogle Analyticsトラッキングコードを出力する。', true,         true,           '2018-10-19', now(),         now());\r
+(wd_id,          wd_name,             wd_category_id, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                                    wd_has_admin, wd_initialized, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
+('g_analytics2', 'Google Analytics2', 'analytics',         '0.9.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'グローバルサイトタグ(gtag.js)タイプのGoogle Analyticsトラッキングコードを出力する。', true,         true,           '2018-10-19', now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'image2';\r
 INSERT INTO _widgets\r
 (wd_id,    wd_name, wd_version, wd_params, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,             wd_add_script_lib_a, 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
 ('image2', '画像2', '2.0.0',    '',        'Naoki Hirata', 'Magic3.org', 'GPL',      10,                '様々な画像を単一で表示。', 'elfinder',          true,         true,        true,         false,               true,                true,           '2018-04-19', now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'css_add';\r
 INSERT INTO _widgets\r
-(wd_id,   wd_name, wd_template_type, wd_version, wd_params, 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_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
-('css_add', 'CSS追加',  'bootstrap,wordpress', '3.0.0',    '',        'Naoki Hirata', 'Magic3.org', 'GPL',      10, 'テンプレートのCSSに加えてCSS定義やCSSファイルを追加するウィジェットです。',    true,         true,        true,         false,                                true,                true,              0,  3,             1, '2018-09-13', now(),         now());\r
+(wd_id,     wd_name,   wd_category_id, wd_template_type, wd_version, wd_params, 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_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
+('css_add', 'CSS追加', 'meta',         'bootstrap,wordpress', '3.0.0',    '',        'Naoki Hirata', 'Magic3.org', 'GPL',      10, 'テンプレートのCSSに加えてCSS定義やCSSファイルを追加するウィジェットです。',    true,         true,        true,         false,                                true,                true,              0,  3,             1, '2018-09-13', now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'print';\r
 INSERT INTO _widgets\r
 (wd_id,   wd_name, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                                     wd_read_scripts, wd_read_css, wd_add_script_lib, wd_add_script_lib_a, wd_available, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_install_dt, wd_create_dt) VALUES\r
@@ -359,8 +359,8 @@ INSERT INTO _widgets
 ('jquery_plugin', 'jQueryプラグイン', '1.2.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'jQueryプラグインを追加するためのウィジェットです。画面上には何も表示されません。',  '', 'codemirror.javascript', false,             true,         true,                true,              '2016-07-10', now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 'head_add';\r
 INSERT INTO _widgets\r
-(wd_id,      wd_name,    wd_template_type, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
-('head_add', 'HEAD追加', 'bootstrap,wordpress', '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'HTMLのHEADタグ内に文字列を追加する', true,        true,           3, 1, '2017-07-25',  now(), now());\r
+(wd_id,      wd_name,    wd_category_id, wd_template_type, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
+('head_add', 'HEAD追加', 'meta',           'bootstrap,wordpress', '2.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'HTMLのHEADタグ内に文字列を追加する', true,        true,           3, 1, '2017-07-25',  now(), now());\r
 DELETE FROM _widgets WHERE wd_id = 'contactus_freelayout3';\r
 INSERT INTO _widgets\r
 (wd_id,                   wd_name,  wd_category_id,                                 wd_status, 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_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES\r
@@ -463,8 +463,8 @@ INSERT INTO _widgets
 ('s/simple_html', '汎用HTML', '1.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'コンテンツとして管理しない部分表示用の汎用HTML', 2, 'ckeditor_m3toolbar',             true,         true, true,             1, -1,  now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 's/css_add';\r
 INSERT INTO _widgets\r
-(wd_id,             wd_name,          wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                             wd_device_type, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES\r
-('s/css_add', 'CSS追加', '1.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'テンプレートのCSSに加えてCSS定義を追加するためのウィジェットです。', 2,              true,         true,             3, 1,  now(),         now());\r
+(wd_id,       wd_name,   wd_category_id, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                             wd_device_type, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES\r
+('s/css_add', 'CSS追加', 'meta',         '1.0.0',    'Naoki Hirata', 'Magic3.org', 'GPL',      10,                'テンプレートのCSSに加えてCSS定義を追加するためのウィジェットです。', 2,              true,         true,             3, 1,  now(),         now());\r
 DELETE FROM _widgets WHERE wd_id = 's/contactus';\r
 INSERT INTO _widgets\r
 (wd_id,         wd_name,            wd_category_id, wd_version, wd_author,      wd_copyright, wd_license, wd_official_level, wd_description,                      wd_device_type, wd_add_script_lib, wd_add_script_lib_a, wd_has_admin, wd_enable_operation, wd_use_instance_def, wd_initialized, wd_cache_type, wd_view_control_type, wd_install_dt, wd_create_dt) VALUES\r