frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge pull request #371 from glaszig/ui/layout-fixes

Browse Source 
layout improvements
This commit is contained in:
Bill Zimmerman 2019-08-09 16:34:14 +02:00 committed by GitHub
commit b878e87cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
includes/about.php
View File

@ -14,24 +14,15 @@ function DisplayAbout()
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"><i class="fa fa-info-circle fa-fw"></i> <?php echo _("About RaspAP"); ?></div> <div class="panel-heading"><i class="fa fa-info-circle fa-fw"></i> <?php echo _("About RaspAP"); ?></div>
<div class="panel-body"> <div class="panel-body text-center">
<div class="panel panel-default"> <h3><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h3>
<div class="panel-body"> <h5><a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GNU General Public License v3.0</a></h5>
<div class="row"> <p><img src="img/authors-8bit-200px.png"></p>
<div class="col-lg-6" style="text-align: center"> <p>RaspAP is a co-creation of <a href="https://github.com/billz">@billz</a> and <a href="https://github.com/sirlagz">@SirLagz</a><br />
<h3><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h3> with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">community</a>.</p>
<h5><a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GNU General Public License v3.0</a></h5> <p><i class="fa fa-github fa-fw"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
<p><img src="img/authors-8bit-200px.png"></p>
<p>RaspAP is a co-creation of <a href="https://github.com/billz">@billz</a> and <a href="https://github.com/sirlagz">@SirLagz</a><br />
with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">community</a>.</p>
<p><i class="fa fa-github fa-fw"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
</div><!-- /.col-lg-6 -->
</div><!-- /.row -->
</div><!-- ./panel-body-->
</div><!-- /.panel-default -->
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
<div class="panel-footer"></div> <div class="panel-footer"></div>
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->

2
includes/configure_client.php
View File

@ -181,7 +181,7 @@ function DisplayWPAConfig()
<a href=".?<?php echo htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES); ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update"><?php echo _("Rescan"); ?></a> <a href=".?<?php echo htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES); ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update"><?php echo _("Rescan"); ?></a>
</div> </div>
<form method="POST" action="?page=wpa_conf" name="wpa_conf_form"> <form method="POST" action="?page=wpa_conf" name="wpa_conf_form" class="row">
<?php echo CSRFTokenFieldTag() ?> <?php echo CSRFTokenFieldTag() ?>
<input type="hidden" name="client_settings" ?> <input type="hidden" name="client_settings" ?>
<script> <script>

130
includes/data_usage.php
View File

@ -12,86 +12,82 @@ function DisplayDataUsage(&$extraFooterScripts)
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"><i class="fa fa-bar-chart fa-fw"></i> <?php echo _("Data usage monitoring"); ?></div> <div class="panel-heading"><i class="fa fa-bar-chart fa-fw"></i> <?php echo _("Data usage monitoring"); ?></div>
<div class="panel-body"> <div class="panel-body">
<div class="row">
<div class="col-md-12"> <ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist">
<div class="panel panel-default"> <li role="presentation" class="active"><a href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li>
<div class="panel-body"> <li role="presentation" class=""><a href="#daily" aria-controls="daily" role="tab" data-toggle="tab"><?php echo _("Daily"); ?></a></li>
<ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist"> <li role="presentation" class=""><a href="#monthly" aria-controls="monthly" role="tab" data-toggle="tab"><?php echo _("Monthly"); ?></a></li>
<li role="presentation" class="active"><a href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li> </ul>
<li role="presentation" class=""><a href="#daily" aria-controls="daily" role="tab" data-toggle="tab"><?php echo _("Daily"); ?></a></li>
<li role="presentation" class=""><a href="#monthly" aria-controls="monthly" role="tab" data-toggle="tab"><?php echo _("Monthly"); ?></a></li> <div id="tabsBandwidth" class="tabcontenttraffic tab-content">
</ul> <div role="tabpanel" class="tab-pane active fade in" id="hourly">
<div id="tabsBandwidth" class="tabcontenttraffic tab-content"> <div class="row">
<div role="tabpanel" class="tab-pane active fade in" id="hourly"> <div class="col-lg-12">
<div class="row"> <h4><?php echo _('Hourly traffic amount'); ?></h4>
<div class="col-lg-12"> <label for="cbxInterfacehourly"><?php echo _('interface'); ?></label>
<h4><?php echo _('Hourly traffic amount'); ?></h4> <select id="cbxInterfacehourly" class="form-control" name="interfacehourly">
<label for="cbxInterfacehourly"><?php echo _('interface'); ?></label>
<select id="cbxInterfacehourly" class="form-control" name="interfacehourly">
<?php <?php
foreach ($interfacesWlo as $interface) { foreach ($interfacesWlo as $interface) {
echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' , echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL; htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
} }
?> ?>
</select> </select>
<div class="hidden alert alert-info" id="divLoaderBandwidthhourly"> <div class="hidden alert alert-info" id="divLoaderBandwidthhourly">
<?php echo sprintf(_("Loading %s bandwidth chart"), _('hourly')); ?> <?php echo sprintf(_("Loading %s bandwidth chart"), _('hourly')); ?>
</div> </div>
<div id="divChartBandwidthhourly"></div> <div id="divChartBandwidthhourly"></div>
<div id="divTableBandwidthhourly"></div> <div id="divTableBandwidthhourly"></div>
</div> </div>
</div> </div>
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
<div role="tabpanel" class="tab-pane fade" id="daily"> <div role="tabpanel" class="tab-pane fade" id="daily">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h4><?php echo _('Daily traffic amount'); ?></h4> <h4><?php echo _('Daily traffic amount'); ?></h4>
<label for="cbxInterfacedaily"><?php echo _('interface'); ?></label> <label for="cbxInterfacedaily"><?php echo _('interface'); ?></label>
<select id="cbxInterfacedaily" class="form-control" name="interfacedaily"> <select id="cbxInterfacedaily" class="form-control" name="interfacedaily">
<?php <?php
foreach ($interfacesWlo as $interface) { foreach ($interfacesWlo as $interface) {
echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' , echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL; htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
} }
?> ?>
</select> </select>
<div class="hidden alert alert-info" id="divLoaderBandwidthdaily"> <div class="hidden alert alert-info" id="divLoaderBandwidthdaily">
<?php echo sprintf(_("Loading %s bandwidth chart"), _('daily')); ?> <?php echo sprintf(_("Loading %s bandwidth chart"), _('daily')); ?>
</div> </div>
<div id="divChartBandwidthdaily"></div> <div id="divChartBandwidthdaily"></div>
<div id="divTableBandwidthdaily"></div> <div id="divTableBandwidthdaily"></div>
</div> </div>
</div> </div>
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
<div role="tabpanel" class="tab-pane fade" id="monthly"> <div role="tabpanel" class="tab-pane fade" id="monthly">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h4><?php echo _("Monthly traffic amount"); ?></h4> <h4><?php echo _("Monthly traffic amount"); ?></h4>
<label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label> <label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label>
<select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly"> <select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly">
<?php <?php
foreach ($interfacesWlo as $interface) { foreach ($interfacesWlo as $interface) {
echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' , echo ' <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL; htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
} }
?> ?>
</select> </select>
<div class="hidden alert alert-info" id="divLoaderBandwidthmonthly"> <div class="hidden alert alert-info" id="divLoaderBandwidthmonthly">
<?php echo sprintf(_("Loading %s bandwidth chart"), _('monthly')); ?> <?php echo sprintf(_("Loading %s bandwidth chart"), _('monthly')); ?>
</div> </div>
<div id="divChartBandwidthmonthly"></div> <div id="divChartBandwidthmonthly"></div>
<div id="divTableBandwidthmonthly"></div> <div id="divTableBandwidthmonthly"></div>
</div> </div>
</div> </div>
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
</div><!-- /.tabsBandwidth --> </div><!-- /.tabsBandwidth -->
</div><!-- /.panel-default -->
</div><!-- /.col-md-6 -->
</div><!-- /.row -->
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-primary --> <div class="panel-footer"><?php echo _("Information provided by vnstat"); ?></div>
<div class="panel-footer"><?php echo _("Information provided by vnstat"); ?></div> </div><!-- /.panel-primary -->
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->

