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

Updating layout of webconsole page

Browse Source
This commit is contained in:
Lawrence
2017-10-21 20:30:15 +08:00
parent f18b5785c8
commit 241e3ddff9
1 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
includes/system.php
View File

@@ -81,13 +81,6 @@ function DisplaySystem(){
elseif ($cpuload > 0) { $cpuload_status = "success"; } elseif ($cpuload > 0) { $cpuload_status = "success"; }
?> ?>
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab">System</a></li>
<li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab">Console</a></li>
</ul>
<div class="systemtabcontent tab-content">
<div role="tabpanel" class="tab-pane active" id="system">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
@@ -106,48 +99,65 @@ function DisplaySystem(){
?> ?>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h4>System Information</h4> <ul class="nav nav-tabs" role="tablist">
<div class="info-item">Hostname</div> <?php echo $hostname ?></br> <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab">System</a></li>
<div class="info-item">Pi Revision</div> <?php echo RPiVersion() ?></br> <li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab">Console</a></li>
<div class="info-item">Uptime</div> <?php echo $uptime ?></br></br> </ul>
<div class="info-item">Memory Used</div>
<div class="progress"> <div class="systemtabcontent tab-content">
<div class="progress-bar progress-bar-<?php echo $memused_status ?> progress-bar-striped active" <div role="tabpanel" class="tab-pane active" id="system">
role="progressbar" <div class="row">
aria-valuenow="<?php echo $memused ?>" aria-valuemin="0" aria-valuemax="100" <div class="col-lg-6">
style="width: <?php echo $memused ?>%;"><?php echo $memused ?>% <h4>System Information</h4>
</div> <div class="info-item">Hostname</div> <?php echo $hostname ?></br>
</div> <div class="info-item">Pi Revision</div> <?php echo RPiVersion() ?></br>
<div class="info-item">CPU Load</div> <div class="info-item">Uptime</div> <?php echo $uptime ?></br></br>
<div class="progress"> <div class="info-item">Memory Used</div>
<div class="progress-bar progress-bar-<?php echo $cpuload_status ?> progress-bar-striped active" <div class="progress">
role="progressbar" <div class="progress-bar progress-bar-<?php echo $memused_status ?> progress-bar-striped active"
aria-valuenow="<?php echo $cpuload ?>" aria-valuemin="0" aria-valuemax="100" role="progressbar"
style="width: <?php echo $cpuload ?>%;"><?php echo $cpuload ?>% aria-valuenow="<?php echo $memused ?>" aria-valuemin="0" aria-valuemax="100"
</div> style="width: <?php echo $memused ?>%;"><?php echo $memused ?>%
</div>
</div>
<div class="info-item">CPU Load</div>
<div class="progress">
<div class="progress-bar progress-bar-<?php echo $cpuload_status ?> progress-bar-striped active"
role="progressbar"
aria-valuenow="<?php echo $cpuload ?>" aria-valuemin="0" aria-valuemax="100"
style="width: <?php echo $cpuload ?>%;"><?php echo $cpuload ?>%
</div>
</div>
<form action="?page=system_info" method="POST">
<input type="submit" class="btn btn-warning" name="system_reboot" value="Reboot" />
<input type="submit" class="btn btn-warning" name="system_shutdown" value="Shutdown" />
<input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
</form>
</div>
</div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="console">
<iframe src="includes/webconsole.php" class="webconsole"></iframe>
</div>
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-default --> </div><!-- /.panel-default -->
</div><!-- /.col-md-6 --> </div><!-- /.col-md-6 -->
</div><!-- /.row --> </div><!-- /.row -->
<form action="?page=system_info" method="POST">
<input type="submit" class="btn btn-warning" name="system_reboot" value="Reboot" />
<input type="submit" class="btn btn-warning" name="system_shutdown" value="Shutdown" />
<input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
</form>
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
</div>
<div role="tabpanel" class="tab-pane" id="console">
<iframe src="includes/webconsole.php" class="webconsole"></iframe>
</div> </div>
</div> </div>
<?php <?php