linhes-web: fix counts and spacing

3 files changed, 13 insertions, 13 deletions

diff --git a/linhes/linhes-web/PKGBUILD b/linhes/linhes-web/PKGBUILD
index 2e7a0a3..3f649b3 100644
--- a/linhes/linhes-web/PKGBUILD
+++ b/linhes/linhes-web/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-web
 pkgver=9.0.0
-pkgrel=6
+pkgrel=7
 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'
-            'e07032ddbb61c88e929ebf5d80447707e5d330d2fb1e46307765cdce996cfce5')
+            '8a980ab38e16bf6cf390258a30ba55c54c6f1824920d48939da6a4660e931425')
 
 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 2aaa3e1..f0eee97 100644
--- a/linhes/linhes-web/website/contents/count.py
+++ b/linhes/linhes-web/website/contents/count.py
@@ -32,7 +32,7 @@ def main(argv):
     hours = grandtotal / 60.0
     days = hours / 24.0
     try:
-        cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM recorded where not (recgroup=(%s))  ORDER by starttime",("LiveTV"))
+        cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM recorded where not (recgroup=('LiveTV')) ORDER by starttime;")
     except:
         pass
     result_current = cursor.fetchall()
diff --git a/linhes/linhes-web/website/contents/frame.css b/linhes/linhes-web/website/contents/frame.css
index 0008aec..b367dcd 100644
--- a/linhes/linhes-web/website/contents/frame.css
+++ b/linhes/linhes-web/website/contents/frame.css
@@ -27,7 +27,7 @@ body {
     margin: 10px;
     padding: 10px;
     border: 10px;
-    min-width: 770px;
+    min-width: 870px;
     font-family: Arial, Tahoma, Helvetica, sans-serif;
     font-size: 11px;
     color: #FFFFFF;
@@ -38,7 +38,7 @@ body {
 
 #mainContainer {
     clear: both;
-    width: 770px;
+    width: 870px;
     margin: 10px 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: block;
@@ -49,16 +49,16 @@ body {
 }
 #content {
     float: left; /* Our content is going to be left aligned */
-    width: 320px; /* And it's going to have a 320px width */
+    width: 420px; /* And it's going to have a 320px width */
     /*background: #D9D9D9;*/
-    margin-left:60px;
+    margin-left:10px;
 }
 
 #column {
     float: right; /* Our column is going to be right aligned */
-    width: 320px; /* And it's going to have a 320px width */
+    width: 420px; /* And it's going to have a 320px width */
     /*background: #8A8AE6;*/
-    margin-right:60px;
+    margin-right:10px;
 }
 
 #resultbox {
@@ -78,7 +78,7 @@ body {
 
 #netContainer {
     clear: both;
-    width: 770px;
+    width: 870px;
     margin: 10px auto;
     display: block;
 }
@@ -94,7 +94,7 @@ img.center {
 
 #footer {
     clear: both; /* We have to clear our floats */
-    width: 770px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
+    width: 870px; /* 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;
@@ -103,7 +103,7 @@ img.center {
 
 #navlist {
     clear: both;
-    width: 770px;
+    width: 870px;
     margin: 10px auto;
     display: block;
     text-align: left;
@@ -135,7 +135,7 @@ table.sample {
     border-style: outset;
     border-color: #808080;
     border-collapse: separate;
-    width:300px;
+    width:400px;
 }
 
 table.sample td {