diff options
Diffstat (limited to 'abs/core/supplemental-web')
18 files changed, 216 insertions, 200 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 824b7bd..3fddaf6 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,78 +1,46 @@ pkgbase=supplemental-web pkgname=('supplemental-web' 'supplemental-web-slave') pkgver=8.0 -pkgrel=1 +pkgrel=9 arch=('i686' 'x86_64') backup=('extra.cfg.txt') source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh slaveserve.py supplemental_slave.rules supplemental_web.rules ) -build(){ - cd $startdir/src -} - -# -# build() { -# cd $startdir/src -# mkdir -p $MVDIR/etc -# install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf -# install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh -# # install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh -# mkdir -p $startdir/pkg/data/srv/httpd/htdocs/ -# cp -rp $startdir/contents/* $startdir/pkg/data/srv/httpd/htdocs -# chmod -R 755 $startdir/pkg/data/srv/httpd/htdocs -# cd $startdir -# mkdir -p $startdir/pkg/data/srv/httpd/ -# cp -rp cgi $startdir/pkg/data/srv/httpd/ -# cd $startdir/src -# install -m755 -D extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt -# } - package_supplemental-web() { pkgdesc="supplemental-web package for master backend" - depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50') + depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50' 'shellinabox') install=supplemental-web.install - cd $startdir/src MVDIR=$pkgdir/usr/MythVantage - mkdir -p $MVDIR/etc install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh # install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh mkdir -p $pkgdir/data/srv/httpd/htdocs/ cp -rp $startdir/contents/* $pkgdir/data/srv/httpd/htdocs chmod -R 755 $pkgdir/data/srv/httpd/htdocs - cd $startdir mkdir -p $pkgdir/data/srv/httpd/ - cp -rp cgi $pkgdir/data/srv/httpd/ - cd $startdir/src - install -m755 -D extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt + cp -rp $startdir/cgi $pkgdir/data/srv/httpd/ + install -m755 -D $srcdir/extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt #sudo rules - install -D -m400 $startdir/src/supplemental_web.rules $pkgdir/etc/sudoers.d/supplemental_web + install -D -m400 $srcdir/supplemental_web.rules $pkgdir/etc/sudoers.d/supplemental_web chmod 750 $pkgdir/etc/sudoers.d - - } +} package_supplemental-web-slave() { pkgdesc="supplemental-web package for slave backend" depends=('python2' 'func' 'python_aosd' 'LinHES-system>=2-50') conflicts="supplemental-web" - cd $startdir mkdir -p $pkgdir/data/srv/httpd/ - cp -rp cgi $pkgdir/data/srv/httpd/ + cp -rp $startdir/cgi $pkgdir/data/srv/httpd/ chown -R root:root $pkgdir/data/srv/httpd/ chmod -R 755 $pkgdir/data/srv/httpd/ install -m755 -D $srcdir/slaveserve.py $pkgdir/data/srv/httpd/cgi/slaveserve.py #sudo rules - install -D -m400 $startdir/src/supplemental_slave.rules $pkgdir/etc/sudoers.d/supplemental_slave + install -D -m400 $srcdir/supplemental_slave.rules $pkgdir/etc/sudoers.d/supplemental_slave chmod 750 $pkgdir/etc/sudoers.d - - - } - - - +} md5sums=('a2497205c92ad5b3aa565574afbf7f80' '3d8c7b430c1319d706ca420825918d2a' diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html index e6a89b4..1168c4a 100644 --- a/abs/core/supplemental-web/contents/alt_index.html +++ b/abs/core/supplemental-web/contents/alt_index.html @@ -1,8 +1,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> <html> - <head><title>LinHES: The Linux Home Entertainment System</title> + <head> + <link rel="shortcut icon" href="/favicon.ico"> + <title>LinHES: The Linux Home Entertainment System</title> </head> - <frameset rows="230, 80%" frameborder="no" border="3" 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/calllog.shtml b/abs/core/supplemental-web/contents/calllog.shtml index 5eb5783..5b64dc3 100644 --- a/abs/core/supplemental-web/contents/calllog.shtml +++ b/abs/core/supplemental-web/contents/calllog.shtml @@ -4,16 +4,13 @@ </head> <body> -<p> Phone Call Log </p> - -<!--<div id="mainContainer"> - <div id="header"><p></p></div> - <div id="content"> - <p>Phone Call Log</p>--> + <div id="header"> + <h1>Phone Call Log</h1> + <br> + </div> <!--#exec cmd="/data/srv/httpd/htdocs/calllog.py" --> - </br> </br> diff --git a/abs/core/supplemental-web/contents/cardmap.shtml b/abs/core/supplemental-web/contents/cardmap.shtml index 89013c0..d98a4e9 100755 --- a/abs/core/supplemental-web/contents/cardmap.shtml +++ b/abs/core/supplemental-web/contents/cardmap.shtml @@ -3,8 +3,10 @@ <style type="text/css">@import "/frame.css";</style> </head> <body> - <h1> List of detected cards and static device path. </h1> - <br> + <div id="header"> + <h1>Tuners</h1> + <h2>Detected Cards and Static Device Paths</h2> + </div> <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" --> </body> </html> diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py index 2889af1..76d18e8 100644 --- a/abs/core/supplemental-web/contents/count.py +++ b/abs/core/supplemental-web/contents/count.py @@ -8,6 +8,11 @@ import socket def main(argv): + #get LinHES version + verfile = open('/etc/LinHES-release', 'r') + verLH = verfile.read() + verfile.close() + grandtotal=0 grandtotal_current=0 db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg") @@ -39,17 +44,20 @@ def main(argv): days_current = hours_current / 24.0 print '<div id="header">' - + print "<h3>Welcome to</h3>" + print "<h1>" , verLH , "</h1>" + print "<h3>on " , socket.gethostname() , "</h3>" + print "</br>" print "<table>" print " <tr>" - print " <td> Currently there are " , len(result_current) , " recorded programs. With a viewing time of %.2f days or %.2f hours. </td>" %(days_current,hours_current) + print " <td>Currently there are " , len(result_current) , " recorded programs, with a viewing time of %.2f days or %.2f hours.</td>" %(days_current,hours_current) print " </tr>" print "</table>" print "</br> " print "<table>" print " <tr>" - print " <td> Overall there have been " , len(result) , "shows recorded. With viewing time of %.2f days or %.2f hours </td>"%(days,hours) + print " <td>Overall there have been " , len(result) , "shows recorded, with a viewing time of %.2f days or %.2f hours.</td>"%(days,hours) print " </tr>" print "</table>" print '</div>' @@ -69,9 +77,9 @@ def main(argv): # print "%40s %26s %10s" %(row[0],row[2],row[1]) print "</table>" print "</div>" -#Top categorys +#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/docs.html b/abs/core/supplemental-web/contents/docs.html index 21ba2dd..dc3a936 100644 --- a/abs/core/supplemental-web/contents/docs.html +++ b/abs/core/supplemental-web/contents/docs.html @@ -4,53 +4,54 @@ </head> <body> -Package Management -</br> +<div id="header"> +<h1>Documentation</h1> +<br> +</div> +<h3>Package Management</h3> <div id="navcontainer"> <ul id="navlist"> - <li>pacman -Sy to refresh pkg database</li> - <li>pacman -Ss $keyword to search pkg database</li> - <li>pacman -Su to update all install packages</li> - <li>pacman -S $pkg to update one pkg</li> - <li>pacman -h for a list of pacman operations .</li> - <li>pacman -S --help for a full list of options associated with the -S command.</li> + <li>pacman -Sy = to refresh pkg database</li> + <li>pacman -Ss $keyword = to search pkg database</li> + <li>pacman -Su = to update all install packages</li> + <li>pacman -S $pkg = to update one pkg</li> + <li>pacman -h = for a list of pacman operations</li> + <li>pacman -S --help = for a full list of options associated with the -S command</li> </ul> </div> <br> -Starting and stopping services. -<br> +<h3>Starting and Stopping Services</h3> <div id="navcontainer"> <ul id="navlist"> - <li>sv {stop,start,restart} frontend. This will start/stop the entire X proccess that runs mythfrontend</li> - <li>sv {stop,start,restart} mysql</li> - <li>sv {stop,start,restart} mythbackend</li> - <li>sv {stop,start,restart} lircd</li> + <li>sv {stop,start,restart} frontend = This will start/stop the entire X proccess that runs mythfrontend</li> + <li>sv {stop,start,restart} mysql</li> + <li>sv {stop,start,restart} mythbackend</li> + <li>sv {stop,start,restart} remotes</li> </ul> <br> </div> + +<h3>Other Notes</h3> <div id="navcontainer"> - Other Random notes -<br> <ul id="navlist"> - <li>To keep a host from showing up in the network map, add it to: - /data/srv/hobbit/server/ext/ignoreclient.py - </li> - <li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li> - <li>if /tmp/nomfe is present then mythfrontend will not restart </li> - - <li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li> + <li>To keep a host from showing up in the network map, add it to: + /home/xymon/server/ext/ignoreclient.py + </li> + <li>To stop xymon from running a check on a function remove "func" from bb-hosts</li> + <li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li> + <li>If /tmp/nomfe is present then mythfrontend will not restart</li> + <li>Adding pkg names to /etc/pkgname.blacklist will stop MythVantage from auto installing a package</li> </div> <br> -<div id="navcontainer"> - Menu Navigation -<br> +<h3>MythFrontend Menu Navigation</h3> +<div id="navcontainer"> <ul id="navlist"> - <li> <A HREF="images/classic-menugraph.png">Classic menu</A> </li> - <li> <A HREF="images/menu_diagram_color.png">Standard menu</A> </li> - <li> <A HREF="images/dvr_menugraph.png">DVR menu</A> </li> + <li> <A HREF="images/classic-menugraph.png">Classic Menu</A> </li> + <li> <A HREF="images/menu_diagram_color.png">Standard Menu</A> </li> + <li> <A HREF="images/dvr_menugraph.png">DVR Menu</A> </li> </body> </html> diff --git a/abs/core/supplemental-web/contents/error/mythexport.html b/abs/core/supplemental-web/contents/error/mythexport.html index 88966c6..f0d6b9d 100644 --- a/abs/core/supplemental-web/contents/error/mythexport.html +++ b/abs/core/supplemental-web/contents/error/mythexport.html @@ -4,8 +4,19 @@ </head> <body> -MythExport does not appear to be installed. +<h2>MythExport does not appear to be installed</h2> </br> +</br> +<h4>Export MythTV recordings to portable media players.</h4> +</br> +<div id="navcontainer"> + <ul id="navlist"> +To enable MythExport run these commands in a terminal: + </br> + <li> pacman -Syyu mythexport </li> + <li> add_service.sh mythexport </li> +</ul> </body> </html> + diff --git a/abs/core/supplemental-web/contents/error/mythexpress.html b/abs/core/supplemental-web/contents/error/mythexpress.html index 0382233..0525dfc 100644 --- a/abs/core/supplemental-web/contents/error/mythexpress.html +++ b/abs/core/supplemental-web/contents/error/mythexpress.html @@ -4,14 +4,14 @@ </head> <body> -MythExpress is not enabled or installed. +<h2>MythExpress is not enabled or installed</h2> </br> </br> +<h4>MythExpress is a browser-based interface to MythTV's HTTP streaming capability.</h4> </br> <div id="navcontainer"> <ul id="navlist"> - -To enable mythexpress run these commands in a terminal: +To enable MythExpress run these commands in a terminal: </br> <li> pacman -Syyu mythexpress </li> <li> add_service.sh mythexpress </li> diff --git a/abs/core/supplemental-web/contents/error/remyth.html b/abs/core/supplemental-web/contents/error/remyth.html index 72c2775..36661d2 100644 --- a/abs/core/supplemental-web/contents/error/remyth.html +++ b/abs/core/supplemental-web/contents/error/remyth.html @@ -4,14 +4,16 @@ </head> <body> -ReMyth is not enabled or installed. +<h2>ReMyth is not enabled or installed</h2> </br> </br> +<h4>ReMyth provides a nice remote for your MythTV Frontends.</h4> +<h4>You will be able to view your recordings, as well as send actions to a frontend of your choosing.</h4> </br> + <div id="navcontainer"> <ul id="navlist"> - -To enable remyth run these commands in a terminal: +To enable ReMyth run these commands in a terminal: </br> <li> pacman -Syyu remyth </li> <li> add_service.sh remyth </li> diff --git a/abs/core/supplemental-web/contents/exports.shtml b/abs/core/supplemental-web/contents/exports.shtml index 9a26dc9..12e079c 100755 --- a/abs/core/supplemental-web/contents/exports.shtml +++ b/abs/core/supplemental-web/contents/exports.shtml @@ -1,20 +1,14 @@ <html> -<head> -<style type="text/css">@import "/frame.css";</style> -</head> - -<body> -<div id="mainContainer"> -<!-- <div id="header"><p></p></div> - <div id="content"> - <p></p>--> - - <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" --> - - -</br> -</br> - -</body> + <head> + <style type="text/css">@import "/frame.css";</style> + </head> + <body> + <div id="header"> + <h1>File Shares</h1> + </div> + <div id="navcontainer"> + <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" --> + </div> + </body> </html> diff --git a/abs/core/supplemental-web/contents/favicon.ico b/abs/core/supplemental-web/contents/favicon.ico Binary files differnew file mode 100644 index 0000000..6a99443 --- /dev/null +++ b/abs/core/supplemental-web/contents/favicon.ico diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css index 42877dd..59da3c7 100644 --- a/abs/core/supplemental-web/contents/frame.css +++ b/abs/core/supplemental-web/contents/frame.css @@ -1,11 +1,12 @@ * /* Our "universal rule" */ { - padding: 0; - margin: 0; - border: 0; + padding: 0px; + margin: 0px; + border: 0px; } body { - background: url("page_background.jpg") repeat-y #9FA9B3; +/* background: url("page_background.jpg") repeat-y #9FA9B3; */ + background-color: #191c26; //background-color: #ebb81c; //background-image: -webkit-gradient(linear, left top, left bottom, from(#ebb81c), to(#0072bc)); /* Saf4+, Chrome */ @@ -23,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; @@ -34,32 +34,31 @@ body { text-align: center; font-size: 18px; font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif; - - } - - #mainContainer { + clear: both; width: 770px; - margin: 0 auto; /* We are going to center this design */ + 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; } #header { - background: #000; color: #fff; + text-align: center; } #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 { @@ -77,22 +76,38 @@ body { } +#netContainer { + clear: both; + width: 770px; + margin: 10px 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; - list-style-type: square; + clear: both; + width: 770px; + margin: 10px auto; + display: block; text-align: left; + list-style-type: square; } #navlist li { @@ -102,7 +117,7 @@ body { { color: #fff; # background-color: #FDB14F; - text-decoration: underline ; + text-decoration: underline; } @@ -189,9 +204,9 @@ a:link { color: #fff; # background-color: #FDB14F; - text-decoration: underline ; + text-decoration: underline; - margin-left:10px; +# margin-left:10px; } diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html index f84b4c8..d972bfa 100644 --- a/abs/core/supplemental-web/contents/header.html +++ b/abs/core/supplemental-web/contents/header.html @@ -6,69 +6,77 @@ <script type="text/javascript">
function r()
{
- current_hostname=parent.location.hostname
- top.frames["content"].location.href = ( "http://" + current_hostname + ":6544" ) ;
-
+ current_hostname=parent.location.hostname
+ top.frames["content"].location.href = ( "http://" + current_hostname + ":6544" ) ;
}
function express()
{
current_hostname=parent.location.hostname
top.frames["content"].location.href = ( "http://" + current_hostname + ":6565" ) ;
-
- }
+}
function remyth()
{
current_hostname=parent.location.hostname
top.frames["content"].location.href = ( "http://" + current_hostname + ":8088" ) ;
+}
- }
-
+function beStatus()
+{
+ document.getElementById('modify-me').href = "http://" + window.location.hostname + ":6544";
+}
</script>
</head>
-<BODY BGCOLOR=#ebb81c>
+<BODY BGCOLOR=#ebb81c onload="beStatus()">
<div id='header'></div>
-<img id='header_img' src="linhes_header.png" alt="Alt Text" title="Image Title"/>
+<img id='header_img' src="linhes_header.png" alt="LinHES" title="LinHES"/>
<base target="content" />
<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="/cardmap.shtml" >List static dev nodes for tuners </a></li>
- <li><a href="/exports.shtml" >List file shares </a></li>
- <li><a href="/xymon" >System Health</a></li>
- <li><a href="/logs/">System Logs</a></li>
+ <li><a href="/xymon" >Health</a></li>
+ <li><a href="/logs/" >Logs</a></li>
+ <li><a href="/exports.shtml" >File Shares</a></li>
+ <li><a href="/cardmap.shtml" >Tuners</a></li>
+ <li><a href="/shell/" >Terminal</a></li>
</ul>
</li>
-<li><a href="mythweb/">Utilities »</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><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>
+ <li><a href="zm">ZoneMinder</a></li>
</ul>
</li>
-<li><a href="/calllog.shtml">Surveillance »</a>
+<li><a href="docs.html" >Documentation</a></li>
+
+<li><a href="links.html" >Links »</a>
<ul>
- <li><a href="/calllog.shtml">Phone Call Log</a></li>
- <li><a href="/zm">ZoneMinder</a></li>
+ <li><a href="http://linhes.org/wiki" >LinHES Wiki</a></li>
+ <li><a href="http://forums.linhes.org" >LinHES Forums</a></li>
+ <li><a href="http://linhes.org/projects/linhes/issues" >LinHES Bug Tracker </a></li>
+ <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" >LinHES Add-Ons</a></li>
+ <li><a href="http://www.mythtv.org" >MythTV</a></li>
+ <li><a href="http://smolt.mythtv.org" >MythTV Smolt Server</a></li>
+ <li><a href="http://www.schedulesdirect.org" >Schedules Direct</a></li>
</ul>
</li>
-
-<li><a href="docs.html" >Documentation</a></li>
-<li><a onClick=r() >Myth Backend Status</a></li>
-
-<li><a href="links.html" >Links</a></li>
-
-
</body>
</html>
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/links.html b/abs/core/supplemental-web/contents/links.html index e14141a..65b5231 100644 --- a/abs/core/supplemental-web/contents/links.html +++ b/abs/core/supplemental-web/contents/links.html @@ -4,19 +4,19 @@ </head> <body> -Other Links +<h1>Links</h1> </br> <div id="navcontainer"> <ul id="navlist"> <!-- <li><a href="/mvpmc.shtml" >Media MVP setup</a> (dhcp server must be enabled) </li> --> - <li><a href="http://www.linhes.org" >linhes.org </a>Bugtracker</li> - <li><a href="http://linhes.org/wiki" >Wiki </a></li> - <li><a href="http://forums.linhes.org" >Online User Forums</a></li> - <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" > Official & 3rd party addons</a></li> - <li><a href="http://www.mythtv.org" >mythtv.org</a></li> - <li><a href="http://smolt.mythtv.org" >mythtv smolt server</a></li> - <li><a href="http://www.schedulesdirect.org" >Schedules Direct guide data for North America</a></li> + <li><a href="http://linhes.org/wiki" >LinHES Wiki</a></li> + <li><a href="http://forums.linhes.org" >LinHES Forums</a></li> + <li><a href="http://linhes.org/projects/linhes/issues" >LinHES Bug Tracker </a></li> + <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" >LinHES Add-Ons</a></li> + <li><a href="http://www.mythtv.org" >MythTV</a></li> + <li><a href="http://smolt.mythtv.org" >MythTV Smolt Server</a></li> + <li><a href="http://www.schedulesdirect.org" >Schedules Direct</a></li> diff --git a/abs/core/supplemental-web/contents/list_cardmap.py b/abs/core/supplemental-web/contents/list_cardmap.py index 4e2c1a9..c77ed83 100755 --- a/abs/core/supplemental-web/contents/list_cardmap.py +++ b/abs/core/supplemental-web/contents/list_cardmap.py @@ -88,6 +88,7 @@ slave_hosts = find_slave_hosts() #--------------MBE------------- hostname = socket.gethostname() +print "</br>" print "<h2>" print "__________ %s __________" %(hostname) print "</h2>" diff --git a/abs/core/supplemental-web/contents/list_exports.py b/abs/core/supplemental-web/contents/list_exports.py index 13ec690..79c2c38 100755 --- a/abs/core/supplemental-web/contents/list_exports.py +++ b/abs/core/supplemental-web/contents/list_exports.py @@ -59,24 +59,27 @@ nfslist = nfs_export_list() smblist = smb_share_list() -print "---------NFS SHARES-----------\n" print "</br>" +print "<h2>__________ NFS Shares __________</h2>" +print "</br>" +print '<ul id="navlist">' for sharename in nfslist: if sharename[1].find("noaccess") > -1 : - print "%s \t no access" %sharename[0] - print "</br>" + print "<h3>%s \t no access</h3>" %sharename[0] else: - print sharename[0] - print "</br>" + print "<li>%s</li>" %sharename[0] -print "\n---------SMB SHARES----------\n" -print "</br>" +print '</ul>' +print "</br>" +print "<h2>__________ SMB Shares __________</h2>" +print "</br>" +print '<ul id="navlist">' if len(smblist) == 0: - print "Samba is not running or no shares listed" + print "<h3>Samba is not running or no shares are listed</h3>" print "</br>" else: for sharename in smblist: - print "%s" %(sharename.split()[0]) - print "</br>" + print "<li>%s</li>" %(sharename.split()[0]) +print '</ul>' diff --git a/abs/core/supplemental-web/contents/skeleton.css b/abs/core/supplemental-web/contents/skeleton.css index b13aa20..6a6b107 100644 --- a/abs/core/supplemental-web/contents/skeleton.css +++ b/abs/core/supplemental-web/contents/skeleton.css @@ -7,20 +7,22 @@ Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. This stylesheet and the associated (x)html may be modified in any
way to fit your requirements.
=================================================================== */
-#header_img {margin:5px auto;display:block;}
+#header_img {margin:5px auto;display:block;width:100%}
#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;
border-width:1px 2px 2px 1px; background:#fff;
position:relative; z-index:200;}
-#nav {height:30px; padding:0;background-color:#0072bc;}
+#nav {height:auto; width:calc(100% - 2px);
+ padding:0; background-color:#0072bc;
+ display: inline-block;}
-#nav li {float:left;}
+#nav li {float:left; width:100%;}
#nav li li {float:none; background:#fff;}
/* a hack for IE5.x and IE6 */
* html #nav li li {float:left;}
@@ -30,12 +32,12 @@ way to fit your requirements. #nav li a {display:block; float:left;
color:#FFFFFF; margin:0 25px 0 10px;
- height:25px; line-height:25px;
- text-decoration:none; white-space:nowrap;
+ height:auto; line-height:25px;
+ text-decoration:none; white-space:normal;
}
/*item in white box*/
-#nav li li a {height:20px; line-height:20px; float:none;
+#nav li li a {height:auto; line-height:20px; float:none;
background-color:#0072bc;
margin:0 0 0 0;
border:1px solid #000;
@@ -47,7 +49,7 @@ way to fit your requirements. #nav li:hover {position:relative; z-index:300; }
/*white box*/
-#nav li:hover ul {left:0; bottom:21px; top:auto; background-color:#0072bc; color:}
+#nav li:hover ul {left:4em; top:0px; right:-10px; background-color:#0072bc;}
/* another hack for IE5.5 and IE6 */
* html #nav li:hover ul {left:10px;}
|