From 603741514c4acf7f1eb70a2a0d94efbc8aa920ac Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Sat, 11 Jan 2014 10:58:31 +0900
Subject: [PATCH] =?utf8?q?=E7=AE=A1=E7=90=86=E6=A9=9F=E8=83=BD=E3=83=A1?=
 =?utf8?q?=E3=82=A4=E3=83=B3=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AB?=
 =?utf8?q?=E3=82=BB=E3=83=91=E3=83=AC=E3=83=BC=E3=82=BF=E4=BB=95=E6=A7=98?=
 =?utf8?q?=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../container/admin_menu4WidgetContainer.php       | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php b/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
index 7ef5b322..5a538c1e 100644
--- a/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
+++ b/widgets/admin_menu4/include/container/admin_menu4WidgetContainer.php
@@ -234,7 +234,9 @@ class admin_menu4WidgetContainer extends BaseAdminWidgetContainer
 			$menuInner = str_repeat(M3_INDENT_SPACE, self::MAINMENU_INDENT_LEBEL) . '<li class="col-sm-' . $columnWidth . '"><ul>' . M3_NL;
 						
 			for ($i = 0; $i < $topMenuCount; $i++){
-				if ($rows[$i]['ni_view_control'] == 0){		// 改行以外のとき
+				if ($rows[$i]['ni_view_control'] == 1){		// 改行のとき
+					$menuInner .= str_repeat(M3_INDENT_SPACE, self::MAINMENU_INDENT_LEBEL) . '</ul></li><li class="col-sm-' . $columnWidth . '"><ul>' . M3_NL;
+				} else {		// 改行以外のとき
 					$topId = $rows[$i]['ni_id'];
 			
 					// サブレベル取得
@@ -254,6 +256,9 @@ class admin_menu4WidgetContainer extends BaseAdminWidgetContainer
 					// メニュー小項目
 					if (count($subRows) > 0){
 						for ($l = 0; $l < count($subRows); $l++){
+							// 項目の種別
+							$itemType = $subRows[$l]['ni_view_control'];
+							
 							// ヘルプの作成
 							$helpText = '';
 							$title = $subRows[$l]['ni_help_title'];
@@ -262,17 +267,26 @@ class admin_menu4WidgetContainer extends BaseAdminWidgetContainer
 							}
 						
 							$menuInner .= str_repeat(M3_INDENT_SPACE, self::MAINMENU_INDENT_LEBEL + 2);
-							$menuInner .= '<li><a href="';
-							$menuInner .= $this->getUrl($this->gEnv->getDefaultAdminUrl() . '?task=' . $subRows[$l]['ni_task_id']);	// 起動タスクパラメータを設定
-							if (!empty($subRows[$l]['ni_param'])){		// パラメータが存在するときはパラメータを追加
-								$menuInner .= '&' . M3_REQUEST_PARAM_OPERATION_TODO . '=' . urlencode($subRows[$l]['ni_param']);
+							
+							switch ($itemType){
+								case 0:		// リンク項目
+								default:
+									$menuInner .= '<li><a href="';
+									$menuInner .= $this->getUrl($this->gEnv->getDefaultAdminUrl() . '?task=' . $subRows[$l]['ni_task_id']);	// 起動タスクパラメータを設定
+									if (!empty($subRows[$l]['ni_param'])){		// パラメータが存在するときはパラメータを追加
+										$menuInner .= '&' . M3_REQUEST_PARAM_OPERATION_TODO . '=' . urlencode($subRows[$l]['ni_param']);
+									}
+									$menuInner .= '" ><span ' . $helpText . '>' . $this->convertToDispString($subRows[$l]['ni_name']) . '</span></a></li>' . M3_NL;
+									break;
+								case 2:		// 使用不可
+									break;
+								case 3:		// セパレータ
+									$menuInner .= '<li class="divider"></li>' . M3_NL;
+									break;
 							}
-							$menuInner .= '" ><span ' . $helpText . '>' . $this->convertToDispString($subRows[$l]['ni_name']) . '</span></a></li>' . M3_NL;
 						}
 					}
 					$menuInner .= str_repeat(' ', 4);
-				} else {		// 改行のとき
-					$menuInner .= str_repeat(M3_INDENT_SPACE, self::MAINMENU_INDENT_LEBEL) . '</ul></li><li class="col-sm-' . $columnWidth . '"><ul>' . M3_NL;
 				}
 			}
 			
-- 
2.11.0