mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add status to server list

This commit is contained in:
Björn Schießle 2015-11-18 13:38:03 +01:00
parent 97c60fd217
commit 8f55b1a27d
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/federation/css/settings-admin.css
View File

@ -19,6 +19,8 @@
#listOfTrustedServers li:hover {
cursor: pointer;
background: url(../../../core/img/actions/delete.svg) no-repeat left center;
padding-left: 20px;
}
#listOfTrustedServers .status {
margin-right: 10px;
}

5
apps/federation/js/settings-admin.js
View File

@ -40,7 +40,10 @@ $(document).ready(function () {
).done(function (data) {
$('#serverUrl').attr('value', '');
$('ul#listOfTrustedServers').prepend(
$('<li>').attr('id', data.id).text(data.url)
$('<li>')
.attr('id', data.id)
.attr('class', 'icon-delete')
.html('<span class="status indeterminate"></span>' + data.url)
);
OC.msg.finishedSuccess('#ocFederationAddServer .msg', data.message);
})

2
apps/federation/lib/dbhandler.php
View File

@ -110,7 +110,7 @@ class DbHandler {
*/
public function getAllServer() {
$query = $this->connection->getQueryBuilder();
$query->select('url', 'id')->from($this->dbTable);
$query->select('url', 'id', 'status')->from($this->dbTable);
$result = $query->execute()->fetchAll();
return $result;
}

11
apps/federation/templates/settings-admin.php
View File

@ -1,5 +1,7 @@
<?php
/** @var array $_ */
use OCA\Federation\TrustedServers;
/** @var OC_L10N $l */
script('federation', 'settings-admin');
style('federation', 'settings-admin')
@ -21,7 +23,14 @@ style('federation', 'settings-admin')
</p>
<ul id="listOfTrustedServers">
<?php foreach($_['trustedServers'] as $trustedServer) { ?>
<li id="<?php p($trustedServer['id']); ?>">
<li id="<?php p($trustedServer['id']); ?>" class="icon-delete">
<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
<span class="status success"></span>
<?php } elseif((int)$trustedServer['status'] === TrustedServers::STATUS_PENDING) { ?>
<span class="status indeterminate"></span>
<?php } else {?>
<span class="status error"></span>
<?php } ?>
<?php p($trustedServer['url']); ?>
</li>
<?php } ?>