dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved system "alias" visibility, closed #362

Browse Source
This commit is contained in:
Exodus4D
2016-10-24 21:28:09 +02:00
parent 22e8d54be4
commit 36bf3ea120
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/app/map/system.js
View File

@@ -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?';
}

6
js/app/ui/dialog/map_info.js
View File

@@ -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'

8
public/js/v1.1.7/app/map/system.js
View File

@@ -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?';
}

6
public/js/v1.1.7/app/ui/dialog/map_info.js
View File

@@ -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'