Easy Asterisk - Dashboard

From 9f5bc4b362877adf49e28a8bef6058634b97f4be Mon Sep 17 00:00:00 2001 From: drowe67 Date: Wed, 6 Jan 2010 01:36:37 +0000 Subject: [PATCH] working on first pass of ipphones screen git-svn-id: https://svn.code.sf.net/p/freetel/code@97 01035d8c-6547-0410-b346-abe4f91aad63 --- easy-asterisk-gui/Makefile | 2 +- .../{dashboard.js => ipphones.js} | 0 .../{dashboard.sh => ipphones.sh} | 20 ++++--------------- easy-asterisk-gui/menu.html | 14 ++++++------- easy-asterisk-gui/phone.sh | 5 +++-- easy-asterisk-gui/tooltips.html | 3 +++ 6 files changed, 18 insertions(+), 26 deletions(-) rename easy-asterisk-gui/{dashboard.js => ipphones.js} (100%) rename easy-asterisk-gui/{dashboard.sh => ipphones.sh} (67%) 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/ipphones.js similarity index 100% rename from easy-asterisk-gui/dashboard.js rename to easy-asterisk-gui/ipphones.js diff --git a/easy-asterisk-gui/dashboard.sh b/easy-asterisk-gui/ipphones.sh similarity index 67% rename from easy-asterisk-gui/dashboard.sh rename to easy-asterisk-gui/ipphones.sh index 87bfa3e8..6f63dab1 100644 --- a/easy-asterisk-gui/dashboard.sh +++ b/easy-asterisk-gui/ipphones.sh @@ -1,19 +1,7 @@ #!/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 +# David Rowe 6 Jan 2010 +# Dashboard screen for Easy Asterisk GUI # Construct the web page ------------------------------- @@ -28,12 +16,12 @@ EOF echo "" cat << EOF -Easy Asterisk - Dashboard +Easy Asterisk - IP Phones 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 <

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

-- 2.25.1

Phone System
Phone System			Add IP Phone
Internet Connection:

Phone System

Phone System