summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2023-12-26 18:00:23 (GMT)
committerBritney Fransen <brfransen@gmail.com>2023-12-26 18:00:23 (GMT)
commit4c7ccb93e69d0dc44321fe6a4eff71a886a1b768 (patch)
treef4ca4e518f2b25748bf630d0e25b80739c787d28
parent6e982890e22fc33f0a4005336b64b8656a94fd8c (diff)
downloadlinhes_pkgbuild-4c7ccb93e69d0dc44321fe6a4eff71a886a1b768.zip
linhes_pkgbuild-4c7ccb93e69d0dc44321fe6a4eff71a886a1b768.tar.gz
linhes_pkgbuild-4c7ccb93e69d0dc44321fe6a4eff71a886a1b768.tar.bz2
linhes-web: rework home.shtml and add some doctypes
-rw-r--r--linhes/linhes-web/PKGBUILD4
-rwxr-xr-x[-rw-r--r--]linhes/linhes-web/website/contents/count.py16
-rwxr-xr-xlinhes/linhes-web/website/contents/header.html6
-rwxr-xr-x[-rw-r--r--]linhes/linhes-web/website/contents/home.shtml20
-rwxr-xr-x[-rw-r--r--]linhes/linhes-web/website/contents/index.html7
5 files changed, 27 insertions, 26 deletions
diff --git a/linhes/linhes-web/PKGBUILD b/linhes/linhes-web/PKGBUILD
index 13d4896..967fc46 100644
--- a/linhes/linhes-web/PKGBUILD
+++ b/linhes/linhes-web/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=linhes-web
pkgver=9.0.0
-pkgrel=11
+pkgrel=12
conflicts=()
pkgdesc="LinHES local website"
depends=('lighttpd' 'php-cgi')
@@ -9,7 +9,7 @@ arch=('x86_64')
license=('GPL')
source=('linhes-web.conf' 'website.tar.gz')
sha256sums=('e39ce02bde5eb3d359f1286b41751aa715961cf2b2d9a1243c7f01d20ed9c993'
- '71c601f8044227f57b75055ddacffe339fbcb766f068c7b12133b1f82be47605')
+ '3be45db23163d413efb2e9a77a410094ff21add02a068b96580843c58a8942ed')
package() {
mkdir -p $pkgdir/data/srv/httpd/htdocs/
diff --git a/linhes/linhes-web/website/contents/count.py b/linhes/linhes-web/website/contents/count.py
index f0eee97..ef2a0b1 100644..100755
--- a/linhes/linhes-web/website/contents/count.py
+++ b/linhes/linhes-web/website/contents/count.py
@@ -45,6 +45,14 @@ def main(argv):
hours_current = grandtotal_current / 60.0
days_current = hours_current / 24.0
+ print('<!DOCTYPE html>')
+ print("<html>")
+ print(" <head>")
+ print(' <meta charset="UTF-8" />')
+ print(' <style type="text/css">@import "frame.css";</style>')
+ print(" </head>")
+ print("<body>")
+ print(' <div id="mainContainer">')
print('<div id="header">')
print("<h3>Welcome to</h3>")
print("<h1>" , verLH , "</h1>")
@@ -97,6 +105,14 @@ def main(argv):
#print "%16s %16s" %(row[0],row[1])
print("</table>")
print("</div>")
+ print("</div>")
+ print(' <div id="footer">')
+ print(" <p>Thank you for choosing LinHES!</p>")
+ print(" </div>")
+ print(" </body>")
+ print("</html>")
+
+
if __name__ == "__main__":
main(sys.argv[1:])
diff --git a/linhes/linhes-web/website/contents/header.html b/linhes/linhes-web/website/contents/header.html
index a7415f3..3ee6762 100755
--- a/linhes/linhes-web/website/contents/header.html
+++ b/linhes/linhes-web/website/contents/header.html
@@ -1,7 +1,9 @@
+<!DOCTYPE html>
<html>
-<!--<style type="text/css">@import "mv.css";</style>-->
-<link rel="stylesheet" type="text/css" href="skeleton.css" />
+ <!--<style type="text/css">@import "mv.css";</style>-->
+ <link rel="stylesheet" type="text/css" href="skeleton.css" />
<head>
+<meta charset="UTF-8" />
<script type="text/javascript">
function beStatus()
diff --git a/linhes/linhes-web/website/contents/home.shtml b/linhes/linhes-web/website/contents/home.shtml
index a2ef7dd..9494139 100644..100755
--- a/linhes/linhes-web/website/contents/home.shtml
+++ b/linhes/linhes-web/website/contents/home.shtml
@@ -1,19 +1 @@
-<html>
- <head>
- <style type="text/css">@import "frame.css";</style>
- </head>
- <body>
- <div id="mainContainer">
- <!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
- </div>
-<!--
- <div id="netContainer">
- <img src="/xymon/gifs/network.png" class="center">
- </div>
--->
- <div id="footer">
- <p>Thank you for choosing LinHES!</p>
- </div>
- </body>
-</html>
-
+<!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
diff --git a/linhes/linhes-web/website/contents/index.html b/linhes/linhes-web/website/contents/index.html
index 1168c4a..99f6b37 100644..100755
--- a/linhes/linhes-web/website/contents/index.html
+++ b/linhes/linhes-web/website/contents/index.html
@@ -1,6 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<!DOCTYPE html>
<html>
<head>
+ <meta charset="UTF-8" />
<link rel="shortcut icon" href="/favicon.ico">
<title>LinHES: The Linux Home Entertainment System</title>
</head>
@@ -12,5 +13,5 @@
There is no frame support on your browser.
</body>
</noframes>
- </frameset>
- </html>
+ </frameset>
+</html>