Merge pull request #1 from dg9vh/master

Show active network with green button
This commit is contained in:
Mario , DC7JZB 2017-07-27 09:38:44 +02:00 committed by GitHub
commit fc53efe7f6
3 changed files with 37 additions and 11 deletions

View file

@ -4,4 +4,17 @@
.panel-heading span {
font-size: 15px;
}
}
.btn-active {
text-shadow: 0 1px 0 #fff;
background-image: -webkit-linear-gradient(top,#fff 0,#3c763d 100%);
background-image: -o-linear-gradient(top,#fff 0,#3c763d 100%);
background-image: -webkit-gradient(linear,left top,left bottom,from(#fff),to(##3c763d));
background-image: linear-gradient(to bottom,#fff 0,#3c763d 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ff3c763d', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
background-repeat: repeat-x;
border-color: #dbdbdb;
border-color: #ccc;
}

View file

@ -30,12 +30,6 @@ include "version.php";
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=0.6,maximum-scale=1, user-scalable=yes">
<!-- Default-CSS -->
<link rel="stylesheet" href="css/style.css">
<!-- CSS for tooltip display -->
<link rel="stylesheet" href="css/tooltip.css">
<!-- CSS for monospaced fonts in tables -->
<link rel="stylesheet" href="css/monospacetables.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<!-- Das neueste kompilierte und minimierte CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css">
@ -45,6 +39,12 @@ include "version.php";
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/latest/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.13/css/jquery.dataTables.min.css">
<script type="text/javascript" src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
<!-- Default-CSS -->
<link rel="stylesheet" href="css/style.css">
<!-- CSS for tooltip display -->
<link rel="stylesheet" href="css/tooltip.css">
<!-- CSS for monospaced fonts in tables -->
<link rel="stylesheet" href="css/monospacetables.css">
<style>
.nowrap {
white-space:nowrap
@ -124,13 +124,26 @@ if (defined("ENABLENETWORKSWITCHING")) {
if (defined("JSONNETWORK")) {
echo ' <br>';
foreach ($networks as $network) {
echo ' <button onclick="window.location.href=\'./scripts/switchnetwork.php?network='.$network['ini'].'\'" type="button" class="btn btn-default navbar-btn"><span class="glyphicon glyphicon-link" aria-hidden="true"></span>&nbsp;'.$network['label'].'</button>';
echo ' <button onclick="window.location.href=\'./scripts/switchnetwork.php?network='.$network['ini'].'\'" type="button" ';
if (getDMRNetwork() == $network['label'] )
echo 'class="btn btn-active navbar-btn">';
else
echo 'class="btn btn-default navbar-btn">';
echo '<span class="glyphicon glyphicon-link" aria-hidden="true"></span>&nbsp;'.$network['label'].'</button>';
}
} else {
?>
<button onclick="window.location.href='./scripts/switchnetwork.php?network=DMRPLUS'" type="button" class="btn btn-default navbar-btn"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;<?php echo _("DMRplus"); ?></button>
<button onclick="window.location.href='./scripts/switchnetwork.php?network=BRANDMEISTER'" type="button" class="btn btn-default navbar-btn"><span class="glyphicon glyphicon-fire" aria-hidden="true"></span>&nbsp;<?php echo _("BrandMeister"); ?></button>
<button onclick="window.location.href='./scripts/switchnetwork.php?network=DMRPLUS'" type="button" <?php
if (getDMRNetwork() == "DMRplus" )
echo 'class="btn btn-active navbar-btn">';
else
echo 'class="btn btn-default navbar-btn">'; ?><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp;<?php echo _("DMRplus"); ?></button>
<button onclick="window.location.href='./scripts/switchnetwork.php?network=BRANDMEISTER'" type="button" <?php
if (getDMRNetwork() == "BrandMeister" )
echo 'class="btn btn-active navbar-btn">';
else
echo 'class="btn btn-default navbar-btn">'; ?><span class="glyphicon glyphicon-fire" aria-hidden="true"></span>&nbsp;<?php echo _("BrandMeister"); ?></button>
<?php
}
if (defined("ENABLEREFLECTORSWITCHING") && (getEnabled("DMR Network", $mmdvmconfigs) == 1) && recursive_array_search(gethostbyname(getConfigItem("DMR Network", "Address", $mmdvmconfigs)),getDMRplusDMRMasterList()) ) {

View file

@ -1,3 +1,3 @@
<?php
define("VERSION", "20170714-1 (".getGitVersion().")");
define("VERSION", "20170726-1 (".getGitVersion().")");
?>