Merge branch 'master' of https://github.com/dg9vh/MMDVMHost-Dashboard
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
parent
677bac73ff
commit
ad39b44c0c
14 changed files with 45 additions and 4 deletions
|
@ -850,8 +850,12 @@ function decodeAlias($logLine) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getGitVersion(){
|
function getGitVersion(){
|
||||||
|
if (file_exists(".git")) {
|
||||||
exec("git rev-parse HEAD", $output);
|
exec("git rev-parse HEAD", $output);
|
||||||
return 'GitID #<a href="https://github.com/dg9vh/MMDVMHost-Dashboard/commit/'.substr($output[0],0,7).'">'.substr($output[0],0,7).'</a>';
|
return 'GitID #<a href="https://github.com/dg9vh/MMDVMHost-Dashboard/commit/'.substr($output[0],0,7).'">'.substr($output[0],0,7).'</a>';
|
||||||
|
} else {
|
||||||
|
return 'GitID unknown';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getDMRReflectors($network) {
|
function getDMRReflectors($network) {
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
$totalLH = count($lastHeard);
|
$totalLH = count($lastHeard);
|
||||||
|
$TMP_CALL_NAME = "/tmp/Callsign_Name.txt";
|
||||||
|
exec("wc -l ".$TMP_CALL_NAME." | cut -f1 -d' '", $output);
|
||||||
|
exec("wc -l ".DMRIDDATPATH." | cut -f1 -d' '", $output2);
|
||||||
?>
|
?>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<!-- Standard-Panel-Inhalt -->
|
<!-- Standard-Panel-Inhalt -->
|
||||||
<div class="panel-heading"><?php echo _("Last Heard List of today's")." ".$totalLH." "._("callsigns."); ?><span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
|
<div class="panel-heading"><?php echo _("Last Heard List of today's")." ".$totalLH." "._("callsigns.")." "._("Cached")." (".$output[0]."/".$output2[0].")"; ?><span class="pull-right clickable"><i class="glyphicon glyphicon-chevron-up"></i></span></div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<!-- Tabelle -->
|
<!-- Tabelle -->
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
|
|
@ -728,3 +728,7 @@ msgstr ""
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr ""
|
||||||
|
|
Binary file not shown.
|
@ -725,3 +725,8 @@ msgstr "Konfiguration"
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr "Nutze networks.php statt d. Konfig. unten"
|
msgstr "Nutze networks.php statt d. Konfig. unten"
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr "Zwischengespeichert"
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -725,3 +725,8 @@ msgstr ""
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -740,3 +740,8 @@ msgstr ""
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr "En caché"
|
||||||
|
|
||||||
|
|
|
@ -732,3 +732,8 @@ msgstr ""
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -704,3 +704,8 @@ msgstr "Конфигурация"
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr "Использовать данные из файла networks.php вместо кофигурации ниже"
|
msgstr "Использовать данные из файла networks.php вместо кофигурации ниже"
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr "Кэширование"
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -729,3 +729,8 @@ msgstr ""
|
||||||
#: setup.php:209
|
#: setup.php:209
|
||||||
msgid "Use networks.php instead of configuration below"
|
msgid "Use networks.php instead of configuration below"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: include/lh_ajax.php:6
|
||||||
|
msgid "Cached"
|
||||||
|
msgstr "Cachad"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue