From: drowe67 Date: Mon, 4 Jan 2010 06:34:28 +0000 (+0000) Subject: initial menu and banner support X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=688fef1c4ce3730d0696bfcc0582d8aa3b957ad9;p=freetel-svn-tracking.git initial menu and banner support git-svn-id: https://svn.code.sf.net/p/freetel/code@91 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/easy-asterisk-gui/Makefile b/easy-asterisk-gui/Makefile index 45912145..d74d6568 100644 --- a/easy-asterisk-gui/Makefile +++ b/easy-asterisk-gui/Makefile @@ -9,4 +9,4 @@ TESTIP=192.168.1.150 # rcp index.html root@$(TESTIP):/var/lib/asterisk/static-http/ test: - rcp logout.sh login.sh dashboard.sh dashboard.js network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin + rcp banner.html menu.html check_loggedin.sh logout.sh login.sh dashboard.sh dashboard.js network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin diff --git a/easy-asterisk-gui/banner.html b/easy-asterisk-gui/banner.html new file mode 100644 index 00000000..432c7cdb --- /dev/null +++ b/easy-asterisk-gui/banner.html @@ -0,0 +1 @@ +

Easy Asterisk

diff --git a/easy-asterisk-gui/check_loggedin.sh b/easy-asterisk-gui/check_loggedin.sh new file mode 100644 index 00000000..3d0f9759 --- /dev/null +++ b/easy-asterisk-gui/check_loggedin.sh @@ -0,0 +1,9 @@ +echo $HTTP_COOKIE | grep "loggedin" > /dev/null +if [ $? -eq 1 ]; then + echo "" + echo "" + echo '' + echo "" + echo "" + exit +fi diff --git a/easy-asterisk-gui/dashboard.sh b/easy-asterisk-gui/dashboard.sh index a791856e..d1ea6944 100644 --- a/easy-asterisk-gui/dashboard.sh +++ b/easy-asterisk-gui/dashboard.sh @@ -14,15 +14,7 @@ fi # Construct the web page ------------------------------- -echo $HTTP_COOKIE | grep "loggedin" > /dev/null -if [ $? -eq 1 ]; then - echo "" - echo "" - echo '' - echo "" - echo "" - exit -fi +sh check_loggedin.sh cat < @@ -41,19 +33,34 @@ cat << EOF Easy Asterisk - Dashboard
Tells you if I can reach the Internet. If not "Good" check your network settings, in particular Gateway and DNS.
-
- - - - - - - - - + +

Dashboard

Internet Connection:
-  
+EOF +cat banner.html +echo " " +cat menu.html +cat < + + +
+ + + + + + + +

Dashboard

Internet Connection:
+  
+
+ + + + + - EOF echo $HTTP_COOKIE diff --git a/easy-asterisk-gui/menu.html b/easy-asterisk-gui/menu.html new file mode 100644 index 00000000..e5d49450 --- /dev/null +++ b/easy-asterisk-gui/menu.html @@ -0,0 +1,6 @@ + + + + +
Menu 1
Menu 2
+ diff --git a/easy-asterisk-gui/network.sh b/easy-asterisk-gui/network.sh index 771cd8dc..33ee3b14 100644 --- a/easy-asterisk-gui/network.sh +++ b/easy-asterisk-gui/network.sh @@ -33,6 +33,8 @@ fi # Construct the web page ------------------------------- +sh check_loggedin.sh + cat <