Fix platform text clickable and swap column order

Other minor changes to history tables:
* hidden columns with  smaller screen size
* font colour
This commit is contained in:
JonnyWong16 2015-08-19 19:47:38 -07:00 committed by Jonathan Wong
parent 9fc4573c42
commit 968d213b97
4 changed files with 19 additions and 19 deletions

View file

@ -251,7 +251,7 @@ fieldset[disabled] .btn-bright.active {
background-color: #222222;
}
.modal-body table {
color: #999;
color: #fff;
}
.modal-body li {
margin-top: 7px;

View file

@ -25,8 +25,8 @@
<th align='left' id="delete_row">Delete</th>
<th align='left' id="time">Time</th>
<th align='left' id="friendly_name">User</th>
<th align='left' id="platform">Platform</th>
<th align='left' id="ip_address">IP Address</th>
<th align='left' id="platform">Platform</th>
<th align='left' id="title">Title</th>
<th align='left' id="started">Started</th>
<th align='left' id="paused_counter">Paused</th>

View file

@ -59,17 +59,7 @@ history_table_options = {
},
{
"targets": [3],
"data":"player",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
$(td).html('<a href="#" data-target="#info-modal" data-toggle="modal"><i class="fa fa-lg fa-info-circle"></i></a>&nbsp'+cellData);
}
},
"className": "modal-control no-wrap hidden-sm hidden-xs"
},
{
"targets": [4],
"data":"ip_address",
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (isPrivateIP(cellData)) {
@ -79,13 +69,23 @@ history_table_options = {
$(td).html('n/a');
}
} else {
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><i class="fa fa-map-marker"></i>&nbsp' + cellData +'</a>');
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><i class="fa fa-map-marker"></i>&nbsp' + cellData + '</a>');
}
} else {
$(td).html('n/a');
}
},
"className": "no-wrap hidden-xs modal-control-ip"
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip"
},
{
"targets": [4],
"data":"player",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
$(td).html('<a href="#" data-target="#info-modal" data-toggle="modal"><i class="fa fa-lg fa-info-circle"></i>&nbsp' + cellData + '</a>');
}
},
"className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
},
{
"targets": [5],
@ -130,7 +130,7 @@ history_table_options = {
}
},
"searchable": false,
"className": "no-wrap hidden-xs"
"className": "no-wrap hidden-md hidden-sm hidden-xs"
},
{
"targets": [8],
@ -143,7 +143,7 @@ history_table_options = {
}
},
"searchable": false,
"className": "no-wrap hidden-md hidden-xs"
"className": "no-wrap hidden-sm hidden-xs"
},
{
"targets": [9],
@ -172,7 +172,7 @@ history_table_options = {
},
"searchable": false,
"orderable": false,
"className": "no-wrap hidden-md hidden-xs",
"className": "no-wrap hidden-md hidden-sm hidden-xs",
"width": "10px"
},
{

View file

@ -74,7 +74,7 @@ history_table_modal_options = {
{
"targets": [3],
"data":"player",
"className": "modal-control no-wrap hidden-sm hidden-xs"
"className": "no-wrap hidden-sm hidden-xs modal-control"
},
{
"targets": [4],