From 36bf3ea1202b4467230fc4159a9c4b21ea954399 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Mon, 24 Oct 2016 21:28:09 +0200
Subject: [PATCH] - improved system "alias" visibility, closed #362

---
 js/app/map/system.js                       | 8 +++++++-
 js/app/ui/dialog/map_info.js               | 6 ++++++
 public/js/v1.1.7/app/map/system.js         | 8 +++++++-
 public/js/v1.1.7/app/ui/dialog/map_info.js | 6 ++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/js/app/map/system.js b/js/app/map/system.js
index 3a0a6310..fd7dfe8d 100644
--- a/js/app/map/system.js
+++ b/js/app/map/system.js
@@ -86,7 +86,13 @@ define([
         if(validDeleteSystems.length){
             var msg = '';
             if(validDeleteSystems.length === 1){
-                msg = 'Delete system "' + $(validDeleteSystems[0]).data('name') + '" and all its connections?';
+                var deleteSystem = $(validDeleteSystems[0]);
+                var systemName = deleteSystem.data('name');
+                var systemAlias = deleteSystem.getSystemInfo( ['alias'] );
+
+                var systemNameStr = (systemName === systemAlias) ? '"' + systemName + '"' : '"' + systemAlias + '" (' + systemName + ')';
+                systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
+                msg = 'Delete system ' + systemNameStr + ' and all its connections?';
             }else{
                 msg = 'Delete ' + validDeleteSystems.length + ' selected systems and their connections?';
             }
diff --git a/js/app/ui/dialog/map_info.js b/js/app/ui/dialog/map_info.js
index 3816b741..7d82c50b 100644
--- a/js/app/ui/dialog/map_info.js
+++ b/js/app/ui/dialog/map_info.js
@@ -211,6 +211,9 @@ define([
             // name
             tempData.name = tempSystemData.name;
 
+            // alias
+            tempData.alias = (tempSystemData.alias === tempSystemData.name) ? '' : tempSystemData.alias;
+
             // region
             tempData.region = tempSystemData.region.name;
 
@@ -339,6 +342,9 @@ define([
                 },{
                     title: 'system',
                     data: 'name'
+                },{
+                    title: 'alias',
+                    data: 'alias'
                 },{
                     title: 'region',
                     data: 'region'
diff --git a/public/js/v1.1.7/app/map/system.js b/public/js/v1.1.7/app/map/system.js
index 3a0a6310..fd7dfe8d 100644
--- a/public/js/v1.1.7/app/map/system.js
+++ b/public/js/v1.1.7/app/map/system.js
@@ -86,7 +86,13 @@ define([
         if(validDeleteSystems.length){
             var msg = '';
             if(validDeleteSystems.length === 1){
-                msg = 'Delete system "' + $(validDeleteSystems[0]).data('name') + '" and all its connections?';
+                var deleteSystem = $(validDeleteSystems[0]);
+                var systemName = deleteSystem.data('name');
+                var systemAlias = deleteSystem.getSystemInfo( ['alias'] );
+
+                var systemNameStr = (systemName === systemAlias) ? '"' + systemName + '"' : '"' + systemAlias + '" (' + systemName + ')';
+                systemNameStr = '<span class="txt-color txt-color-warning">' + systemNameStr + '</span>';
+                msg = 'Delete system ' + systemNameStr + ' and all its connections?';
             }else{
                 msg = 'Delete ' + validDeleteSystems.length + ' selected systems and their connections?';
             }
diff --git a/public/js/v1.1.7/app/ui/dialog/map_info.js b/public/js/v1.1.7/app/ui/dialog/map_info.js
index 3816b741..7d82c50b 100644
--- a/public/js/v1.1.7/app/ui/dialog/map_info.js
+++ b/public/js/v1.1.7/app/ui/dialog/map_info.js
@@ -211,6 +211,9 @@ define([
             // name
             tempData.name = tempSystemData.name;
 
+            // alias
+            tempData.alias = (tempSystemData.alias === tempSystemData.name) ? '' : tempSystemData.alias;
+
             // region
             tempData.region = tempSystemData.region.name;
 
@@ -339,6 +342,9 @@ define([
                 },{
                     title: 'system',
                     data: 'name'
+                },{
+                    title: 'alias',
+                    data: 'alias'
                 },{
                     title: 'region',
                     data: 'region'