From 1bfcabe2f93f3be1ab52ea50058ed0b97d5f774f Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Tue, 22 Sep 2015 20:17:43 +0200 Subject: [PATCH] close #23 fixed system tooltips, fixed typo --- js/app/map/map.js | 15 ++++++--------- public/templates/dialog/delete_account.html | 2 +- public/templates/view/landingpage.html | 6 +++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/js/app/map/map.js b/js/app/map/map.js index fd5a7cdc..e5db21d4 100644 --- a/js/app/map/map.js +++ b/js/app/map/map.js @@ -178,7 +178,7 @@ define([ }) ).append( $('', { - class: ['fa', 'fa-fw', 'fa-circle', config.systemBodyItemStatusClass, statusClass].join(' ') + class: ['fa', 'fa-circle', config.systemBodyItemStatusClass, statusClass].join(' ') }) ).append( $('', { @@ -209,7 +209,7 @@ define([ tooltipOptions.id = systemId; tooltipOptions.highlight = highlight; - tooltipOptions.title = ''; + tooltipOptions.title = ""; tooltipOptions.title += ' ' + userCounter; // show system head @@ -224,13 +224,11 @@ define([ }, complete: function(){ // show system body - system.toggleBody(true, map, {complete: function(){ + system.toggleBody(true, map, {complete: function(system){ // complete callback function // show active user tooltip system.toggleSystemTooltip('show', tooltipOptions); }}); - - } }); } @@ -285,10 +283,8 @@ define([ map.revalidate( systemDomId ); if(callback.complete){ - callback.complete(); + callback.complete(system); } - - } }); }else if(type === false){ @@ -363,6 +359,7 @@ define([ tooltipActive === false && options.id ){ + // init new tooltip tooltipId = config.systemTooltipInnerIdPrefix + options.id; @@ -2971,7 +2968,7 @@ define([ // add "user count" to "total map user count" headerUpdateData.userCount += tempUserData.user.length; - // remove system from "search" array -> speed up + // remove system from "search" array -> speed up loop userData.data.systems.splice(j, 1); } } diff --git a/public/templates/dialog/delete_account.html b/public/templates/dialog/delete_account.html index ff7203b2..ec499625 100644 --- a/public/templates/dialog/delete_account.html +++ b/public/templates/dialog/delete_account.html @@ -61,7 +61,7 @@
- Delete account + Warning This will permanently remove your account!
diff --git a/public/templates/view/landingpage.html b/public/templates/view/landingpage.html index 214980ac..c32dec2c 100644 --- a/public/templates/view/landingpage.html +++ b/public/templates/view/landingpage.html @@ -703,7 +703,7 @@ I wanted to make the easiest to use and most powerful 3rd party system mapper, build with the newest web technology available.

- I am currently working as a professional software developer for one of the larges German web pages. + I am currently working as a professional software developer for one of the largest German web pages. The main focus of my daily work is based on large scale frontend applications.

@@ -845,13 +845,13 @@ Feel free to contact me with your problem, either by submitting a bug report or contact me in game. I´ll give my best to find a solution for your problem or path Pathfinder.

-

I don´t trust you, can i host Pathfinder on my own webserver?

+

I don´t trust you, can I host Pathfinder on my own webserver?

Yes you can! I developed this application for the great community of EVE Online. The program code is open source and can be used by anyone who have the required software skills. Please make sure to keep all 3rd party plugin licence and respect them. At the moment there is no developer guide available. But one the beta phase is finished, i will probably write a short technical documentation. - Do not expect any "out of the boy" install routine at this point. + Do not expect any "out of the box" install routine at this point.
Server requirements: