From: drowe67 Date: Wed, 6 Jan 2010 01:36:37 +0000 (+0000) Subject: working on first pass of ipphones screen X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=9f5bc4b362877adf49e28a8bef6058634b97f4be;p=freetel-svn-tracking.git working on first pass of ipphones screen git-svn-id: https://svn.code.sf.net/p/freetel/code@97 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/easy-asterisk-gui/Makefile b/easy-asterisk-gui/Makefile index 99d0e862..544598a8 100644 --- a/easy-asterisk-gui/Makefile +++ b/easy-asterisk-gui/Makefile @@ -9,5 +9,5 @@ TESTIP=192.168.1.150 # rcp index.html root@$(TESTIP):/var/lib/asterisk/static-http/ test: - rcp voipline.jpg anphone.png phoneline.jpg ipphone.png phone.pl tooltips.html phone.sh phone.js tick.png cross.png 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 + rcp ipphones.sh ipphones.js voipline.jpg anphone.png phoneline.jpg ipphone.png phone.pl tooltips.html phone.sh phone.js tick.png cross.png banner.html menu.html check_loggedin.sh logout.sh login.sh network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin rcp sip.conf extensions.conf root@$(TESTIP):/etc/asterisk diff --git a/easy-asterisk-gui/dashboard.js b/easy-asterisk-gui/dashboard.js deleted file mode 100644 index 74d6eaf1..00000000 --- a/easy-asterisk-gui/dashboard.js +++ /dev/null @@ -1,7 +0,0 @@ -function localInit() { - if (init_internet == "yes") - $('internet').innerHTML = 'tick'; - else - $('internet').innerHTML = 'tick'; -} - diff --git a/easy-asterisk-gui/dashboard.sh b/easy-asterisk-gui/dashboard.sh deleted file mode 100644 index 87bfa3e8..00000000 --- a/easy-asterisk-gui/dashboard.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -x -# dashboard.sh -# David Rowe 4 Jan 2010 -# CGI for Easy Asterisk dashboard GUI - -# See if we have Internet connectivity, first check dns as time outs can be very slow - -dns=`cat /etc/resolv.conf | awk '/^nameserver/ {print $2}'` -dns_packet_loss=`ping $dns -c 1 -q | sed -n 's/.*received, \(.*\)% packet loss/\1/p'` -internet="no"; -if [ $dns_packet_loss == "0" ]; then - packet_loss=`ping google.com -c 1 -q | sed -n 's/.*received, \(.*\)% packet loss/\1/p'` - if [ $packet_loss == "0" ]; then - internet="yes"; - fi -fi - -# Construct the web page ------------------------------- - -sh check_loggedin.sh - -cat < - - - -EOF - -echo "" - -cat << EOF - -Easy Asterisk - Dashboard - -EOF - -cat tooltips.html -echo '' -cat banner.html -echo " " -cat menu.html -cat < - -
-
- - - - - -

Dashboard

Internet Connection:
-  
- - - - - - - - - -EOF - diff --git a/easy-asterisk-gui/ipphones.js b/easy-asterisk-gui/ipphones.js new file mode 100644 index 00000000..74d6eaf1 --- /dev/null +++ b/easy-asterisk-gui/ipphones.js @@ -0,0 +1,7 @@ +function localInit() { + if (init_internet == "yes") + $('internet').innerHTML = 'tick'; + else + $('internet').innerHTML = 'tick'; +} + diff --git a/easy-asterisk-gui/ipphones.sh b/easy-asterisk-gui/ipphones.sh new file mode 100644 index 00000000..6f63dab1 --- /dev/null +++ b/easy-asterisk-gui/ipphones.sh @@ -0,0 +1,56 @@ +#!/bin/sh -x +# dashboard.sh +# David Rowe 6 Jan 2010 +# Dashboard screen for Easy Asterisk GUI + +# Construct the web page ------------------------------- + +sh check_loggedin.sh + +cat < + + + +EOF + +echo "" + +cat << EOF + +Easy Asterisk - IP Phones + +EOF + +cat tooltips.html +echo '' +cat banner.html +echo " " +cat menu.html +cat < + +
+
+ + + + + +

Dashboard

Internet Connection:
+  
+ + + + + + + + + +EOF + diff --git a/easy-asterisk-gui/menu.html b/easy-asterisk-gui/menu.html index 4eb1af07..c4bc9f74 100644 --- a/easy-asterisk-gui/menu.html +++ b/easy-asterisk-gui/menu.html @@ -1,21 +1,21 @@
Change your password, Time & time zone, Reset the defaults, Install new software
-
Monitor the status of your phone system
Connect the phone system to your network and the Internet
-
Set up your phones and phone calls
+
Set up your phones, phone lines and phone calls
+
Set up your IP phones
- - - - - + + + + + diff --git a/easy-asterisk-gui/phone.sh b/easy-asterisk-gui/phone.sh index 2e014dc8..7a36ccb3 100644 --- a/easy-asterisk-gui/phone.sh +++ b/easy-asterisk-gui/phone.sh @@ -49,8 +49,9 @@ cat <

 

Admin
Dashboard
Network
Phones
IP Phones
Phones
Logout
- - + + + diff --git a/easy-asterisk-gui/tooltips.html b/easy-asterisk-gui/tooltips.html index e652ae0c..6b9963cb 100644 --- a/easy-asterisk-gui/tooltips.html +++ b/easy-asterisk-gui/tooltips.html @@ -65,3 +65,6 @@
IP Address of the VOIP Internet Service Telephone Provider
+ +
+ Instructions and help on adding a new IP phone

Phone System

Phone System

Add IP Phone
Internet Connection: