From: naoki hirata <naoki@magic3.org>
Date: Fri, 21 Feb 2014 13:07:53 +0000 (+0900)
Subject: 一般画面の管理用パネルメニュー更新。
X-Git-Tag: v2.8.8~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=402113ef25483c0c878fb8f9ad95df774e7e3f93;p=magic3%2Fmagic3.git

一般画面の管理用パネルメニュー更新。
---

diff --git a/images/system/logout32.png b/images/system/logout32.png
index 73c003e4..5d25434c 100644
Binary files a/images/system/logout32.png and b/images/system/logout32.png differ
diff --git a/images/system/logout64.png b/images/system/logout64.png
index 9c61ae88..590444b2 100644
Binary files a/images/system/logout64.png and b/images/system/logout64.png differ
diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php
index 3b31e5f5..eaf95a77 100644
--- a/include/manager/pageManager.php
+++ b/include/manager/pageManager.php
@@ -141,9 +141,12 @@ class PageManager extends Core
 	const ADJUST_ICON32_FILE = '/images/system/adjust_widget32.png';	// 位置調整アイコン(ツールチップ用)
 	const CLOSE_BOX_ICON32_FILE = '/images/system/close_box.png';		// ウィンドウ閉じるアイコン(ツールチップ用)
 	const NOTICE_ICON_FILE = '/images/system/notice16.png';		// ウィジェット配置注意アイコン
-	const ADMIN_ICON_FILE = '/images/system/admin64.png';		// パネルメニュー管理画面遷移用アイコン
-	const LOGOUT_ICON_FILE = '/images/system/logout64.png';		// パネルメニューログアウト用アイコン
-	const EDIT_PAGE_ICON_FILE = '/images/system/create_page64.png';		// パネルメニュー編集用アイコン
+//	const ADMIN_ICON_FILE = '/images/system/admin64.png';		// パネルメニュー管理画面遷移用アイコン
+//	const LOGOUT_ICON_FILE = '/images/system/logout64.png';		// パネルメニューログアウト用アイコン
+//	const EDIT_PAGE_ICON_FILE = '/images/system/create_page64.png';		// パネルメニュー編集用アイコン	
+	const ADMIN_ICON_FILE = '/images/system/home32.png';		// パネルメニュー管理画面遷移用アイコン
+	const LOGOUT_ICON_FILE = '/images/system/logout32.png';		// パネルメニューログアウト用アイコン
+	const EDIT_PAGE_ICON_FILE = '/images/system/create_page32.png';		// パネルメニュー編集用アイコン	
 	const EDIT_END_ICON_FILE = '/images/system/close64.png';		// パネルメニュー編集終了用アイコン
 	const CLOSE_ICON_FILE = '/images/system/close32.png';		// ウィンドウ閉じるアイコン
 	const PREV_ICON_FILE = '/images/system/prev48.png';		// ウィンドウ「前へ」アイコン
@@ -250,6 +253,10 @@ class PageManager extends Core
 												
 			$this->defaultAdminCssFiles = array(self::M3_ADMIN_CSS_FILE);			// 管理機能用のCSS
 			if (!$this->useBootstrap) $this->defaultAdminCssFiles[] = self::M3_NO_BOOTSTRAP_CSS_FILE;	// Bootstrapを読み込まない場合は代替CSSを読み込む
+			
+			// Javascriptライブラリ
+			$this->addAdminScript('', ScriptLibInfo::LIB_JQUERY_M3_SLIDEPANEL);	// パネル用スクリプト追加
+			$this->addAdminScript('', ScriptLibInfo::LIB_JQUERY_EASING);		// パネル用スクリプト追加
 		}
 		
 		// 管理権限なしで管理ディレクトリアクセスで読み込むスクリプトファイル
@@ -1286,7 +1293,8 @@ class PageManager extends Core
 						$this->addScriptFile(ScriptLibInfo::JQUERY_CONTEXTMENU_FILENAME);		// jQuery Contextmenu Lib
 						$this->addScriptFile(self::M3_ADMIN_SCRIPT_FILENAME);		// 管理スクリプトライブラリ追加
 						//$this->addScript('', ScriptLibInfo::LIB_JQUERY_JQEASYPANEL);		// パネルメニュー(一般画面と管理画面の切り替え等)用
