From 0108e5d22263ba625f0033e8952942c67172e31e Mon Sep 17 00:00:00 2001 From: naoki hirata Date: Mon, 21 Apr 2014 22:01:15 +0900 Subject: [PATCH] =?utf8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?utf8?q?=E7=95=AA=E5=8F=B7=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- include/global.php | 4 ++-- include/sql/sample/_develop.sql | 16 ++++++++-------- include/sql/update_widgets.sql | 4 ++-- templates/_admin4/css/style.css | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/global.php b/include/global.php index da1c8ddf..ac1abcd5 100644 --- a/include/global.php +++ b/include/global.php @@ -48,8 +48,8 @@ define('M3_ENCODING', 'UTF-8'); // 内部エンコーディング // ########## システム関係 ########## // システム基本情報 define('M3_SYSTEM_NAME', 'Magic3'); // システム名称 -define('M3_SYSTEM_VERSION', '2.8.14'); // システムのバージョン -define('M3_SYSTEM_RELEASE_DATE', '2014/4/9'); // システムのリリース日付 +define('M3_SYSTEM_VERSION', '2.8.15'); // システムのバージョン +define('M3_SYSTEM_RELEASE_DATE', '2014/4/20'); // システムのリリース日付 define('M3_SYSTEM_ID', 'M3'); // コンポーネント識別用ID define('M3_SYSTEM_DESCRIPTION', 'Magic3 is open source cms and web communication platform.'); // システムの説明 define('M3_SYSTEM_MIN_MEMORY', '16M'); // 最小メモリ使用量 diff --git a/include/sql/sample/_develop.sql b/include/sql/sample/_develop.sql index 3d5809b4..da139395 100644 --- a/include/sql/sample/_develop.sql +++ b/include/sql/sample/_develop.sql @@ -22,20 +22,20 @@ -- ウィジェット情報 DELETE FROM _widgets WHERE wd_id = 'photo_cart'; INSERT INTO _widgets -(wd_id, wd_name, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES -('photo_cart', 'フォトギャラリー - カート', '1.1.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーのカート内の商品を表示するオプションウィジェット。', true, true, 100, 0, 0, '2012-11-24',now(), now()); +(wd_id, wd_name, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES +('photo_cart', 'フォトギャラリー - カート', 'commerce', '1.1.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーのカート内の商品を表示するオプションウィジェット。', true, true, 100, 0, 0, '2012-11-24',now(), now()); DELETE FROM _widgets WHERE wd_id = 'photo_shop'; INSERT INTO _widgets -(wd_id, wd_name, wd_type, wd_edit_content, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, 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 -('photo_shop', 'フォトギャラリー - ショップ', 'product', true, '1.0.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーの商品購入オプションウィジェット。', true, true, 0, 2, '2012-11-24',now(), now()); +(wd_id, wd_name, wd_type, wd_content_type, wd_category_id, wd_edit_content, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, 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 +('photo_shop', 'フォトギャラリー - ショップ', 'product', 'commerce', 'commerce', true, '1.0.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーの商品購入オプションウィジェット。', true, true, 0, 2, '2012-11-24',now(), now()); DELETE FROM _widgets WHERE wd_id = 'photo_login'; INSERT INTO _widgets -(wd_id, wd_name, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, wd_official_level, wd_description, wd_add_script_lib, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES -('photo_login', 'フォトギャラリー - ログイン', '1.0.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーの会員ログイン用ボックス。', 'md5', false, true, 2, -1, '2012-11-24',now(), now()); +(wd_id, wd_name, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_license_type, wd_official_level, wd_description, wd_add_script_lib, wd_has_admin, wd_initialized, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES +('photo_login', 'フォトギャラリー - ログイン', 'commerce', '1.0.0', 'Naoki Hirata', 'Magic3.org', 'Magic3 Commerce License', 1, 10, 'フォトギャラリーの会員ログイン用ボックス。', 'md5', false, true, 2, -1, '2012-11-24',now(), now()); DELETE FROM _widgets WHERE wd_id = 'ec_product_carousel'; INSERT INTO _widgets -(wd_id, wd_name, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, 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_release_dt, wd_install_dt, wd_create_dt) VALUES -('ec_product_carousel', 'Eコマース - 商品カルーセル表示', '1.0.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, '商品画像をランダムでカルーセル表示する。', 'jquery.cloudcarousel,jquery.mousewheel', '', true, false, false,true, 0, 0, '2012-11-01', now(), now()); +(wd_id, wd_name, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, 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_release_dt, wd_install_dt, wd_create_dt) VALUES +('ec_product_carousel', 'Eコマース - 商品カルーセル表示', 'commerce', '1.0.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, '商品画像をランダムでカルーセル表示する。', 'jquery.cloudcarousel,jquery.mousewheel', '', true, false, false,true, 0, 0, '2012-11-01', now(), now()); -- インナーウィジェット(配送方法) DELETE FROM _iwidgets WHERE iw_widget_id = 'photo_shop' AND iw_id = 'flatrate'; diff --git a/include/sql/update_widgets.sql b/include/sql/update_widgets.sql index 53fa8d9b..2536d9ac 100644 --- a/include/sql/update_widgets.sql +++ b/include/sql/update_widgets.sql @@ -162,8 +162,8 @@ INSERT INTO _widgets ('ec_search_box', 'Eコマース - 検索', 'ECSR', 'commerce', '1.0.0', '', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, 'Eコマース商品検索ボックス。', false, false, true, true, false, false, false,true, 0, 1, -1, now(), now()); DELETE FROM _widgets WHERE wd_id = 'ec_product_random'; INSERT INTO _widgets -(wd_id, wd_name, wd_category_id, wd_version, wd_params, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_add_script_lib, 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 -('ec_product_random', 'Eコマース - 商品ランダム表示', 'commerce', '2.0.0', '', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, '商品をランダムに表示する。', 'jquery.easing,jquery.jcarousel', true, true, true, false, false,true, 0, 0, 0, '2012-12-13', now(), now()); +(wd_id, wd_name, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_add_script_lib, 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 +('ec_product_random', 'Eコマース - 商品ランダム表示', 'commerce', '2.0.0', 'Naoki Hirata', 'Magic3.org', 'GPL', 10, '商品をランダムに表示する。', 'jquery.easing,jquery.jcarousel', true, true, true, false, false,true, 0, 0, 0, '2012-12-13', now(), now()); DELETE FROM _widgets WHERE wd_id = 'ec_disp'; INSERT INTO _widgets (wd_id, wd_name, wd_content_type, wd_category_id, wd_version, wd_author, wd_copyright, wd_license, wd_official_level, wd_description, wd_has_admin, wd_initialized, wd_launch_index, wd_cache_type, wd_view_control_type, wd_release_dt, wd_install_dt, wd_create_dt) VALUES diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css index 59e8c96c..be849072 100644 --- a/templates/_admin4/css/style.css +++ b/templates/_admin4/css/style.css @@ -322,11 +322,11 @@ background-color: #0081c2; width: 100%;*/ } .layout_top_border { - border-top:2px solid #2C3E50; + border-top:5px solid #2C3E50; } .layout_side_border { - border-left:2px solid #2C3E50; - border-right:2px solid #2C3E50; + border-left:5px solid #2C3E50; + border-right:5px solid #2C3E50; } #layout_preview_outer{ position: fixed; -- 2.11.0