beenull/raspap-webgui-mirror
1
0
Fork 0
mirror of https://github.com/RaspAP/raspap-webgui.git synced 2024-11-25 17:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reorder inputs, QR client.conf WIP

Browse source
This commit is contained in:
billz 2021-03-02 14:18:32 +00:00
parent 0d2f02e3fb
commit cd045a34b8
2 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/wg/general.php
View file

@ -21,7 +21,7 @@
<div class="input-group col-md-12 mb-3"> <div class="input-group col-md-12 mb-3">
<input type="text" class="form-control" name="wg-server" id="wg-srvpubkey" value="<?php echo htmlspecialchars($wg_srvpubkey, ENT_QUOTES); ?>" /> <input type="text" class="form-control" name="wg-server" id="wg-srvpubkey" value="<?php echo htmlspecialchars($wg_srvpubkey, ENT_QUOTES); ?>" />
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-sm btn-outline-secondary rounded-right wg-keygen" type="button"><?php echo _("Generate key"); ?></button> <button class="btn btn-outline-secondary rounded-right wg-keygen" type="button"><i class="fas fa-magic"></i></button>
<span id="wg-server-pubkey-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span> <span id="wg-server-pubkey-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span>
</div> </div>
<input type="hidden" name="wg_srvprivkey" value="" /> <input type="hidden" name="wg_srvprivkey" value="" />

13
templates/wg/peers.php
View file

@ -1,6 +1,5 @@
<!-- wireguard peers tab --> <!-- wireguard peers tab -->
<div class="tab-pane fade" id="wgpeers"> <div class="tab-pane fade" id="wgpeers">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h4 class="mt-3"><?php echo _("Peer"); ?></h4> <h4 class="mt-3"><?php echo _("Peer"); ?></h4>
@ -20,13 +19,12 @@
<div class="input-group col-md-12"> <div class="input-group col-md-12">
<input type="text" class="form-control" name="wg-peer" id="wg-peerpubkey" value="<?php echo htmlspecialchars($wg_peerpubkey, ENT_QUOTES); ?>" /> <input type="text" class="form-control" name="wg-peer" id="wg-peerpubkey" value="<?php echo htmlspecialchars($wg_peerpubkey, ENT_QUOTES); ?>" />
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-sm btn-outline-secondary rounded-right wg-keygen" type="button"><?php echo _("Generate key"); ?></button> <button class="btn btn-outline-secondary rounded-right wg-keygen" type="button"><i class="fas fa-magic"></i></button>
<span id="wg-peer-pubkey-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span> <span id="wg-peer-pubkey-status" class="input-group-addon check-hidden ml-2 mt-1"><i class="fas fa-check"></i></span>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-xs-3 col-sm-6 mt-3"> <div class="form-group col-xs-3 col-sm-6 mt-3">
<label for="code"><?php echo _("Endpoint address"); ?></label> <label for="code"><?php echo _("Endpoint address"); ?></label>
@ -47,8 +45,15 @@
<input type="text" class="form-control col-sm-3 mb-3" name="wg_pkeepalive" placeholder="25" value="<?php echo htmlspecialchars($wg_pkeepalive, ENT_QUOTES); ?>" /> <input type="text" class="form-control col-sm-3 mb-3" name="wg_pkeepalive" placeholder="25" value="<?php echo htmlspecialchars($wg_pkeepalive, ENT_QUOTES); ?>" />
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6 mt-5">
<figure class="figure">
<img src="app/img/wifi-qr-code.php" class="figure-img img-fluid" alt="RaspAP Wifi QR code" style="width:100%;">
<figcaption class="figure-caption"><?php echo _("Scan this QR code with your client to connect to this RaspAP."); ?></figcaption>
</figure>
</div>
</div><!-- /.row --> </div><!-- /.row -->
</div><!-- /.tab-pane | peers tab --> </div><!-- /.tab-pane | peers tab -->