-						$this->addScript('', ScriptLibInfo::LIB_JQUERY_M3_SLIDEPANEL);// パネル用スクリプト追加
+						$this->addScript('', ScriptLibInfo::LIB_JQUERY_M3_SLIDEPANEL);	// パネル用スクリプト追加
+						$this->addScript('', ScriptLibInfo::LIB_JQUERY_EASING);		// パネル用スクリプト追加
 						$this->addScript('', ScriptLibInfo::LIB_JQUERY_CLUETIP);// HELP用スクリプト追加
 					
 						$this->addCssFile(self::M3_ADMIN_CSS_FILE);		// 管理機能用CSS
@@ -3213,7 +3221,8 @@ class PageManager extends Core
 						$linkUrl = createUrl($linkUrl, M3_REQUEST_PARAM_OPERATION_COMMAND . '=' . M3_REQUEST_CMD_LOGOUT);
 						$logoutTag = '<li><a href="' . convertUrlToHtmlEntity($linkUrl) . '">';
 						$logoutTag .= '<img src="' . $rootUrl . self::LOGOUT_ICON_FILE . '" alt="' . $titleStr . '" title="' . $titleStr . '" /></a></li>';
-						
+
+/*						
 						$linkStr .= '<div id="m3slidemenubar">';
 						$linkStr .= '<div id="m3slidemenubarpanel">';
 						$linkStr .= '<ul class="menubarbuttons">';
@@ -3229,10 +3238,28 @@ class PageManager extends Core
 						$linkStr .= '<a href="#" class="m3close">閉じる</a>';
 						$linkStr .= '</div>';
 						$linkStr .= '</div>';
+						*/
 					
+						$linkStr .= '<div id="m3slidepanel">';
+						$linkStr .= '<div class="m3panelopener m3topleft"><a href="#"><i class="glyphicon glyphicon-align-justify"></i></a></div>';
+						$linkStr .= '<div style="top:-60px; visibility: visible;" class="m3panel_top m3-navbar-default">';
+						$linkStr .= '<div tabindex="0" class="m3panel_wrap">';
+						$linkStr .= '<ul class="m3-nav m3-navbar-nav">';
+						if ($gEnvManager->isSystemAdmin()){				// 管理画面、編集モードは、管理者権限がある場合のみ有効
+							$linkStr .= $adminTag;
+							$linkStr .= $editTag;
+						}
+						$linkStr .= $logoutTag;
+						$linkStr .= '</ul>';
+						$linkStr .= '</div>';
+						$linkStr .= '</div>';
+						$linkStr .= '</div>';
+
 						$this->initScript .= str_repeat(M3_INDENT_SPACE, 1) . 'if (window.parent && window.parent.frames.length == 0){' . M3_NL;// インラインフレームでないときパネルメニューを表示
 						$this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '$("body").append(\'' . $linkStr . '\');' . M3_NL;
-						$this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '$("#m3slidemenubarpanel").m3SlideMenubar();' . M3_NL;
+						//$this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '$("#m3slidemenubarpanel").m3SlideMenubar();' . M3_NL;
+						$this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '$(".m3panel_top").m3slidepanel({ "position": "top", "type": "push" });' . M3_NL;
+						$this->initScript .= str_repeat(M3_INDENT_SPACE, 2) . '$("body").css("position", "relative");' . M3_NL;
 						$this->initScript .= str_repeat(M3_INDENT_SPACE, 1) . '}' . M3_NL;
 					}
 				}
diff --git a/scripts/m3/admin.css b/scripts/m3/admin.css
index 0a560df4..921ae11b 100644
--- a/scripts/m3/admin.css
+++ b/scripts/m3/admin.css
@@ -5,9 +5,9 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2012 Magic3 Project.
+ * @copyright  Copyright 2006-2013 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
- * @version    SVN: $Id: admin.css 5785 2013-03-04 05:45:14Z fishbone $
+ * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
 #m3slidemenubar {
@@ -119,3 +119,125 @@
 
 .m3_widget.m3_widget_sortable { cursor: url(../../images/system/cursor/context.cur), auto; }
 .m3_widget.m3_widget_contextmenu { cursor: url(../../images/system/cursor/context.cur), auto; }
