From: horse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 5 Sep 2012 08:33:41 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@664 01035d8c-6547-0410-b346-abe4f9... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=a170c0fd42438114fe05e5c70ffa326e464b66e7;p=freetel-svn-tracking.git

git-svn-id: https://svn.code.sf.net/p/freetel/code@664 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/mini-asterisk-gui2/cgi-bin/setring.cgi b/mini-asterisk-gui2/cgi-bin/setring.cgi
index aa22a796..62758c66 100755
--- a/mini-asterisk-gui2/cgi-bin/setring.cgi
+++ b/mini-asterisk-gui2/cgi-bin/setring.cgi
@@ -37,7 +37,7 @@ sed -i "s_s,1,Dial(.*) ;; mini-asterisk_s,1,Dial($a) ;; mini-asterisk_" /etc/ast
 
 #reload extensions.conf
 
-#asterisk -rx "dialplan reload" 2>/dev/null 1 > /dev/null
+asterisk -rx "dialplan reload" 2>/dev/null 1 > /dev/null
 
  
 cat <<EOF
diff --git a/mini-asterisk-gui2/devel notes.txt b/mini-asterisk-gui2/devel notes.txt
new file mode 100644
index 00000000..82deb71c
--- /dev/null
+++ b/mini-asterisk-gui2/devel notes.txt	
@@ -0,0 +1,41 @@
+IP04 GUI2 Development notes
+Ian Roberts 
+Sept 2012
+
+Need dropbear on IP04 for file tranfer...secure copy scp
+   ipkg install dropbear
+
+
+svn propset ignore getnetwork getemergency
+
+fping 
+	reaction times 
+
+network 
+	write properties?
+
+sys info 
+	format and paging
+
+reception 
+	Had to use static button for reception update. 
+	Dynamic created button failed to fire setring.cgi
+	Escaping the & works on the IP04 but fails on devel pc linux mint. sed on diff platforms?
+
+Install script
+
+Simple Switch button for GUI2 or original.
+	The GUIs can coexist. Should have the option of switching.
+
+ntp page
+	setting times.
+
+dial tones impedance 
+	Set US or AUS
+
+Outgoing calls
+	Selectable FXO.
+
+time-based autoattendant.
+	After hours leave a message
+
diff --git a/mini-asterisk-gui2/install notes.txt b/mini-asterisk-gui2/install notes.txt
index 2f03cd9c..f4ffe892 100644
--- a/mini-asterisk-gui2/install notes.txt	
+++ b/mini-asterisk-gui2/install notes.txt	
@@ -1,35 +1,17 @@
-Installation reminders for miniasterisk GUI2 on the IP04
-(installation script could handle this stuff)
+IP04 GUI2 Install notes
+Ian Roberts 
+Sept 2012
 
+0. ipkg install fping
 
 1. Uncomment cgi support in /etc/lighttpd.conf 
 
-2. /etc/asterisk/extensions.conf         both must have "; mini_ext" tags added to the extensions
+2. Add "; mini_ext" tags to files
+   /etc/asterisk/extensions.conf
    /etc/asterisk/extensions.conf.def
 
-3. copy scripts into /www/cgi-bin
+3. copy main files to /www/mini-asterisk-gui2
 
-4. Need dropbear for scp developement
-   ipkg install dropbear
+4. copy cgi-bin scripts into /www/cgi-bin
 
-5. Rem Install fping
-
-6. svn propset ignore getnetwork getemergency
-
-7. fping reaction times 
-
-8. network write props
-
-9. sys info format and paging
-
-10. reception
-
-11. time-base dial plan 
-
-12. ntp page for setting times.
-
-13. dial tones impedance US or AUS
-
-14. Selectable FXO for outgoing.
-
-15. Target small businbess with sip phones. After hours leave a message...time-based autoattendant.
+5. point lighttpd at /www/mini-asterisk-gui2
diff --git a/mini-asterisk-gui2/phones.js b/mini-asterisk-gui2/phones.js
index cad21f9a..f78cb01d 100644
--- a/mini-asterisk-gui2/phones.js
+++ b/mini-asterisk-gui2/phones.js
@@ -40,15 +40,15 @@ function initialisePage() {
     html += '<form name="phones" method="get">';
 
     // print out analog phones
+
     html += '<tr><td colspan="4" align="left" valign="top"><h2>Phones</h2></td></tr>';
     for(var i=0; i<zap.length; i++) {
         if (zap[i] == 'FXS') {
             html += "<tr>";
 	    html += "<td>" + analog_ext[i] + "</td>" + "<td>" + "Analog Phone" + "</td>";
-//	    html += "<td>Port" + i  + "<td>" +"   <img src=" + "tick.png" + " />"+"</td>" + "</td></tr>";
-//	    html += "<td>Port" + i  + "<td>" + '<img src="tick.png" />' + "</td>" + "</td></tr>";
 	    html += "<td>Port" + i  + "</td>";
-	    //html += "<td>(Reception)</td>";
+
+            html += "<td>" + '<img src="tick.png" />' + "</td>";
 
             // the reception checkbox code
 	    html += "<td>" + '<input name="selected[]" type="checkbox" ' ;     
@@ -66,8 +66,6 @@ function initialisePage() {
 
             html += "</td>";
 	
-//	    html += "<td>(Reception)</td>";
-            html += "<td>" + '<img src="tick.png" />' + "</td>";
             html += "</tr>";
 	}
     }
@@ -109,13 +107,14 @@ function initialisePage() {
 	}
     }
 
-    // print out submit button
-	//doesn't work ... Only use static html buttons
-
     html += "<tr>";
     html += "<td>";
     html += "<a href=ipphones.html    /a>Add IP Phone";
     html += "</td>";
+
+    // print out submit button
+	//doesn't work ... Only use static html buttons
+
 /*    html += "<td>";
     html += "<input type='submit' value='Update Reception' onClick='onUpdateReception()'/>";
     html += "</td>";