diff --git a/web/src/bower.json b/web/src/bower.json index 4f17a53e7..79bd1c035 100644 --- a/web/src/bower.json +++ b/web/src/bower.json @@ -26,8 +26,7 @@ "angular-base64": "~2.0.1", "angular-motion": "~0.3.2", "angular-timer": "~1.0.12", - "intro.js": "0.9.x", - "angular-intro-plus.js": "~0.3.9" + "tooltipster": "~3.3.0" }, "devDependencies": { "angular-mocks": "1.2.18", 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 871cc0e0b..a5dda4d58 100644 --- a/web/src/main/webapp/common/help/help-content-en.js +++ b/web/src/main/webapp/common/help/help-content-en.js @@ -58,6 +58,7 @@ pinpointApp "" + "[Usage]
" + "" + "[기능]
" + "" + "[기능]
" + " 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 58a9676a1..1e194bc96 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 @@ -7,8 +7,8 @@ maxTimeToShowLoadAsDefaultForUnknown: 60 * 60 * 12 // 12h }); - pinpointApp.directive('nodeInfoDetailsDirective', [ 'nodeInfoDetailsDirectiveConfig', '$filter', '$timeout', 'isVisibleService', '$window', - function (cfg, $filter, $timeout, isVisibleService, $window) { + pinpointApp.directive('nodeInfoDetailsDirective', [ 'nodeInfoDetailsDirectiveConfig', '$filter', '$timeout', 'isVisibleService', '$window', 'helpContentService', + function (cfg, $filter, $timeout, isVisibleService, $window, helpContentService) { return { restrict: 'EA', replace: true, @@ -347,6 +347,27 @@ // console.log('on responseTimeChartDirective.itemClicked.forNode', data); }); + jQuery('.responseSummaryChartTooltip').tooltipster({ + content: function() { + return helpContentService.nodeInfoDetails.responseSummary; + }, + position: "left", + trigger: "click" + }); + jQuery('.loadChartTooltip').tooltipster({ + content: function() { + return helpContentService.nodeInfoDetails.load; + }, + position: "left", + trigger: "click" + }); + jQuery('.serverListTooltip').tooltipster({ + content: function() { + return 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 c5758e780..922e3809c 100644 --- a/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html +++ b/web/src/main/webapp/features/nodeInfoDetails/nodeInfoDetails.html @@ -61,17 +61,17 @@
-
Response Summary
+
Response Summary
-
Load
+
Load
-
Servers
+
Servers
  • diff --git a/web/src/main/webapp/features/scatter/jquery.BigScatterChart.js b/web/src/main/webapp/features/scatter/jquery.BigScatterChart.js index 8784a0873..c526e915d 100644 --- a/web/src/main/webapp/features/scatter/jquery.BigScatterChart.js +++ b/web/src/main/webapp/features/scatter/jquery.BigScatterChart.js @@ -5,10 +5,18 @@ * @since May 28, 2013 * @author Denny Lim * @license MIT License - * @copyright 2013 NHN Corp. + * @copyright 2013 Naver Corp. */ var BigScatterChart = $.Class({ - $init: function (htOption) { + /** + * initialize BigScatterChart class + * @ko BigScattterChart 초기화 함수 + * @constructor + * @method BigScatterChart#$init + * @param {Object} option option object + * @param {Service} helpContentService angularjs service object + */ + $init: function (htOption, helpContentService) { this.option({ 'sContainerId': '', 'sPrefix': 'bigscatterchart-', @@ -110,6 +118,23 @@ var BigScatterChart = $.Class({ this._initEvents(); this._drawXYAxis(); this.updateXYAxis(); + this._initTooltip( helpContentService ); + }, + /** + * initialize tooltipster + * @ko tooltipster 를 초기화 + * @constructor + * @method BigScatterChart#_initTooltip + * @param {Service} helpContentService angularjs service object + */ + _initTooltip: function(helpContentService) { + this._welContainer.find(".scatterTooltip").tooltipster({ + content: function() { + return helpContentService.scatter["default"]; + }, + position: "bottom", + trigger: "click" + }); }, _initVariables: function (bIsRedrawing) { @@ -187,6 +212,7 @@ var BigScatterChart = $.Class({ 'width': this.option('nWidth'), 'height': this.option('nHeight') }).addClass('bigscatterchart'); + this._welContainer.append( $('
    ') ); // guide this._welGuideCanvas = $('') @@ -424,7 +450,7 @@ var BigScatterChart = $.Class({ }); this._htwelTypeLi = {}; this._htwelTypeSpan = {}; - var htCheckBoxImage = this.option('htCheckBoxImage'); + var htCheckBoxImage = this.option('htCheckBoxImage'); _.each(htType, function (sVal, sKey) { var style = { 'display': 'inline-block', diff --git a/web/src/main/webapp/features/scatter/scatter.directive.js b/web/src/main/webapp/features/scatter/scatter.directive.js index 8b55066ee..dfbe7067b 100644 --- a/web/src/main/webapp/features/scatter/scatter.directive.js +++ b/web/src/main/webapp/features/scatter/scatter.directive.js @@ -61,8 +61,8 @@ // FIXME made global to allow access from the child window. Refactor later. //var selectdTracesBox = {}; - pinpointApp.directive('scatterDirective', ['scatterDirectiveConfig', '$rootScope', '$timeout', 'webStorage', 'TransactionDaoService', '$window', - function (cfg, $rootScope, $timeout, webStorage, oTransactionDaoService, $window) { + pinpointApp.directive('scatterDirective', ['scatterDirectiveConfig', '$rootScope', '$timeout', 'webStorage', 'TransactionDaoService', '$window', 'helpContentService', + function (cfg, $rootScope, $timeout, webStorage, oTransactionDaoService, $window, helpContentService) { return { template: '
    ', restrict: 'EA', @@ -227,7 +227,7 @@ }; var oScatterChart = null; - oScatterChart = new BigScatterChart(options); + oScatterChart = new BigScatterChart(options, helpContentService); $timeout(function () { if (angular.isUndefined(scatterData)) { oScatterChart.drawWithDataSource(getDataSource(title, start, end, filter)); diff --git a/web/src/main/webapp/features/serverMap/jquery.ServerMap2.js b/web/src/main/webapp/features/serverMap/jquery.ServerMap2.js index 47ba5e528..d5b76f8c8 100644 --- a/web/src/main/webapp/features/serverMap/jquery.ServerMap2.js +++ b/web/src/main/webapp/features/serverMap/jquery.ServerMap2.js @@ -17,7 +17,7 @@ * constructor * * @constructor - * @method $init + * @method ServerMap#$init * @param {object} */ $init: function (htOption, $location) { @@ -164,7 +164,7 @@ /** * initialize variables * - * @method _initVariables + * @method ServerMap#_initVariables */ _initVariables: function () { this.$ = go.GraphObject.make; @@ -183,7 +183,7 @@ /** * initialize node templates * - * @method _initNodeTemplates + * @method ServerMap#_initNodeTemplates */ _initNodeTemplates: function () { var self = this, @@ -645,7 +645,7 @@ /** * initialize link templates * - * @method _initLinkTemplates + * @method ServerMap#_initLinkTemplates */ _initLinkTemplates: function () { var self = this, @@ -777,7 +777,7 @@ /** * initialize diagrams * - * @method _initDiagramEnvironment + * @method ServerMap#_initDiagramEnvironment */ _initDiagramEnvironment: function () { var htPadding = this.option('htPadding'); @@ -854,7 +854,7 @@ /** * initialize Overview * - * @method _initOverview + * @method ServerMap#_initOverview */ _initOverview: function ( $location ) { @@ -874,7 +874,7 @@ /** * load * - * @method load + * @method ServerMap#load * @param {object} */ load: function (str) { @@ -887,7 +887,7 @@ /** * clear diagram * - * @method clear + * @method ServerMap#clear */ clear: function () { this._oDiagram.model = go.Model.fromJson({}); @@ -896,7 +896,7 @@ /** * reset highlights * - * @method _resetHighlights + * @method ServerMap#_resetHighlights */ _resetHighlights: function () { var allNodes = this._oDiagram.nodes; @@ -912,7 +912,7 @@ /** * update highlights * - * @method _updateHighlights + * @method ServerMap#_updateHighlights * @param {go.Node} selection */ _updateHightlights: function (selection) { @@ -951,7 +951,7 @@ /** * highlight node by node key * - * @method highlightNodeByKey + * @method ServerMap#highlightNodeByKey * @param {String} sKey node key */ highlightNodeByKey: function (sKey) { @@ -966,7 +966,7 @@ /** * highlight link by from, to objects * - * @method highlightLinkByFromTo + * @method ServerMap#highlightLinkByFromTo * @param {String} from * @param {String} to */ @@ -981,7 +981,7 @@ /** * get link by from, to objects * - * @method _getLinkObjectByFromTo + * @method ServerMap#_getLinkObjectByFromTo * @param {String} from * @param {String} to */ @@ -998,6 +998,7 @@ /** * highlight node + * ServerMap#_highlightNode * @param nodeShape * @param nodeText * @param theme @@ -1053,6 +1054,7 @@ /** * highlight link + * @method ServerMap#_highlightLink * @param shape * @param theme * @private @@ -1086,7 +1088,7 @@ /** * if the link connects to this node, highlight it * - * @method _linksTo + * @method ServerMap#_linksTo * @param {go.Node} x * @param {Number} i */ @@ -1102,7 +1104,7 @@ /** * if the link comes from this node, highlight it * - * @method _linksFrom + * @method ServerMap#_linksFrom * @param {go.Node} x * @param {Number} i */ @@ -1119,7 +1121,7 @@ * if selected object is a link, highlight its fromNode, otherwise, * highlight the fromNode of each link coming into the selected node * - * @method _nodesTo + * @method ServerMap#_nodesTo * @param {go.Node} x * @param {Number} i * @return a List of the keys of the nodes @@ -1142,7 +1144,7 @@ /** * same as nodesTo, but from instead of to * - * @method _nodesFrom + * @method ServerMap#_nodesFrom * @param {go.Node} x * @param {Number} i */ @@ -1163,7 +1165,7 @@ /** * event of merge group node click * - * @method _onNodeSubGroupClicked + * @method ServerMap#_onNodeSubGroupClicked * @param {Event} e * @param {ojb} ojb * @param {String} unknownKey @@ -1180,7 +1182,7 @@ /** * event of node click * - * @method _onNodeClicked + * @method ServerMap#_onNodeClicked * @param {Event} e * @param {ojb} ojb * @param {String} unknownKey @@ -1197,7 +1199,7 @@ /** * event of node doubleclick * - * @method _onNodeDoubleClicked + * @method ServerMap#_onNodeDoubleClicked * @param {Event} e * @param {ojb} ojb */ @@ -1213,7 +1215,7 @@ /** * event of node context click * - * @method _onNodeContextClick + * @method ServerMap#_onNodeContextClick * @param {Event} e * @param {ojb} ojb */ @@ -1229,7 +1231,7 @@ /** * event of link click * - * @method _onLinkClicked + * @method ServerMap#_onLinkClicked * @param {Event} e * @param {ojb} ojb */ @@ -1248,7 +1250,7 @@ /** * event of link context click * - * @method _onLinkContextClicked + * @method ServerMap#_onLinkContextClicked * @param {Event} e * @param {ojb} ojb */ @@ -1263,9 +1265,6 @@ } }, - /** - * refresh - */ refresh: function () { // while (this._oDiagram.undoManager.canUndo()) { // this._oDiagram.undoManager.undo(); @@ -1273,10 +1272,6 @@ // this._oDiagram.zoomToFit(); this.load(this._sLastModelData); }, - - /** - * zoom to fit - */ zoomToFit: function () { this._oDiagram.zoomToFit(); this._oDiagram.contentAlignment = go.Spot.Center; @@ -1285,9 +1280,6 @@ clearQuery: function() { this._query = ""; }, - /** - * search node - */ searchNode: function( query, nodeServiceType ) { this._query = query; var allNodes = this._oDiagram.nodes, diff --git a/web/src/main/webapp/features/serverMap/server-map.directive.js b/web/src/main/webapp/features/serverMap/server-map.directive.js index badb7c92a..90f059033 100644 --- a/web/src/main/webapp/features/serverMap/server-map.directive.js +++ b/web/src/main/webapp/features/serverMap/server-map.directive.js @@ -35,8 +35,8 @@ } }); - pinpointApp.directive('serverMapDirective', [ 'serverMapDirectiveConfig', 'ServerMapDaoService', 'AlertsService', 'ProgressBarService', 'SidebarTitleVoService', '$filter', 'ServerMapFilterVoService', 'encodeURIComponentFilter', 'filteredMapUtilService', '$base64', 'ServerMapHintVoService', '$timeout', '$location', - function (cfg, ServerMapDaoService, AlertsService, ProgressBarService, SidebarTitleVoService, $filter, ServerMapFilterVoService, encodeURIComponentFilter, filteredMapUtilService, $base64, ServerMapHintVoService, $timeout, $location) { + pinpointApp.directive('serverMapDirective', [ 'serverMapDirectiveConfig', 'ServerMapDaoService', 'AlertsService', 'ProgressBarService', 'SidebarTitleVoService', '$filter', 'ServerMapFilterVoService', 'encodeURIComponentFilter', 'filteredMapUtilService', '$base64', 'ServerMapHintVoService', '$timeout', '$location', 'helpContentService', + function (cfg, ServerMapDaoService, AlertsService, ProgressBarService, SidebarTitleVoService, $filter, ServerMapFilterVoService, encodeURIComponentFilter, filteredMapUtilService, $base64, ServerMapHintVoService, $timeout, $location, helpContentService) { return { restrict: 'EA', replace: true, @@ -798,6 +798,14 @@ scope.$emit("navbar.moveTheFuture"); $serverMapTime.effect("highlight", { color: "#FFFF00" }, 1000); }; + + jQuery('.serverMapTooltip').tooltipster({ + content: function() { + return helpContentService.servermap["default"]; + }, + position: "bottom", + trigger: "click" + }); } }; } diff --git a/web/src/main/webapp/features/serverMap/serverMap.html b/web/src/main/webapp/features/serverMap/serverMap.html index b5021055e..83bf8dd22 100644 --- a/web/src/main/webapp/features/serverMap/serverMap.html +++ b/web/src/main/webapp/features/serverMap/serverMap.html @@ -1,6 +1,9 @@
    +
    + +
    {{sNode.applicationName}}({{sNode.serviceType}})
    diff --git a/web/src/main/webapp/images/help/scatter_01.png b/web/src/main/webapp/images/help/scatter_01.png new file mode 100644 index 000000000..b940d0b8a Binary files /dev/null and b/web/src/main/webapp/images/help/scatter_01.png differ diff --git a/web/src/main/webapp/index.html b/web/src/main/webapp/index.html index ae425b2d0..1c1a8e707 100644 --- a/web/src/main/webapp/index.html +++ b/web/src/main/webapp/index.html @@ -35,8 +35,7 @@ - - + @@ -97,6 +96,7 @@ + @@ -130,19 +130,7 @@ -
    -
    - - +