From 79d1a8112c1c10fb769dd325e6ae93f154cdd557 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 14 Aug 2013 13:50:20 -0500 Subject: supplemental-web: add Terminal link to shellinabox more layout fixes for Tuners and File Shares --- abs/core/supplemental-web/PKGBUILD | 7 ++---- abs/core/supplemental-web/contents/cardmap.shtml | 11 +++++---- abs/core/supplemental-web/contents/exports.shtml | 26 +++++++++------------- abs/core/supplemental-web/contents/frame.css | 8 ++++--- abs/core/supplemental-web/contents/header.html | 1 + abs/core/supplemental-web/contents/list_cardmap.py | 1 + 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 @@ - - + + 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 @@ - - - - - -
- -
- -
-
- + + + + + + + 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()
  • Logs
  • File Shares
  • Tuners
    • +
  • Terminal
    • 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 "
    " print "

    " print "__________ %s __________" %(hostname) print "

    " 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 "
    " +print "

    __________ NFS Shares __________

    " +print "
    " +print '' +print "
    " +print "

    __________ SMB Shares __________

    " +print "
    " +print '' -- cgit v0.12