Merge pull request #119 from SirLagz/master

Added a Web Console

dist/css/custom.css

@@ -33,3 +33,17 @@
 	width: 140px;
 	float: left;
 }
+
+.webconsole {
+	width:100%;
+	height:100%;
+}
+
+#console {
+	height:500px;
+}
+
+.systemtabcontent {
+	height:100%;
+        min-height:500px;
+}

includes/system.php

@@ -99,44 +99,67 @@ function DisplaySystem(){
     ?>
 
     <div class="row">
-    <div class="col-md-6">
+    <div class="col-md-12">
     <div class="panel panel-default">
     <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 role="tabpanel" class="tab-pane" id="console">
+      <iframe src="includes/webconsole.php" class="webconsole"></iframe>
+      </div>
+
+
+
     </div><!-- /.panel-body -->
     </div><!-- /.panel-default -->
     </div><!-- /.col-md-6 -->
     </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-primary -->
   </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
+
+
+
+
+      </div>
+  </div>
   <?php
 }
 ?>

index.php

@@ -13,7 +13,7 @@
  * @author     Lawrence Yau <sirlagz@gmail.com>
  * @author     Bill Zimmerman <billzimmerman@gmail.com>
  * @license    GNU General Public License, version 3 (GPL-3.0)
- * @version    1.2.1
+ * @version    1.2.2
  * @link       https://github.com/billz/raspap-webgui
  * @see        http://sirlagz.net/2013/02/08/raspap-webgui/
  */
@@ -127,7 +127,7 @@ $theme_url = 'dist/css/' . $theme;
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.2.1</a>
+          <a class="navbar-brand" href="index.php">RaspAP Wifi Portal v1.2.2</a>
         </div>
         <!-- /.navbar-header -->
 
@@ -145,7 +145,7 @@ $theme_url = 'dist/css/' . $theme;
                 <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</a>
               </li>
               <li>
-                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP</a>
+                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> Configure DHCP Server</a>
               </li>
               <?php if ( RASPI_OPENVPN_ENABLED ) : ?>
               <li>