From cd4b404fafbfce9317f0148d2556db8dd7769aa0 Mon Sep 17 00:00:00 2001
From: denz <hyojong.song2015@navercorp.com>
Date: Thu, 11 Jun 2015 17:09:36 +0900
Subject: [PATCH] Improvement Servers UI Move servers tooltip position

---
 web/src/main/webapp/common/help/help-content-en.js       | 4 ++--
 web/src/main/webapp/common/help/help-content-ko.js       | 4 ++--
 .../nodeInfoDetails/node-info-details.directive.js       | 7 -------
 .../webapp/features/nodeInfoDetails/nodeInfoDetails.html | 1 -
 .../webapp/features/serverList/server-list.directive.js  | 9 ++++++++-
 web/src/main/webapp/index.html                           | 1 +
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/src/main/webapp/common/help/help-content-en.js b/web/src/main/webapp/common/help/help-content-en.js
index 9b24b1b6c..d811c4998 100644
--- a/web/src/main/webapp/common/help/help-content-en.js
+++ b/web/src/main/webapp/common/help/help-content-en.js
@@ -202,10 +202,10 @@
 						name: "<button type='button' class='btn btn-default btn-xs'>Inspector</button>",
 						desc: "Open a new window with detailed information on the WAS with Pinpoint installed."
 					},{
-						name: "<button type='button' class='btn btn-default btn-xs'><span class='glyphicon glyphicon-plus'></span></button>",
+						name: "<span class='glyphicon glyphicon-record' style='color:#3B99FC'></span>",
 						desc: "Display statistics on transactions carried out by the server instance."
 					},{
-						name: "<button type='button' class='btn btn-danger btn-xs'><span class='glyphicon glyphicon-plus'></span></button>",
+						name: "<span class='glyphicon glyphicon-hdd' style='color:red'></span>",
 						desc: "Display statistics on transactions (with error) carried out by the server instance."
 					}]
 				}]
diff --git a/web/src/main/webapp/common/help/help-content-ko.js b/web/src/main/webapp/common/help/help-content-ko.js
index a751fa794..738e01f53 100644
--- a/web/src/main/webapp/common/help/help-content-ko.js
+++ b/web/src/main/webapp/common/help/help-content-ko.js
@@ -204,10 +204,10 @@
 						name: "<button type='button' class='btn btn-default btn-xs'>Inspector</button>",
 						desc: "Pinpoint가 설치된 WAS의 상세한 정보를 보여줍니다."
 					},{
-						name: "<button type='button' class='btn btn-default btn-xs'><span class='glyphicon glyphicon-plus'></span></button>",
+						name: "<span class='glyphicon glyphicon-record' style='color:#3B99FC'></span>",
 						desc: "해당 인스턴스에서 처리된 트랜잭션 통계를 조회할 수 있습니다."
 					},{
-						name: "<button type='button' class='btn btn-danger btn-xs'><span class='glyphicon glyphicon-plus'></span></button>",
+						name: "<span class='glyphicon glyphicon-hdd' style='color:red'></span>",
 						desc: "에러를 발생시킨 트랜잭션이 포함되어있다는 의미입니다."
 					}]
 				}]
diff --git a/web/src/main/webapp/features/nodeInfoDetails/node-info-details.directive.js b/web/src/main/webapp/features/nodeInfoDetails/node-info-details.directive.js
index 067851b33..6d95479dc 100644
--- a/web/src/main/webapp/features/nodeInfoDetails/node-info-details.directive.js
+++ b/web/src/main/webapp/features/nodeInfoDetails/node-info-details.directive.js
@@ -375,13 +375,6 @@
                     	position: "top",
                     	trigger: "click"
                     });
-                    jQuery('.serverListTooltip').tooltipster({
-                    	content: function() {
-                    		return helpContentTemplate(helpContentService.nodeInfoDetails.nodeServers);
-                    	},
-                    	position: "top",
-                    	trigger: "click"
-                    });
                 }
             };
 	    }
diff --git a/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html b/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html
index 62aa179d2..aadcdbd15 100644
--- a/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html
+++ b/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html
@@ -78,7 +78,6 @@
 	                   Servers
 	            </button>
 			</div>
-			<span class="glyphicon glyphicon-question-sign serverListTooltip" style="cursor:pointer;float:right"></span>
 			<span class="label label-default">Total</span><span class="label label-info">{{serverCount}}</span>
 			<span class="label label-default">Error</span><span class="label label-danger">{{errorServerCount}}</span>
 		</div>
diff --git a/web/src/main/webapp/features/serverList/server-list.directive.js b/web/src/main/webapp/features/serverList/server-list.directive.js
index e4fb17261..afa376c5e 100644
--- a/web/src/main/webapp/features/serverList/server-list.directive.js
+++ b/web/src/main/webapp/features/serverList/server-list.directive.js
@@ -1,7 +1,7 @@
 (function() {
 	'use strict';
 	
-	pinpointApp.directive('serverListDirective', [ '$timeout', '$window', '$filter', function ($timeout, $window, $filter) {
+	pinpointApp.directive('serverListDirective', [ '$timeout', '$window', '$filter', 'helpContentTemplate', 'helpContentService', function ($timeout, $window, $filter, helpContentTemplate, helpContentService) {
             return {
                 restrict: 'A',
                 link: function postLink(scope, element) {
@@ -93,6 +93,13 @@
                 		bInitialized = true;
                     });
 
+                    $element.find('.serverListTooltip').tooltipster({
+                    	content: function() {
+                    		return helpContentTemplate(helpContentService.nodeInfoDetails.nodeServers);
+                    	},
+                    	position: "bottom",
+                    	trigger: "click"
+                    });	
                 }
             };
 	    }
diff --git a/web/src/main/webapp/index.html b/web/src/main/webapp/index.html
index 6d1e350d7..706d31a97 100644
--- a/web/src/main/webapp/index.html
+++ b/web/src/main/webapp/index.html
@@ -133,6 +133,7 @@
 		<div class="modal-content">
 			<div class="modal-header" style="background-color:#B0B0B0;color:#FFFFFF">
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<span class="glyphicon glyphicon-question-sign serverListTooltip" style="cursor:pointer;float:right;color:white;margin-right:20px;"></span>
 				<h4 class="modal-title" ng-show="showNodeServer"><img ng-src="{{node.serviceType | iconUrl}}"> <span style="font-size:24px;font-weight:bold">{{node.applicationName}}</span> <span style="font-size:12px;padding-left:10px;">Server List</span></h4>
 				<h4 class="modal-title" ng-show="showLinkServer"><span style="font-size:24px;font-weight:bold"><img ng-src="{{node.fromNode.serviceType | iconUrl}}"> {{node.fromNode.applicationName}} <span class="glyphicon glyphicon-arrow-right"></span> <img ng-src="{{node.fromNode.serviceType | iconUrl}}"> {{node.toNode.applicationName}}</span> <span style="font-size:12px;padding-left:10px">Server List</span></h4>
 			</div>