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

- fixed upcoming CREST changes. They are already on SISI ...

Browse Source
This commit is contained in:
Exodus4D
2016-06-06 19:21:49 +02:00
parent b071979b0d
commit c18f682a5a
6 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/controller/ccp/sso.php
View File

@@ -800,13 +800,12 @@ class Sso extends Api\User{
$endpoint = $this->walkEndpoint($endpoints, '', ['serviceStatus']);
if( !empty($endpoint) ){
$data->crestOffline = false;
$data->serviceStatus = (new Mapper\CrestServiceStatus($endpoint))->getData();
$data->serviceStatus = (string) $endpoint;
}
$endpoint = $this->walkEndpoint($endpoints, '', ['userCounts']);
$endpoint = $this->walkEndpoint($endpoints, '', ['userCount_str']);
if( !empty($endpoint) ){
$data->crestOffline = false;
$data->userCounts = (new Mapper\CrestUserCounts($endpoint))->getData();
$data->userCounts = (string) $endpoint;
}
return $data;
}

19
app/main/data/mapper/crestservicestatus.php
View File

@@ -1,19 +0,0 @@
<?php
/**
* Created by PhpStorm.
* User: Exodus
* Date: 01.05.2016
* Time: 19:17
*/
namespace Data\Mapper;
class CrestServiceStatus extends AbstractIterator {
protected static $map = [
'dust' => 'dust',
'eve' => 'eve',
'server' => 'server'
];
}

18
app/main/data/mapper/crestusercounts.php
View File

@@ -1,18 +0,0 @@
<?php
/**
* Created by PhpStorm.
* User: Exodus
* Date: 01.05.2016
* Time: 19:42
*/
namespace Data\Mapper;
class CrestUserCounts extends AbstractIterator {
protected static $map = [
'dust' => 'dust',
'eve' => 'eve'
];
}

7
js/app/login.js
View File

@@ -486,12 +486,15 @@ define([
data.serverPanelId = config.serverPanelId;
var statusClass = '';
switch(data.serviceStatus.eve.toLowerCase()){
switch(data.serviceStatus.toLowerCase()){
case 'online': statusClass = 'txt-color-green'; break;
case 'vip': statusClass = 'txt-color-orange'; break;
case 'offline': statusClass = 'txt-color-redDarker'; break;
}
data.serviceStatus.style = statusClass;
data.serviceStatus = {
eve: data.serviceStatus,
style: statusClass
};
requirejs(['text!templates/ui/server_panel.html', 'mustache'], function(template, Mustache) {
var content = Mustache.render(template, data);

7
public/js/v1.0.1/app/login.js
View File

@@ -486,12 +486,15 @@ define([
data.serverPanelId = config.serverPanelId;
var statusClass = '';
switch(data.serviceStatus.eve.toLowerCase()){
switch(data.serviceStatus.toLowerCase()){
case 'online': statusClass = 'txt-color-green'; break;
case 'vip': statusClass = 'txt-color-orange'; break;
case 'offline': statusClass = 'txt-color-redDarker'; break;
}
data.serviceStatus.style = statusClass;
data.serviceStatus = {
eve: data.serviceStatus,
style: statusClass
};
requirejs(['text!templates/ui/server_panel.html', 'mustache'], function(template, Mustache) {
var content = Mustache.render(template, data);

2
public/templates/ui/server_panel.html
View File

@@ -5,7 +5,7 @@
<li><i class="fa-li fa fa-server " aria-hidden="true"></i><span class="txt-color {{ style }}">{{ eve }}</span></li>
{{/serviceStatus}}
{{#userCounts}}
<li><i class="fa-li fa fa-users" aria-hidden="true"></i>{{ eve }}</li>
<li><i class="fa-li fa fa-users" aria-hidden="true"></i>{{ userCounts }}</li>
{{/userCounts}}
</ul>
</div>