From b16229c202635bcc2e1567b4162ce32c9e0982c4 Mon Sep 17 00:00:00 2001 From: naoki hirata Date: Fri, 10 Jan 2014 12:06:16 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E5=88=B6?= =?utf8?q?=E5=BE=A1=E7=94=BB=E9=9D=A2=E6=9B=B4=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../container/admin_mainMenuWidgetContainer.php | 10 +++++++++- .../container/admin_mainTopWidgetContainer.php | 14 -------------- widgets/admin_main/include/template/menu.tmpl.html | 6 +++--- .../admin_main/include/template/menu_bs.tmpl.html | 21 +++++++++++++++++++++ 4 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 widgets/admin_main/include/template/menu_bs.tmpl.html diff --git a/widgets/admin_main/include/container/admin_mainMenuWidgetContainer.php b/widgets/admin_main/include/container/admin_mainMenuWidgetContainer.php index d2c395b1..26584816 100644 --- a/widgets/admin_main/include/container/admin_mainMenuWidgetContainer.php +++ b/widgets/admin_main/include/container/admin_mainMenuWidgetContainer.php @@ -17,6 +17,8 @@ require_once($gEnvManager->getCurrentWidgetContainerPath() . '/admin_mainBaseWid class admin_mainMenuWidgetContainer extends admin_mainBaseWidgetContainer { + private $useBootstrap; + /** * コンストラクタ */ @@ -24,6 +26,8 @@ class admin_mainMenuWidgetContainer extends admin_mainBaseWidgetContainer { // 親クラスを呼び出す parent::__construct(); + + $this->useBootstrap = $this->gPage->getUseBootstrap(); } /** * テンプレートファイルを設定 @@ -37,7 +41,11 @@ class admin_mainMenuWidgetContainer extends admin_mainBaseWidgetContainer */ function _setTemplate($request, &$param) { - return 'menu.tmpl.html'; + if ($this->useBootstrap){ + return 'menu_bs.tmpl.html'; + } else { + return 'menu.tmpl.html'; + } } /** * テンプレートにデータ埋め込む diff --git a/widgets/admin_main/include/container/admin_mainTopWidgetContainer.php b/widgets/admin_main/include/container/admin_mainTopWidgetContainer.php index be540c39..eccb54d5 100644 --- a/widgets/admin_main/include/container/admin_mainTopWidgetContainer.php +++ b/widgets/admin_main/include/container/admin_mainTopWidgetContainer.php @@ -173,20 +173,6 @@ class admin_mainTopWidgetContainer extends admin_mainBaseWidgetContainer $this->setLocaleText($localeText); } /** - * CSSファイルをHTMLヘッダ部に設定 - * - * CSSファイルをHTMLのheadタグ内に追加出力する。 - * _assign()よりも後に実行される。 - * - * @param RequestManager $request HTTPリクエスト処理クラス - * @param object $param 任意使用パラメータ。 - * @return string CSS文字列。出力しない場合は空文字列を設定。 - */ - function _addCssFileToHead($request, &$param) - { - return array($this->getUrl($this->gEnv->getAdminDefaultThemeUrl())); - } - /** * JavascriptファイルをHTMLヘッダ部に設定 * * JavascriptファイルをHTMLのheadタグ内に追加出力する。 diff --git a/widgets/admin_main/include/template/menu.tmpl.html b/widgets/admin_main/include/template/menu.tmpl.html index 54097221..e82146a4 100644 --- a/widgets/admin_main/include/template/menu.tmpl.html +++ b/widgets/admin_main/include/template/menu.tmpl.html @@ -5,7 +5,7 @@ * * @package Magic3 Framework * @author 平田直毅(Naoki Hirata) - * @copyright Copyright 2006-2013 Magic3 Project. + * @copyright Copyright 2006-2014 Magic3 Project. * @license http://www.gnu.org/copyleft/gpl.html GPL License * @version SVN: $Id$ * @link http://www.magic3.org @@ -16,8 +16,8 @@
システム制御
diff --git a/widgets/admin_main/include/template/menu_bs.tmpl.html b/widgets/admin_main/include/template/menu_bs.tmpl.html new file mode 100644 index 00000000..a30590a2 --- /dev/null +++ b/widgets/admin_main/include/template/menu_bs.tmpl.html @@ -0,0 +1,21 @@ +/** + * 表示データ作成用テンプレート(patTemplate) + * + * LICENSE: This source file is licensed under the terms of the GNU General Public License. + * + * @package Magic3 Framework + * @author 平田直毅(Naoki Hirata) + * @copyright Copyright 2006-2014 Magic3 Project. + * @license http://www.gnu.org/copyleft/gpl.html GPL License + * @version SVN: $Id$ + * @link http://www.magic3.org + */ + +
+
システム制御
+ +
+ -- 2.11.0