diff options
| -rw-r--r-- | abs/core/supplemental-web/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/alt_index.html | 2 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/count.py | 2 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/frame.css | 57 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/header.html | 19 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/home.shtml | 26 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/skeleton.css | 4 |
7 files changed, 60 insertions, 52 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index d259255..cb36569 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=supplemental-web pkgname=('supplemental-web' 'supplemental-web-slave') pkgver=8.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') backup=('extra.cfg.txt') diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html index 93ab1a0..7a0f3d2 100644 --- a/abs/core/supplemental-web/contents/alt_index.html +++ b/abs/core/supplemental-web/contents/alt_index.html @@ -2,7 +2,7 @@ <html> <head><title>LinHES: The Linux Home Entertainment System</title> </head> - <frameset cols="230, 100%" frameborder="no" border="0" bordercolor="#000000"> + <frameset cols="205, 100%" frameborder="no" border="0" bordercolor="#000000"> <frame src="header.html" scrolling=no name="menuframe" /> <frame src="home.shtml" name="content" /> <noframes> diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py index 9f3530f..76d18e8 100644 --- a/abs/core/supplemental-web/contents/count.py +++ b/abs/core/supplemental-web/contents/count.py @@ -79,7 +79,7 @@ def main(argv): print "</div>" #Top categories - print '<div id="column"></div>' + print '<div id="column">' print '<table class="sample">' print "Top 20 Categories" cursor.execute("select category,count(category) as numtitle from oldrecorded where oldrecorded.recstatus = -3 group by category having (COUNT(category) > 0 ) order by (COUNT(category)) DESC limit 20; " ) diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css index 94e1747..df3c69c 100644 --- a/abs/core/supplemental-web/contents/frame.css +++ b/abs/core/supplemental-web/contents/frame.css @@ -1,8 +1,8 @@ * /* Our "universal rule" */ { - padding: 0; - margin: 0; - border: 0; + padding: 0px; + margin: 0px; + border: 0px; } body { /* background: url("page_background.jpg") repeat-y #9FA9B3; */ @@ -24,10 +24,9 @@ body { //-moz-background-size: 1000px 10000px, 500px, 500px; //-webkit-background-size: 1000px 10000px, 500px 500px; - margin: 10; - margin-left:40px; - padding: 10; - border: 10; + margin: 10px; + padding: 10px; + border: 10px; min-width: 770px; font-family: Arial, Tahoma, Helvetica, sans-serif; font-size: 11px; @@ -35,17 +34,13 @@ body { text-align: center; font-size: 18px; font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif; - - } - - #mainContainer { width: 770px; - margin: 0 auto; /* We are going to center this design */ + margin: 0px auto 20px auto; text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */ - display: inline-block; + display: block; } #header { color: #fff; @@ -53,15 +48,16 @@ body { } #content { float: left; /* Our content is going to be left aligned */ - width: 320px; /* And it's going to have a 500px width */ + width: 320px; /* And it's going to have a 320px width */ /*background: #D9D9D9;*/ margin-left:60px; } #column { float: right; /* Our column is going to be right aligned */ - width: 320px; /* Our total width - content width is 260px */ + width: 320px; /* And it's going to have a 320px width */ /*background: #8A8AE6;*/ + margin-right:60px; } #resultbox { @@ -79,20 +75,33 @@ body { } +#netContainer { + width: 770px; + margin: 0px auto 0px auto; + display: block; +} + +img.center { + display: block; + padding-top: 10px; + padding-bottom: 10px; + margin-left: auto; + margin-right: auto; + max-width: 100%; +} #footer { clear: both; /* We have to clear our floats */ - width: 760px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */ - margin: 0 auto; /* We need to center the footer also */ -/* background: black; */ + width: 770px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */ + margin: 0px auto; /* We need to center the footer also */ color: gold; - text-align: center; - font-size: 10px; + text-align: center; + font-size: 10px; } #navlist { - margin-left: 50; - padding-left: 0; + margin-left: 50px; + padding-left: 0px; list-style-type: square; text-align: left; } @@ -104,7 +113,7 @@ body { { color: #fff; # background-color: #FDB14F; - text-decoration: underline ; + text-decoration: underline; } @@ -191,7 +200,7 @@ a:link { color: #fff; # background-color: #FDB14F; - text-decoration: underline ; + text-decoration: underline; # margin-left:10px; diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html index 608059c..ce27d52 100644 --- a/abs/core/supplemental-web/contents/header.html +++ b/abs/core/supplemental-web/contents/header.html @@ -30,7 +30,7 @@ function beStatus() </script>
</head>
-<BODY BGCOLOR=#ebb81c>
+<BODY BGCOLOR=#ebb81c onload="beStatus()">
<div id='header'></div>
<img id='header_img' src="linhes_header.png" alt="LinHES" title="LinHES"/>
@@ -39,6 +39,10 @@ function beStatus() <ul id="nav">
<li><a href="home.shtml" TARGET="content" id="current">Home</a></li>
+<li><a href="mythweb/">MythWeb</a></li>
+
+<li><a id="modify-me">MythBackend Status</a></li>
+
<li><a href="xymon" >System »</a>
<ul>
<li><a href="/xymon" >Health</a></li>
@@ -48,21 +52,14 @@ function beStatus() </ul>
</li>
-<li><a href="mythweb/">MythTV »</a>
+<li><a href="calllog.shtml">Utilities »</a>
<ul>
- <li><a href="mythweb/">MythWeb</a></li>
<!-- <li><a onClick=r() >MythBackend Status</a></li> -->
- <li><body onload="beStatus()"><a id="modify-me">MythBackend Status</a></body></li>
+ <li><a href="calllog.shtml">Call Log</a></li>
<li><a href="mythexport/setup.cgi">MythExport</a></li>
<li><a href="mythexpress.html">MythExpress</a></li>
<li><a href="remyth.html" >ReMyth</a></li>
- </ul>
-</li>
-
-<li><a href="/calllog.shtml">Surveillance »</a>
- <ul>
- <li><a href="/calllog.shtml">Call Log</a></li>
- <li><a href="/zm">ZoneMinder</a></li>
+ <li><a href="zm">ZoneMinder</a></li>
</ul>
</li>
diff --git a/abs/core/supplemental-web/contents/home.shtml b/abs/core/supplemental-web/contents/home.shtml index 18d66e2..a2c817e 100644 --- a/abs/core/supplemental-web/contents/home.shtml +++ b/abs/core/supplemental-web/contents/home.shtml @@ -1,15 +1,17 @@ <html> -<head> -<style type="text/css">@import "frame.css";</style> -</head> - -<body> - <div id="mainContainer"> - <!--#exec cmd="/data/srv/httpd/htdocs/count.py" --> - </br> - <img src="/xymon/gifs/network.png" > - </br> </br> - <div id="footer"><p>Thank you for choosing LinHES</p></div> -</body> + <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> diff --git a/abs/core/supplemental-web/contents/skeleton.css b/abs/core/supplemental-web/contents/skeleton.css index 1f84e7e..6a6b107 100644 --- a/abs/core/supplemental-web/contents/skeleton.css +++ b/abs/core/supplemental-web/contents/skeleton.css @@ -11,7 +11,7 @@ way to fit your requirements. #nav,
#nav ul {padding:0 0 5px 0; margin:0; list-style:none;
- /*font: 14px verdana, sans-serif;*/
+ font: 14px helvetica, sans-serif;
/*font: 14px verdana, sans-serif;*/
border:1px solid #000;
border-color:#ace #79b #68a #bde;
@@ -32,7 +32,7 @@ way to fit your requirements. #nav li a {display:block; float:left;
color:#FFFFFF; margin:0 25px 0 10px;
- height:25px; line-height:25px;
+ height:auto; line-height:25px;
text-decoration:none; white-space:normal;
}
|