4
includes/dhcp.php
View File

@ -220,6 +220,7 @@ foreach ($interfaces as $inet) {
<div class="tab-pane fade in" id="client-list"> <div class="tab-pane fade in" id="client-list">
<h4>Client list</h4> <h4>Client list</h4>
<div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><?php echo _("Active DHCP leases"); ?></div> <div class="panel-heading"><?php echo _("Active DHCP leases"); ?></div>
@ -253,7 +254,8 @@ foreach ($leases as $lease) {
</div><!-- /.table-responsive --> </div><!-- /.table-responsive -->
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel --> </div><!-- /.panel -->
</div><!-- /.col-lg-6 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row -->
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
<div class="tab-pane fade in" id="static-leases"> <div class="tab-pane fade in" id="static-leases">

12
includes/system.php
View File

@ -152,10 +152,6 @@ if (isset($_POST['system_shutdown'])) {
} }
?> ?>
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-body">
<p><?php $status->showMessages(); ?></p> <p><?php $status->showMessages(); ?></p>
<form role="form" action="?page=system_info" method="POST"> <form role="form" action="?page=system_info" method="POST">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
@ -219,14 +215,10 @@ if (isset($_POST['system_shutdown'])) {
</div> </div>
</div> </div>
</div><!-- /.systemtabcontent --> </div><!-- /.systemtabcontent -->
</div><!-- /.panel-default -->
</div><!-- /.col-md-6 -->
</div><!-- /.row -->
</div><!-- /.panel-body -->
</form> </form>
</div><!-- /.panel-primary --> </div><!-- /.panel-body -->
<div class="panel-footer"></div> <div class="panel-footer"></div>
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->

32
includes/themes.php
View File

@ -28,27 +28,19 @@ function DisplayThemeConfig()
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div> <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div>
<div class="panel-body"> <div class="panel-body">
<h4><?php echo _("Theme settings"); ?></h4>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="form-group col-md-6">
<div class="panel panel-default"> <label for="code"><?php echo _("Select a theme"); ?></label>
<div class="panel-body"> <select class="form-control" id="theme-select"><?php echo _("Select a Theme"); ?>
<h4><?php echo _("Theme settings"); ?></h4> <option value="default" class="theme-link"<?php echo $cselected; ?>>RaspAP (default)</option>
<option value="hackernews" class="theme-link"<?php echo $hselected; ?>>HackerNews</option>
<div class="row"> <option value="terminal" class="theme-link"<?php echo $tselected; ?>>Terminal</option>
<div class="form-group col-md-6"> </select>
<label for="code"><?php echo _("Select a theme"); ?></label> </div>
<select class="form-control" id="theme-select"><?php echo _("Select a Theme"); ?> </div>
<option value="default" class="theme-link"<?php echo $cselected; ?>>RaspAP (default)</option>
<option value="hackernews" class="theme-link"<?php echo $hselected; ?>>HackerNews</option>
<option value="terminal" class="theme-link"<?php echo $tselected; ?>>Terminal</option>
</select>
</div>
</div>
</div><!-- /.panel-body -->
</div><!-- /.panel-default -->
</div><!-- /.col-md-6 -->
</div><!-- /.row -->
<form action="?page=system_info" method="POST"> <form action="?page=system_info" method="POST">
<input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" /> <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />