From 634939062a0f6a62efe81991fca3e462866f6be7 Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Sat, 11 Jan 2014 22:58:13 +0900
Subject: [PATCH] =?utf8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=80=8C?=
 =?utf8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E6=83=85=E5=A0=B1=E3=80=8D=E3=82=A6?=
 =?utf8?q?=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83=E3=83=88=E6=9B=B4=E6=96=B0?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 widgets/admin/loginuser/css/default.css            |  6 ++++++
 .../container/admin_loginuserWidgetContainer.php   |  8 +++++---
 .../loginuser/include/template/index_bs.tmpl.html  | 22 +++++++++-------------
 3 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 widgets/admin/loginuser/css/default.css

diff --git a/widgets/admin/loginuser/css/default.css b/widgets/admin/loginuser/css/default.css
new file mode 100644
index 00000000..6e85d9a3
--- /dev/null
+++ b/widgets/admin/loginuser/css/default.css
@@ -0,0 +1,6 @@
+
+.loginuser .actbutton {
+	position:absolute;
+	right: 25px;
+	bottom: 30px;
+}
diff --git a/widgets/admin/loginuser/include/container/admin_loginuserWidgetContainer.php b/widgets/admin/loginuser/include/container/admin_loginuserWidgetContainer.php
index 42bec87b..e040fb43 100644
--- a/widgets/admin/loginuser/include/container/admin_loginuserWidgetContainer.php
+++ b/widgets/admin/loginuser/include/container/admin_loginuserWidgetContainer.php
@@ -22,7 +22,7 @@ class admin_loginuserWidgetContainer extends BaseWidgetContainer
 	private $langId;		// 言語
 	private $useBootstrap;
 	const DEFAULT_TITLE = 'ログインユーザ';		// デフォルトのウィジェットタイトル名
-//	const ICON_SIZE = 128;		// アイコンのサイズ
+	const DEFAULT_CSS_FILE = '/default.css';		// CSSファイル
 		
 	/**
 	 * コンストラクタ
@@ -124,12 +124,14 @@ class admin_loginuserWidgetContainer extends BaseWidgetContainer
 	 */
 	function _addCssFileToHead($request, &$param)
 	{
+		$cssFilePath = $this->getUrl($this->gEnv->getCurrentWidgetCssUrl() . self::DEFAULT_CSS_FILE);		// CSSファイル
+		
 		// Bootstrapを使用する場合はjQueryUIテーマを使用しない
 		$useBootstrap = $this->gPage->getUseBootstrap();
 		if ($useBootstrap){
-			return '';
+			return $cssFilePath;
 		} else {
-			return array($this->getUrl($this->gEnv->getAdminDefaultThemeUrl()));
+			return array($cssFilePath, $this->getUrl($this->gEnv->getAdminDefaultThemeUrl()));
 		}
 	}
 }
diff --git a/widgets/admin/loginuser/include/template/index_bs.tmpl.html b/widgets/admin/loginuser/include/template/index_bs.tmpl.html
index de45624f..66febd39 100644
--- a/widgets/admin/loginuser/include/template/index_bs.tmpl.html
+++ b/widgets/admin/loginuser/include/template/index_bs.tmpl.html
@@ -11,19 +11,15 @@
  * @link       http://www.magic3.org
  */
 <patTemplate:tmpl name="_widget">
-<div class="col-sm-3">
-<div class="hero-widget well well-sm">
-<div class="icon">
-<i class="glyphicon glyphicon-user"></i>
+<div class="loginuser well well-lg text-center">
+<div><a href="{USER_DETAIL_URL}">{AVATAR_IMAGE}</a></div>
+<h3>{NAME}</h3>
+<p class="text-left">
+前回ログイン：{LOGIN_DT}<br />
+ログイン回数：<a href="{LOGIN_STATUS_URL}">{LOGIN_COUNT}</a><br />
+</p>
+<div class="actbutton">
+<a href="{USER_DETAIL_URL}" class="btn btn-sm btn-warning" role="button" data-toggle="tooltip" data-original-title="Edit this user"><i class="glyphicon glyphicon-edit"></i></a>
 </div>
-<div class="text">
-<var>3</var>
-<label class="text-muted">invited guests</label>
 </div>
-</div>
-</div>
-<div style="text-align:center;"><a href="{USER_DETAIL_URL}">{AVATAR_IMAGE}</a></div>
-<div>名前：<a href="{USER_DETAIL_URL}">{NAME}</a></div>
-<div>前回ログイン：{LOGIN_DT}</div>
-<div>ログイン回数：<a href="{LOGIN_STATUS_URL}">{LOGIN_COUNT}</a></div>
 </patTemplate:tmpl>
-- 
2.11.0