frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Country select list, account info, CLI version + status

Browse Source
This commit is contained in:
billz
2023-10-15 21:26:58 +02:00
parent ab0568875d
commit f535acc18c
3 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
templates/provider.php
View File

@@ -1,12 +1,11 @@
<?php ob_start() ?>
<?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-outline btn-primary" name="SaveProviderConfig" value="Save settings" />
<?php if ($openvpnstatus[0] == 0) {
echo '<input type="submit" class="btn btn-success" name="StartProviderVPN" value="Connect '.$providerName.'" />' , PHP_EOL;
} else {
echo '<input type="submit" class="btn btn-warning" name="StopProviderVPN" value="Disconnect '.$providerName.'" />' , PHP_EOL;
}
?>
<input type="submit" <?php echo $ctlState; ?> class="btn btn-outline btn-primary <?php echo $ctlState; ?>" name="SaveProviderConfig" value="Save settings" />
<?php if ($serviceStatus[0] == 0) : ?>
<input type="submit" <?php echo $ctlState; ?> class="btn btn-success <?php echo $ctlState; ?>" name="StartProviderVPN" value="Connect <?php echo $providerName; ?>" />
<?php else : ?>
<input type="submit" <?php echo $ctlState; ?> class="btn btn-warning <?php echo $ctlState; ?>" name="StopProviderVPN" value="Disconnect <?php echo $providerName; ?>" />
<?php endif; ?>
<?php endif ?>
<?php $buttons = ob_get_clean(); ob_end_clean() ?>
@@ -32,7 +31,7 @@
<?php echo CSRFTokenFieldTag() ?>
<!-- Nav tabs -->
<ul class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" id="clienttab" href="#providerclient" data-toggle="tab"><?php echo _("Client settings"); ?></a></li>
<li class="nav-item"><a class="nav-link active" id="clienttab" href="#providerclient" data-toggle="tab"><?php echo _("Provider settings"); ?></a></li>
<li class="nav-item"><a class="nav-link" id="loggingtab" href="#providerstatus" data-toggle="tab"><?php echo _("Status"); ?></a></li>
</ul>
@@ -50,4 +49,21 @@
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
<!-- modal confirm-logout-->
<div class="modal fade" id="provider-confirm-logout" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<div class="modal-title" id="ModalLabel"><i class="fas fa-sync mr-2"></i><?php echo sprintf(_("Logout %s"), $providerName); ?></div>
</div>
<div class="modal-body">
<div class="col-md-12 mb-3 mt-1" id="system-reboot-message"><?php echo sprintf(_("Logout now? This will disconnect the %s connection."), $providerName); ?></div>
</div>
<div class="modal-footer">
<button type="button" data-message="<?php echo _("Close"); ?>" class="btn btn-outline-secondary" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
<button type="button" id="js-provider-logout" data-action="logout" class="btn btn-outline-danger btn-delete"><?php echo _("Logout"); ?></button>
</div>
</div>
</div>
</div>

36
templates/provider/general.php
View File

@@ -1,17 +1,41 @@
<div class="tab-pane active" id="providerclient">
<h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
<h4 class="mt-3"><?php echo _("VPN provider settings") ;?></h4>
<div class="row">
<div class="col-lg-8">
<div class="row mb-2">
<div class="col-lg-12 mt-2 mb-2">
<div class="row ml-1">
<div class="info-item col-xs-3"><?php echo _("IPv4 Address"); ?></div>
<div class="info-value col-xs-3"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
<div class="info-item col-xs-3">
<i class="fas fa-globe mr-1"></i><?php echo _("IPv4 Address"); ?>
</div>
<div class="info-value col-xs-3">
<?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a>
</div>
</div>
</div>
</div>
</div><!-- col-8 -->
<div class="col-sm-auto"></div>
</div><!-- /.row -->
</div>
</div>
<div class="row">
<div class="col-md-6 mt-1">
<div class="card">
<div class="card-body">
<h5><?php echo _("Account details"); ?></h5>
<?php foreach ($accountInfo as $item) {
echo '<small>'. $item .'</small><br>';
} ?>
<input type="button" class="btn btn-warning mt-2" data-toggle="modal" data-target="#provider-confirm-logout" value="<?php echo _("Logout"); ?>" />
</div><!-- /.card-body -->
</div><!-- /.card -->
</div>
</div>
<div class="row">
<div class="form-group col-md-6 mt-3">
<h5><?php echo _("Server location"); ?></h5>
<label for="cbxhwmode"><?php echo _("Country") ;?></label>
<?php SelectorOptions('countries', $countries, $arrConfig['country'], 'cbxcountry'); ?>
</div>
</div>
</div><!-- /.tab-pane | general tab -->

2
templates/provider/status.php
View File

@@ -1,6 +1,8 @@
<!-- logging tab -->
<div class="tab-pane fade" id="providerstatus">
<h4 class="mt-3 mb-3"><?php echo _("Status") ?></h4>
<p><?php echo _("Installed Linux CLI: <code>".$providerVersion."</code>") ?></p>
<p><?php echo _("Current <code>".strtolower($providerName)."</code> connection status is displayed below.") ?></p>
<div class="row">