From fb65a64342c34c65045889121c310494d26e34ec Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Mon, 5 Nov 2012 15:43:45 -0600 Subject: supplemental-web: changed the header to include mythexpress and remyth I hope to add something to catch the error page and wrap them like the rest of the links. However it's considered cross domain because of the port change. refs #865 refs #863 --- abs/core/supplemental-web/PKGBUILD | 2 +- abs/core/supplemental-web/contents/calllog.shtml | 8 +++-- .../contents/error/mythbackend.html | 11 +++++++ .../contents/error/mythexpress.html | 20 +++++++++++++ .../supplemental-web/contents/error/remyth.html | 20 +++++++++++++ abs/core/supplemental-web/contents/header.html | 35 ++++++++++++++++++---- abs/core/supplemental-web/contents/mythweb.html | 16 ++++++++++ 7 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 abs/core/supplemental-web/contents/error/mythbackend.html create mode 100644 abs/core/supplemental-web/contents/error/mythexpress.html create mode 100644 abs/core/supplemental-web/contents/error/remyth.html create mode 100644 abs/core/supplemental-web/contents/mythweb.html diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 237d4da..76911a0 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,6 +1,6 @@ pkgname=supplemental-web pkgver=1.0 -pkgrel=29 +pkgrel=30 arch=('i686' 'x86_64') MVDIR=$startdir/pkg/usr/MythVantage install=supplemental-web.install diff --git a/abs/core/supplemental-web/contents/calllog.shtml b/abs/core/supplemental-web/contents/calllog.shtml index ddf3d88..5eb5783 100644 --- a/abs/core/supplemental-web/contents/calllog.shtml +++ b/abs/core/supplemental-web/contents/calllog.shtml @@ -4,10 +4,12 @@ </head> <body> -<div id="mainContainer"> -<!-- <div id="header"><p></p></div> +<p> Phone Call Log </p> + +<!--<div id="mainContainer"> + <div id="header"><p></p></div> <div id="content"> - <p></p>--> + <p>Phone Call Log</p>--> <!--#exec cmd="/data/srv/httpd/htdocs/calllog.py" --> diff --git a/abs/core/supplemental-web/contents/error/mythbackend.html b/abs/core/supplemental-web/contents/error/mythbackend.html new file mode 100644 index 0000000..9c3a362 --- /dev/null +++ b/abs/core/supplemental-web/contents/error/mythbackend.html @@ -0,0 +1,11 @@ +<html> +<head> +<style type="text/css">@import "/frame.css";</style> +</head> + +<body> +MythBackend status is currently unavailable. +</br> + +</body> +</html> diff --git a/abs/core/supplemental-web/contents/error/mythexpress.html b/abs/core/supplemental-web/contents/error/mythexpress.html new file mode 100644 index 0000000..0382233 --- /dev/null +++ b/abs/core/supplemental-web/contents/error/mythexpress.html @@ -0,0 +1,20 @@ +<html> +<head> +<style type="text/css">@import "/frame.css";</style> +</head> + +<body> +MythExpress is not enabled or installed. +</br> +</br> +</br> +<div id="navcontainer"> + <ul id="navlist"> + +To enable mythexpress run these commands in a terminal: + </br> + <li> pacman -Syyu mythexpress </li> + <li> add_service.sh mythexpress </li> +</ul> +</body> +</html> diff --git a/abs/core/supplemental-web/contents/error/remyth.html b/abs/core/supplemental-web/contents/error/remyth.html new file mode 100644 index 0000000..72c2775 --- /dev/null +++ b/abs/core/supplemental-web/contents/error/remyth.html @@ -0,0 +1,20 @@ +<html> +<head> +<style type="text/css">@import "/frame.css";</style> +</head> + +<body> +ReMyth is not enabled or installed. +</br> +</br> +</br> +<div id="navcontainer"> + <ul id="navlist"> + +To enable remyth run these commands in a terminal: + </br> + <li> pacman -Syyu remyth </li> + <li> add_service.sh remyth </li> +</ul> +</body> +</html> diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html index b8b346c..a75d57c 100644 --- a/abs/core/supplemental-web/contents/header.html +++ b/abs/core/supplemental-web/contents/header.html @@ -10,6 +10,22 @@ function r() 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" ) ; + + } + + </script> </head> @@ -21,21 +37,28 @@ function r() <base target="content" /> <ul id="nav"> <li><a href="home.shtml" TARGET="content" id="current">Home</a></li> -<li><a href="xymon" >System Health</a></li> -<li><a href="/exports.shtml">Utilities »</a> + +<li><a href="xymon" >System »</a> <ul> <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> + </ul> +</li> + +<li><a href="mythweb/">Utilities »</a> + <ul> <li><a href="mythweb/">MythWeb</a></li> <li><a href="mythexport/setup.cgi">MythExport</a></li> - <li><a href="/zm">ZoneMinder</a></li> + <li><a onClick=express() >MythExpress</a></li> + <li><a onClick=remyth() >ReMyth</a></li> </ul> </li> -<li><a href="/logs/">Logs »</a> +<li><a href="/calllog.shtml">Surveillance »</a> <ul> <li><a href="/calllog.shtml">Phone Call Log</a></li> - <li><a href="/logs/">System Logs</a></li> - + <li><a href="/zm">ZoneMinder</a></li> </ul> </li> diff --git a/abs/core/supplemental-web/contents/mythweb.html b/abs/core/supplemental-web/contents/mythweb.html new file mode 100644 index 0000000..fe76a9a --- /dev/null +++ b/abs/core/supplemental-web/contents/mythweb.html @@ -0,0 +1,16 @@ +<html> +<head> +<style type="text/css">@import "/frame.css";</style> +</head> + +<body> +MythWeb does not appear to be installed. +</br> +To install MythWeb either +</br> +1) Visit the MythVantage advanced screen to enable mythweb. </br> +2) type "pacman -S mythweb-release-fixes" at the console. + + +</body> +</html> -- cgit v0.12