+
+/***** Magic3スライドパネル *****/
+.m3panel_top,
+.m3panel_left,
+.m3panel_right,
+.m3panel_bottom,
+.m3panelopener,
+.m3panelopener a {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+/*	font-weight: inherit;*/
+	font-style: inherit;
+/*	font-size: 100%;*/
+/*	font-family: inherit;*/
+font-family:"Lucida Grande","Hiragino Kaku Gothic ProN",Meiryo,sans-serif;
+font-weight:500;
+line-height:1.1;
+font-size:15px;
+	vertical-align: baseline;
+	text-decoration: none;
+	text-transform: none;
+	background-color: transparent;
+	background-image: none;
+}
+
+.m3panelopener.m3topleft {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+}
+.m3panelopener a {
+	display: block;
+	background: #2C3E50;
+	color: #fff;
+	padding: 5px 10px;
+/*	font-size: 20px;*/
+	height:25px;
+}
+.m3panelopener a:visited {
+ 	color: #fff;
+}
+.m3panelopener a:hover {
+	text-decoration: none;
+}
+.m3panelopener .glyphicon {
+	font-size: 20px;
+}
+.m3panel_left {
+	background: #2C3E50;
+	position: fixed;
+	width: 240px;
+	height: 100%;
+	top: 0;
+	z-index: 1000;
+	visibility: hidden;
+}
+/*
+.m3panel_left .m3panel_wrap {
+	padding: 20px 0px 20px 0px;
+	color: #fff;
+}*/
+
+.m3panel_top {
+	background: #2C3E50;
+	position: fixed;
+	width: 100%;
+	height: 60px;
+	left: 0;
+	z-index: 1000;
+	visibility: hidden;
+}
+/*
+.m3panel_top .m3panell_wrap {
+	padding: 20px 0px 20px 0px;
+	color: #fff;
+}*/
+
+.m3panel_top a, .m3panel_left a, .m3panel_right a, .m3panel_bottom a {
+	color:#18bc9c;
+	text-decoration:none;
+}
+.m3panel_top img, .m3panel_left img, .m3panel_right img, .m3panel_bottom img {
+	border:0;
+	vertical-align:middle;
+}
+
+.m3-nav{padding-left:0;margin-bottom:0;list-style:none;}
+.m3-nav:before,.m3-nav:after{display:table;content:" "}
+.m3-nav:after{clear:both}
+.m3-nav:before,.m3-nav:after{display:table;content:" "}
+.m3-nav:after{clear:both}
+.m3-nav:before,.m3-nav:after{display:table;content:" "}
+.m3-nav:after{clear:both}
+.m3-nav:before,.m3-nav:after{display:table;content:" "}
+.m3-nav:after{clear:both}
+.m3-nav:before,.m3-nav:after{display:table;content:" "}
+.m3-nav:after{clear:both}
+.m3-nav>li{position:relative;display:block;}
+.m3-nav>li>a{position:relative;display:block;padding:10px 15px}
+.m3-nav>li>a:hover,.m3-nav>li>a:focus{text-decoration:none;background-color:#ecf0f1}
+.m3-nav>li.disabled>a{color:#b4bcc2}
+.m3-nav>li.disabled>a:hover,.m3-nav>li.disabled>a:focus{color:#b4bcc2;text-decoration:none;cursor:not-allowed;background-color:transparent}
+
+.m3-navbar-nav{margin:9.75px -15px;padding-left:30px;/*left icon position*/}
+.m3-navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:21px;}
+@media(min-width:768px){
+	.m3-navbar-nav{float:left;margin:0}
+	.m3-navbar-nav>li{float:left}
+	/*.m3-navbar-nav>li>a{padding-top:19.5px;padding-bottom:19.5px}*/
+	.m3-navbar-nav>li>a{padding-top:14px;padding-bottom:14px/*for 32x32 icon top position*/}
+}
+
+.m3-navbar-default{background-color:#2c3e50;border-color:#202d3b}
+.m3-navbar-default .navbar-brand{color:#fff}
+.m3-navbar-default .navbar-brand:hover,.m3-navbar-default .navbar-brand:focus{color:#18bc9c;background-color:transparent}
+.m3-navbar-default .navbar-text{color:#777}
+.m3-navbar-default .m3-navbar-nav>li>a{color:#fff}
+.m3-navbar-default .m3-navbar-nav>li>a:hover,.m3-navbar-default .m3-navbar-nav>li>a:focus{color:#18bc9c;background-color:transparent}
+.m3-navbar-default .m3-navbar-nav>.active>a,.m3-navbar-default .m3-navbar-nav>.active>a:hover,.m3-navbar-default .m3-navbar-nav>.active>a:focus{color:#fff;background-color:#1a242f}
+.m3-navbar-default .m3-navbar-nav>.disabled>a,.m3-navbar-default .m3-navbar-nav>.disabled>a:hover,.m3-navbar-default .m3-navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}