[Pkg-voip-commits] r7227 - in /asterisk-gui/trunk/debian: TODO.Debian patches/bri_signalling patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun May 17 12:50:08 2009
New Revision: 7227

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7227
Log:
Patch bri_signalling: fix labels fir BRI signalling

Added:
    asterisk-gui/trunk/debian/patches/bri_signalling
Modified:
    asterisk-gui/trunk/debian/TODO.Debian
    asterisk-gui/trunk/debian/patches/series

Modified: asterisk-gui/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/TODO.Debian?rev=7227&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/TODO.Debian (original)
+++ asterisk-gui/trunk/debian/TODO.Debian Sun May 17 12:50:08 2009
@@ -1,6 +1,1 @@
-* Replace all the graphics: 
-  - Really required? No answer from Digium so far.
 * Use jquery from libjs-jquery
-* It is OK to use https://gui-dl.digium.com/providers.js ?
-  (list of providers from the digium site, replaces providers.conf)
-  - Resolved upstream?

Added: asterisk-gui/trunk/debian/patches/bri_signalling
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/bri_signalling?rev=7227&op=file
==============================================================================
--- asterisk-gui/trunk/debian/patches/bri_signalling (added)
+++ asterisk-gui/trunk/debian/patches/bri_signalling Sun May 17 12:50:08 2009
@@ -1,0 +1,67 @@
+Add names for DAHDI BRI signalling as well.
+
+Upstream issue: https://issues.asterisk.org/view.php?id=15136
+
+--- a/config/js/hardware_dahdi.js
++++ b/config/js/hardware_dahdi.js
+@@ -216,10 +216,13 @@ var editSPAN = function(l){ // show valu
+ 		$('#switchtype_container').hide();
+ 		ASTGUI.selectbox.append(_$('editspan_fac'),'CCS/AMI', 'CCS/AMI');
+ 		//_$('editspan_signalling')
++		// FIXME: At this point we should know if the span is TE or
++		// NT and provide only the relevant signalling:
+ 		ASTGUI.selectbox.clear(_$('editspan_signalling'));
+-		ASTGUI.selectbox.append(_$('editspan_signalling'),'bri_cpe', 'bri_cpe');
+-		ASTGUI.selectbox.append(_$('editspan_signalling'),'bri_net', 'bri_net');
+-		ASTGUI.selectbox.append(_$('editspan_signalling'),'bri_cpe_ptmp', 'bri_cpe_ptmp');
++		ASTGUI.selectbox.append(_$('editspan_signalling'),'BRI PtMP - Net', 'bri_net_ptmp');
++		ASTGUI.selectbox.append(_$('editspan_signalling'),'BRI PtMP - CPE', 'bri_cpe_ptmp');
++		ASTGUI.selectbox.append(_$('editspan_signalling'),'BRI PtP - Net', 'bri_net');
++		ASTGUI.selectbox.append(_$('editspan_signalling'),'BRI PtP - CPE', 'bri_cpe');
+ 	}else{
+ 		$('#switchtype_container').show();
+ 		ASTGUI.selectbox.clear(_$('editspan_signalling'));
+@@ -302,7 +305,19 @@ var showtable = function(){ // navigates
+ 				ASTGUI.domActions.tr_addCell( newRow, {html: tmp , colspan :6, bgcolor : '#B0B9D0' , align : 'center' } );
+ 			}
+ 
+-			var singalling_defs = {pri_net: 'PRI - Net', pri_cpe: 'PRI - CPE', em: 'E & M',em_w: 'E & M -- Wink', featd:'E & M -- featd(DTMF)', fxo_ks:'FXOKS', fxo_ls:'FXOLS'  };
++			var singalling_defs = {
++				pri_net: 'PRI - Net',
++				pri_cpe: 'PRI - CPE',
++				bri_net_ptmp: 'BRI PtP - Net',
++				bri_cpe_ptmp: 'BRI PtP - CPE',
++				bri_net: 'BRI PtP - Net',
++				bri_cpe: 'BRI PtP - CPE',
++				em: 'E & M',
++				em_w: 'E & M -- Wink',
++				featd:'E & M -- featd(DTMF)',
++				fxo_ks:'FXOKS',
++				fxo_ls:'FXOLS'
++			};
+ 
+ 			var sno = tbl.rows.length + 1;
+ 			var newRow = tbl.insertRow(-1);
+--- a/config/js/hardware.js
++++ b/config/js/hardware.js
+@@ -271,7 +271,19 @@ function showtable(){ // navigates throu
+ 				ASTGUI.domActions.tr_addCell( newRow, {html: tmp , colspan :6, bgcolor : '#B0B9D0' , align : 'center' } );
+ 			}
+ 
+-			var singalling_defs = {pri_net: 'PRI - Net', pri_cpe: 'PRI - CPE', em: 'E & M',em_w: 'E & M -- Wink', featd:'E & M -- featd(DTMF)', fxo_ks:'FXOKS', fxo_ls:'FXOLS'  };
++			var singalling_defs = {
++				pri_net: 'PRI - Net',
++				pri_cpe: 'PRI - CPE',
++				bri_net_ptmp: 'BRI PtP - Net',
++				bri_cpe_ptmp: 'BRI PtP - CPE',
++				bri_net: 'BRI PtP - Net',
++				bri_cpe: 'BRI PtP - CPE',
++				em: 'E & M',
++				em_w: 'E & M -- Wink',
++				featd:'E & M -- featd(DTMF)',
++				fxo_ks:'FXOKS',
++				fxo_ls:'FXOLS'
++			};
+ 
+ 			var sno = tbl.rows.length + 1;
+ 			var newRow = tbl.insertRow(-1);

Modified: asterisk-gui/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-gui/trunk/debian/patches/series?rev=7227&op=diff
==============================================================================
--- asterisk-gui/trunk/debian/patches/series (original)
+++ asterisk-gui/trunk/debian/patches/series Sun May 17 12:50:08 2009
@@ -1,2 +1,3 @@
 trademark
 datadir_path
+bri_signalling