diff options
| author | Britney Fransen <brfransen@gmail.com> | 2013-08-14 18:50:20 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2013-08-14 18:50:20 (GMT) |
| commit | 79d1a8112c1c10fb769dd325e6ae93f154cdd557 (patch) | |
| tree | 3a4ebd0a477e479eaa3cef1d7d5fab7d4a328734 | |
| parent | 6541c7cc4c865a086ef895119c4ef1b0ed8d1272 (diff) | |
| download | linhes_pkgbuild-79d1a8112c1c10fb769dd325e6ae93f154cdd557.zip linhes_pkgbuild-79d1a8112c1c10fb769dd325e6ae93f154cdd557.tar.gz linhes_pkgbuild-79d1a8112c1c10fb769dd325e6ae93f154cdd557.tar.bz2 | |
supplemental-web: add Terminal link to shellinabox
more layout fixes for Tuners and File Shares
| -rw-r--r-- | abs/core/supplemental-web/PKGBUILD | 7 | ||||
| -rwxr-xr-x | abs/core/supplemental-web/contents/cardmap.shtml | 11 | ||||
| -rwxr-xr-x | abs/core/supplemental-web/contents/exports.shtml | 26 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/frame.css | 8 | ||||
| -rw-r--r-- | abs/core/supplemental-web/contents/header.html | 1 | ||||
| -rwxr-xr-x | abs/core/supplemental-web/contents/list_cardmap.py | 1 | ||||
| -rwxr-xr-x | abs/core/supplemental-web/contents/list_exports.py | 23 |
7 files changed, 38 insertions, 39 deletions
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 4e1845d..fa46e23 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=5 +pkgrel=6 arch=('i686' 'x86_64') backup=('extra.cfg.txt') @@ -30,7 +30,7 @@ build(){ 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 @@ -71,9 +71,6 @@ package_supplemental-web-slave() { } - - - md5sums=('a2497205c92ad5b3aa565574afbf7f80' '3d8c7b430c1319d706ca420825918d2a' '26598fd1dfaf5d36d7b1f9620da5543c' diff --git a/abs/core/supplemental-web/contents/cardmap.shtml b/abs/core/supplemental-web/contents/cardmap.shtml index a5688dd..d98a4e9 100755 --- a/abs/core/supplemental-web/contents/cardmap.shtml +++ b/abs/core/supplemental-web/contents/cardmap.shtml @@ -3,12 +3,11 @@ <style type="text/css">@import "/frame.css";</style> </head> <body> - <div id="header"> - <h1>Tuners</h1> - <h2>Detected Cards and Static Device Paths</h2> - <br> - </div> - <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" --> + <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/exports.shtml b/abs/core/supplemental-web/contents/exports.shtml index 7aaba33..12e079c 100755 --- a/abs/core/supplemental-web/contents/exports.shtml +++ b/abs/core/supplemental-web/contents/exports.shtml @@ -1,18 +1,14 @@ <html> -<head> -<style type="text/css">@import "/frame.css";</style> -</head> - -<body> -<div id="mainContainer"> - <div id="header"> - <h1>File Shares</h1> - <br> - </div> - <div id="content"> - <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" --> - </div> -</div> -</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/frame.css b/abs/core/supplemental-web/contents/frame.css index 9d5e7d3..59da3c7 100644 --- a/abs/core/supplemental-web/contents/frame.css +++ b/abs/core/supplemental-web/contents/frame.css @@ -102,10 +102,12 @@ img.center { } #navlist { - margin-left: 50px; - padding-left: 0px; - list-style-type: square; + clear: both; + width: 770px; + margin: 10px auto; + display: block; text-align: left; + list-style-type: square; } #navlist li { diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html index ce27d52..d972bfa 100644 --- a/abs/core/supplemental-web/contents/header.html +++ b/abs/core/supplemental-web/contents/header.html @@ -49,6 +49,7 @@ function beStatus() <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>
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>' |