管理画面ナビゲーションメニュー更新。

diff --git a/scripts/m3/ckconfig.js b/scripts/m3/ckconfig.js
index ba8b341..7915460 100644 (file)
--- a/scripts/m3/ckconfig.js
+++ b/scripts/m3/ckconfig.js
@@ -208,14 +208,9 @@ CKEDITOR.editorConfig = function(config){
                { name: 'styles', items: [ 'Styles', 'Format', 'FontSize' ] }
        ];
        config.toolbar_Small = [
-               { name: 'tools', items: [ 'Maximize', 'Source' ] },
-               { name: 'clipboard', items: [ 'Undo', 'Redo' ] },
-               { name: 'paragraph', items: [ 'NumberedList', 'BulletedList', 'JustifyLeft', 'JustifyCenter', 'JustifyRight' ] },
+               { name: 'tools', items: [ 'Maximize', 'Source', 'Undo', 'Redo', 'NumberedList', 'BulletedList', 'JustifyLeft', 'JustifyCenter', 'JustifyRight' ] },
                '/',
-               { name: 'basicstyles', items: [ 'Bold', 'Italic' ] },
-               { name: 'links', items: [ 'M3Link', 'M3Unlink' ] },
-               { name: 'styles', items: [ 'Format' ] },
-               { name: 'insert', items: [ 'Image' ] },
+               { name: 'basicstyles', items: [ 'Bold', 'Italic', '-', 'M3Link', 'M3Unlink', 'Format', 'Image' ] }
        ];
        if (typeof(M3_CONFIG_WIDGET_CKEDITOR_TEMPLATE_TYPE) != "undefined" && M3_CONFIG_WIDGET_CKEDITOR_TEMPLATE_TYPE == 10){
                config.stylesCombo_stylesSet = 'bootstrap';

diff --git a/scripts/m3/ckconfig_test.js b/scripts/m3/ckconfig_test.js
index be07fe1..9351250 100644 (file)
--- a/scripts/m3/ckconfig_test.js
+++ b/scripts/m3/ckconfig_test.js
@@ -124,6 +124,7 @@ CKEDITOR.editorConfig = function( config ) {
                { name: 'clipboard', items: [ 'Templates', '-', 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
                { name: 'editing', items : [ 'Find','Replace','-','SelectAll' ] },
 //             { name: 'insert', items: [ 'Image', 'Flash', 'YouTube', 'Googlemaps', 'Table', 'HorizontalRule' ] },
+               { name: 'insert', items: [ 'Image' ] },
                { name: 'colors', items : [ 'TextColor', 'BGColor' ] },
                { name: 'others', items: [ 'LinkInfo', 'M3Templates' ] },
                '/',

diff --git a/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php b/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
index 6dcf9a2..ebcd4b8 100644 (file)
--- a/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
+++ b/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
@@ -50,7 +50,7 @@ class admin_menu4WidgetContainer extends BaseAdminWidgetContainer
        const LOGOUT_ICON_FILE = '/images/system/logout24.png';         // ログアウトアイコン
        const CONFIG_ICON_FILE = '/images/system/config24.png';         // ウィジェット設定画面アイコン
        const MAX_SITENAME_LENGTH = 20;         // サイト名の最大文字数
-       const MAX_SITENAME_LENGTH_S = 11;               // サイト名の最大文字数
+       const MAX_SITENAME_LENGTH_S = 9;                // サイト名の最大文字数
        const ICON_SIZE = 24;                   // アイコンサイズ
        const SITE_ICON_SIZE = 32;                      // サイトメニューアイコンサイズ
        const AVATAR_ICON_SIZE = 32;            // ユーザアバターアイコンサイズ