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

- improved "map information" table, new column "ship name", closed #487

Browse Source
This commit is contained in:
Exodus4D
2017-05-06 14:16:00 +02:00
parent e7c4735a55
commit 1252964190
9 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,10 +32,6 @@ define([
tableActionCellClass: 'pf-table-action-cell', // class for table "action" cells
tableActionCellIconClass: 'pf-table-action-icon-cell', // class for table "action" icon (icon is part of cell content)
tableCellEllipsisClass: 'pf-table-cell-ellipsis',
tableCellEllipsis80Class: 'pf-table-cell-80',
tableCellEllipsis90Class: 'pf-table-cell-90',
// toolbar
toolbarClass: 'pf-map-overlay-toolbar', // class for toolbar - content
toolbarIconClass: 'pf-map-overlay-toolbar-icon', // class for toolbar icon
@@ -443,7 +439,7 @@ define([
_: function(data, type, row, meta){
let value = data.name;
if(type === 'display'){
value = '<div class="' + config.tableCellEllipsisClass + ' ' + config.tableCellEllipsis80Class + '">' + data.name + '</div>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis80Class + '">' + data.name + '</div>';
}
return value;
},
@@ -458,7 +454,7 @@ define([
_: function(data, type, row, meta){
let value = data;
if(type === 'display'){
value = '<div class="' + config.tableCellEllipsisClass + ' ' + config.tableCellEllipsis90Class + '">' + data + '</div>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis90Class + '">' + data + '</div>';
}
return value;
}

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

@@ -24,7 +24,13 @@ define([
systemIdPrefix: 'pf-system-', // id prefix for a system
systemClass: 'pf-system', // class for all systems
systemSelectedClass: 'pf-system-selected' // class for selected systems in a map
systemSelectedClass: 'pf-system-selected', // class for selected systems in a map
// dataTable
tableCellEllipsisClass: 'pf-table-cell-ellipsis',
tableCellEllipsis80Class: 'pf-table-cell-80',
tableCellEllipsis90Class: 'pf-table-cell-90',
tableCellEllipsis100Class: 'pf-table-cell-100'
};
// map menu options

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

@@ -701,32 +701,32 @@ define([
width: '26px',
orderable: false,
searchable: false,
className: ['text-center', config.tableImageCellClass].join(' '),
className: ['pf-help-default', 'text-center', config.tableImageCellClass].join(' '),
data: 'log.ship',
render: {
_: function(data, type, row, meta){
let value = data;
if(type === 'display'){
value = '<img src="' + Init.url.ccpImageServer + 'Render/' + value.typeId + '_32.png" />';
value = '<img src="' + Init.url.ccpImageServer + 'Render/' + value.typeId + '_32.png" title="' + value.typeName + '" data-toggle="tooltip" />';
}
return value;
}
}
},{
targets: 2,
title: 'ship',
title: 'ship name',
width: '100px',
orderable: true,
searchable: true,
data: 'log.ship',
render: {
_: function(data, type, row){
let value = data;
let value = data.name;
if(type === 'display'){
value = data.typeName + '&nbsp;<i class="fa fa-fw fa-question-circle pf-help" title="' + value.name + '" data-toggle="tooltip"></i>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis100Class + '">' + data.name + '</div>';
}
return value;
},
sort: 'typeName'
}
}
},{
targets: 3,

2
public/css/pathfinder.css
View File

File diff suppressed because one or more lines are too long

8
public/js/v1.2.3/app/map/local.js
View File

@@ -32,10 +32,6 @@ define([
tableActionCellClass: 'pf-table-action-cell', // class for table "action" cells
tableActionCellIconClass: 'pf-table-action-icon-cell', // class for table "action" icon (icon is part of cell content)
tableCellEllipsisClass: 'pf-table-cell-ellipsis',
tableCellEllipsis80Class: 'pf-table-cell-80',
tableCellEllipsis90Class: 'pf-table-cell-90',
// toolbar
toolbarClass: 'pf-map-overlay-toolbar', // class for toolbar - content
toolbarIconClass: 'pf-map-overlay-toolbar-icon', // class for toolbar icon
@@ -443,7 +439,7 @@ define([
_: function(data, type, row, meta){
let value = data.name;
if(type === 'display'){
value = '<div class="' + config.tableCellEllipsisClass + ' ' + config.tableCellEllipsis80Class + '">' + data.name + '</div>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis80Class + '">' + data.name + '</div>';
}
return value;
},
@@ -458,7 +454,7 @@ define([
_: function(data, type, row, meta){
let value = data;
if(type === 'display'){
value = '<div class="' + config.tableCellEllipsisClass + ' ' + config.tableCellEllipsis90Class + '">' + data + '</div>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis90Class + '">' + data + '</div>';
}
return value;
}

8
public/js/v1.2.3/app/map/util.js
View File

@@ -24,7 +24,13 @@ define([
systemIdPrefix: 'pf-system-', // id prefix for a system
systemClass: 'pf-system', // class for all systems
systemSelectedClass: 'pf-system-selected' // class for selected systems in a map
systemSelectedClass: 'pf-system-selected', // class for selected systems in a map
// dataTable
tableCellEllipsisClass: 'pf-table-cell-ellipsis',
tableCellEllipsis80Class: 'pf-table-cell-80',
tableCellEllipsis90Class: 'pf-table-cell-90',
tableCellEllipsis100Class: 'pf-table-cell-100'
};
// map menu options

14
public/js/v1.2.3/app/ui/dialog/map_info.js
View File

@@ -701,32 +701,32 @@ define([
width: '26px',
orderable: false,
searchable: false,
className: ['text-center', config.tableImageCellClass].join(' '),
className: ['pf-help-default', 'text-center', config.tableImageCellClass].join(' '),
data: 'log.ship',
render: {
_: function(data, type, row, meta){
let value = data;
if(type === 'display'){
value = '<img src="' + Init.url.ccpImageServer + 'Render/' + value.typeId + '_32.png" />';
value = '<img src="' + Init.url.ccpImageServer + 'Render/' + value.typeId + '_32.png" title="' + value.typeName + '" data-toggle="tooltip" />';
}
return value;
}
}
},{
targets: 2,
title: 'ship',
title: 'ship name',
width: '100px',
orderable: true,
searchable: true,
data: 'log.ship',
render: {
_: function(data, type, row){
let value = data;
let value = data.name;
if(type === 'display'){
value = data.typeName + '&nbsp;<i class="fa fa-fw fa-question-circle pf-help" title="' + value.name + '" data-toggle="tooltip"></i>';
value = '<div class="' + MapUtil.config.tableCellEllipsisClass + ' ' + MapUtil.config.tableCellEllipsis100Class + '">' + data.name + '</div>';
}
return value;
},
sort: 'typeName'
}
}
},{
targets: 3,

19
sass/layout/_main.scss
View File

@@ -267,6 +267,25 @@ select:active, select:hover {
font-size: 10px;
}
}
.pf-table-cell-ellipsis{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.pf-table-cell-80{
width: 90px;
}
.pf-table-cell-90{
width: 100px;
}
.pf-table-cell-100{
width: 110px;
}
}
// column separator

14
sass/layout/_map.scss
View File

@@ -148,20 +148,6 @@ $mapWidth: 2500px ;
td {
white-space: nowrap;
.pf-table-cell-ellipsis{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.pf-table-cell-80{
width: 90px; // 100 + padding for "order" icons
}
.pf-table-cell-90{
width: 100px; // 100 + padding for "order" icons
}
}
}