From caa4a4f53280162eda6237f0de6586c861a0f027 Mon Sep 17 00:00:00 2001 From: Brian Flowers Date: Wed, 2 Nov 2016 20:22:06 -0400 Subject: [PATCH] Moved graphs into a separate page included as a frame in index.php --- graph.php | 2 +- index.html | 368 ------------------------------------------------------------- index.php | 63 +---------- style.css | 72 ------------ styles.css | 6 + 5 files changed, 9 insertions(+), 502 deletions(-) delete mode 100644 index.html delete mode 100644 style.css diff --git a/graph.php b/graph.php index d930b49..4f513d7 100644 --- a/graph.php +++ b/graph.php @@ -60,11 +60,11 @@ if( !in_array($host, $hosts) ) "ORDER BY timestamp DESC LIMIT 100"; $result = $db_handle->query($query); - echo " context.beginPath();\n"; echo " context.strokeStyle = '$colors[$i]';\n"; $record = $result->fetchArray(SQLITE3_ASSOC); $final = $record['timestamp']; echo " context.moveTo(0, ".sprintf("%d", $record['value']).");\n"; + echo " context.beginPath();\n"; while( $record = $result->fetchArray(SQLITE3_ASSOC) ) { echo " context.lineTo(".sprintf("%d", $final - $record['timestamp']).", ".(400-$record['value']*4).");\n"; diff --git a/index.html b/index.html deleted file mode 100644 index 766401d..0000000 --- a/index.html +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - Apache2 Debian Default Page: It works - - - -
-
- Debian Logo - - Apache2 Debian Default Page - -
- -
- - -
-
- It works! -
-
-

- This is the default welcome page used to test the correct - operation of the Apache2 server after installation on Debian systems. - If you can read this page, it means that the Apache HTTP server installed at - this site is working properly. You should replace this file (located at - /var/www/html/index.html) before continuing to operate your HTTP server. -

- - -

- If you are a normal user of this web site and don't know what this page is - about, this probably means that the site is currently unavailable due to - maintenance. - If the problem persists, please contact the site's administrator. -

- -
-
-
- Configuration Overview -
-
-

- Debian's Apache2 default configuration is different from the - upstream default configuration, and split into several files optimized for - interaction with Debian tools. The configuration system is - fully documented in - /usr/share/doc/apache2/README.Debian.gz. Refer to this for the full - documentation. Documentation for the web server itself can be - found by accessing the manual if the apache2-doc - package was installed on this server. - -

-

- The configuration layout for an Apache2 web server installation on Debian systems is as follows: -

- 
-/etc/apache2/
-|-- apache2.conf
-|       `--  ports.conf
-|-- mods-enabled
-|       |-- *.load
-|       `-- *.conf
-|-- conf-enabled
-|       `-- *.conf
-|-- sites-enabled
-|       `-- *.conf
-
-
    -
  • - apache2.conf is the main configuration - file. It puts the pieces together by including all remaining configuration - files when starting up the web server. -
    • - -
  • - ports.conf is always included from the - main configuration file. It is used to determine the listening ports for - incoming connections, and this file can be customized anytime. -
    • - -
  • - Configuration files in the mods-enabled/, - conf-enabled/ and sites-enabled/ directories contain - particular configuration snippets which manage modules, global configuration - fragments, or virtual host configurations, respectively. -
    • - -
  • - They are activated by symlinking available - configuration files from their respective - *-available/ counterparts. These should be managed - by using our helpers - - a2enmod, - a2dismod, - - - a2ensite, - a2dissite, - - and - - a2enconf, - a2disconf - . See their respective man pages for detailed information. -
    • - -
  • - The binary is called apache2. Due to the use of - environment variables, in the default configuration, apache2 needs to be - started/stopped with /etc/init.d/apache2 or apache2ctl. - Calling /usr/bin/apache2 directly will not work with the - default configuration. -
    • -
-
- -
-
- Document Roots -
- -
-

- By default, Debian does not allow access through the web browser to - any file apart of those located in /var/www, - public_html - directories (when enabled) and /usr/share (for web - applications). If your site is using a web document root - located elsewhere (such as in /srv) you may need to whitelist your - document root directory in /etc/apache2/apache2.conf. -

-

- The default Debian document root is /var/www/html. You - can make your own virtual hosts under /var/www. This is different - to previous releases which provides better security out of the box. -

-
- -
-
- Reporting Problems -
-
-

- Please use the reportbug tool to report bugs in the - Apache2 package with Debian. However, check existing bug reports before reporting a new bug. -

-

- Please report bugs specific to modules (such as PHP and others) - to respective packages, not to the web server itself. -

-
- - - - -
-
-
-
- - - diff --git a/index.php b/index.php index 13e40b6..25b9b0b 100755 --- a/index.php +++ b/index.php @@ -25,67 +25,8 @@ while($host = $result->fetchArray(SQLITE3_ASSOC)) foreach ($hosts as $host) { -?> - - -"; } ?> diff --git a/style.css b/style.css deleted file mode 100644 index 265041d..0000000 --- a/style.css +++ /dev/null @@ -1,72 +0,0 @@ -#vmenu -{ - position: absolute; - left: 0px; - top: 0px; - height: 100%; - width: 15%; - background: linear-gradient(to right, #000 0%,#222 80%,#555 100%); - padding-top: 5em; -} - -#vmenu a -{ - display: inline-block; - color: white; - font-weight: bold; - text-decoration: none; - width: 100%; - text-align: center; - border-top: 1px solid white; - padding: .5em .2em; - font-size: larger; -} - -#charts -{ - display: block; - position: absolute; - top: 0px; - left: 15%; - width: 75%; - height: 100%; - padding: 1em; -} - -.chart -{ - display: inline-block; - border: 1px solid black; - width: 400px; - height: 400px; -} - -options -{ - display: block; - position: absolute; - top: 0px; - left: 15%; - width: 85%; - height: 100%; -} - -.short -{ - width: 3em; -} - -tr -{ - text-align: center; -} - -th -{ - padding-top: 2em; -} - -#logo -{ - width: 100%; -} \ No newline at end of file diff --git a/styles.css b/styles.css index 685f98d..dc13c27 100644 --- a/styles.css +++ b/styles.css @@ -68,4 +68,10 @@ th #logo { width: 100%; +} + +.graph +{ + width: 410px; + height: 410px; } \ No newline at end of file -- 1.8.3.1