pari: branch asterisknow r853 - in /branches: aadk/ aadk/config/setup/ asteri...

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Wed May 2 15:51:39 MST 2007


Author: pari
Date: Wed May  2 17:51:39 2007
New Revision: 853

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=853
Log:
merge 851,852

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/setup/1.html
    branches/aadk/config/setup/3.html
    branches/aadk/config/setup/6.html
    branches/aadk/config/setup/7.html
    branches/aadk/config/setup/8.html
    branches/aadk/config/setup/setup.css
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/setup/1.html
    branches/asterisknow/config/setup/3.html
    branches/asterisknow/config/setup/4.html
    branches/asterisknow/config/setup/6.html
    branches/asterisknow/config/setup/7.html
    branches/asterisknow/config/setup/8.html
    branches/asterisknow/config/setup/setup.css

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May  2 17:51:39 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-839
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-839,851

Modified: branches/aadk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/1.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/1.html (original)
+++ branches/aadk/config/setup/1.html Wed May  2 17:51:39 2007
@@ -34,12 +34,6 @@
 var cats = new Array();
 
 function localinit(){
-	var un = _$('username') ; var pwd = _$('secret') ; 
-	un.onfocus = function(){this.className = 'input9_hilight';}
-	un.onblur = function(){this.className = 'input9';}
-	pwd.onfocus = function(){this.className = 'input9_hilight';}
-	pwd.onblur = function(){this.className = 'input9';}
-
 	parent.fxoports = [];
 	parent.fxsports = [];
 	parent.$('next').disabled = true;

Modified: branches/aadk/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/3.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/3.html (original)
+++ branches/aadk/config/setup/3.html Wed May  2 17:51:39 2007
@@ -36,12 +36,6 @@
 var prevpage = "2.html";
 
 function localinit(){
-	var focus_fields = [ 'localextenlength','userbase' ];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
 	parent._$('next').disabled = true;
 	parent._$('next').onclick = function(){	 
 		if( !_$('save').disabled ){
@@ -62,7 +56,6 @@
 	};
 	rawman_url = parent.rawman_url ;
 	parent.astmanEngine.setURL(rawman_url);
-	//_$('localextenlength').addEventListener("change", update_spae, false);
 	add_event( _$('localextenlength') , "change", update_spae );
 	ping();
 }

Modified: branches/aadk/config/setup/6.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/6.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/6.html (original)
+++ branches/aadk/config/setup/6.html Wed May  2 17:51:39 2007
@@ -45,13 +45,6 @@
 }
 
 function localinit(){
-	var focus_fields = [ 'name','maxmsg','maxmessage','maxgreet'];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
-
 	//parent.$('next').disabled = true;
 	parent._$('next').onclick = function(){	 
 		if ( _$('name').value.length==0 ){

Modified: branches/aadk/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/7.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/7.html (original)
+++ branches/aadk/config/setup/7.html Wed May  2 17:51:39 2007
@@ -195,12 +195,6 @@
 extencallbacks.eachline = true;
 
 function localinit(){
-	var focus_fields = [ 'name','fullname','secret','email','cid_number','context','zapchan'];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
 	//parent.$('next').disabled = true;
 	parent._$('next').onclick = function(){	 window.location.href="8.html"; };
 	parent._$('back').disabled = false;

Modified: branches/aadk/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/8.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/8.html (original)
+++ branches/aadk/config/setup/8.html Wed May  2 17:51:39 2007
@@ -35,7 +35,6 @@
 var old_incomingrule, old_fromprovider ;
 var edit_pattern, edit_DIDtrunk, edit_action, edit_priority ;
 var listOfExtensions = [] ;	// to store all the list of extensions to be displayed in the select menu
-var focus_fields = new Array('incomingrule','frompattern','fromprovider','toextension');
 
 user_callbacks.format = function(t, x) {
 	var tmp = asterisk_guiTDPrefix + t.name ; 
@@ -468,10 +467,6 @@
 	if ( originalRequest.responseText.match("Pong") ) {
 		showdiv_statusmessage();
 		setWindowTitle("Incoming Calls");
-		for (var x =0; x < focus_fields.length; x++ ) {
-			$(focus_fields[x]).onfocus = function(){this.className = 'input9_hilight';}
-			$(focus_fields[x]).onblur = function(){this.className = 'input9';}
-		}
 		parent.astmanEngine.config2list("users.conf", _$('users'), new Array(), user_callbacks);
 	}
 }

Modified: branches/aadk/config/setup/setup.css
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/setup.css?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/aadk/config/setup/setup.css (original)
+++ branches/aadk/config/setup/setup.css Wed May  2 17:51:39 2007
@@ -123,6 +123,9 @@
 	padding : 0px 0px 0px 3px;
 }
 
+.input9:focus {
+	background-color:#FFC58A;
+}
 
 .splbutton {
 	font-size:12px;

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May  2 17:51:39 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-848
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-852

Modified: branches/asterisknow/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/1.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/1.html (original)
+++ branches/asterisknow/config/setup/1.html Wed May  2 17:51:39 2007
@@ -34,12 +34,6 @@
 var cats = new Array();
 
 function localinit(){
-	var un = _$('username') ; var pwd = _$('secret') ; 
-	un.onfocus = function(){this.className = 'input9_hilight';}
-	un.onblur = function(){this.className = 'input9';}
-	pwd.onfocus = function(){this.className = 'input9_hilight';}
-	pwd.onblur = function(){this.className = 'input9';}
-
 	parent.fxoports = [];
 	parent.fxsports = [];
 	parent.$('next').disabled = true;

Modified: branches/asterisknow/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/3.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/3.html (original)
+++ branches/asterisknow/config/setup/3.html Wed May  2 17:51:39 2007
@@ -36,12 +36,6 @@
 var prevpage = "1.html";
 
 function localinit(){
-	var focus_fields = [ 'localextenlength','userbase' ];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
 	parent._$('next').disabled = true;
 	parent._$('next').onclick = function(){	 
 		if( !_$('save').disabled ){
@@ -62,7 +56,6 @@
 	};
 	rawman_url = parent.rawman_url ;
 	parent.astmanEngine.setURL(rawman_url);
-	//_$('localextenlength').addEventListener("change", update_spae, false);
 	add_event( _$('localextenlength') , "change", update_spae );
 	ping();
 }

Modified: branches/asterisknow/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/4.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/4.html (original)
+++ branches/asterisknow/config/setup/4.html Wed May  2 17:51:39 2007
@@ -52,7 +52,7 @@
 		asynchronous: true,
 		onSuccess: function(t) { },
 		onFailure: function(t) {
-			gui_alert("Config Error: " + t.status + ": " + t.statusText + "<BR><BR>"+ "Failed to create a DID context for " + trunk );
+			alert("Config Error: " + t.status + ": " + t.statusText + "<BR><BR>"+ "Failed to create a DID context for " + trunk );
 		}
 	};
 	opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
@@ -68,8 +68,8 @@
 		asynchronous: true,
 		onSuccess: function(t) { callbacks_savechanges_step2(); },
 		onFailure: function(t) {
-			gui_alert("Config Error: " + t.status + ": " + t.statusText);
-			gui_alert("Failed to Rename the DID context for " + old_didcontext );
+			alert("Config Error: " + t.status + ": " + t.statusText);
+			alert("Failed to Rename the DID context for " + old_didcontext );
 		}
 	};
 	opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
@@ -85,7 +85,7 @@
 		asynchronous: true,
 		onSuccess: function(t) { },
 		onFailure: function(t) {
-			gui_alert("Config Error: " + t.status + ": " + t.statusText + "<BR> Failed to delete DID context for " + trunk);
+			alert("Config Error: " + t.status + ": " + t.statusText + "<BR> Failed to delete DID context for " + trunk);
 		}
 	};
 	opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
@@ -208,21 +208,21 @@
 	var _msg3 = "When using Analog, at least one port must be selected.";
 	var _msg4 = "Please enter a Comment for this Service Provider";
 
-	if ( _tsv.checked && !_$('username').value.length ) { gui_alert(_msg1); return false; }
+	if ( _tsv.checked && !_$('username').value.length ) { alert(_msg1); return false; }
 
 	if ( _tsa.checked ) {
 		var _zapchan = _$('zapchan');
-		if( _zapchan.options.length == 0 ){ gui_alert(_msg2); return false; }
-		if (!_zapchan.value) { gui_alert( _msg3); return false; }
+		if( _zapchan.options.length == 0 ){ alert(_msg2); return false; }
+		if (!_zapchan.value) { alert( _msg3); return false; }
 	}
 	if ( _tscv.checked ) {
 		var _csv_n = _$('customvoip_name');
-		if( _csv_n.value.length == 0 ){ gui_alert( _msg4); _csv_n.focus(); return false; }
+		if( _csv_n.value.length == 0 ){ alert( _msg4); _csv_n.focus(); return false; }
 		var _cv_h = _$('customvoip_host') ; 
-		if ( !_cv_h.value ) { gui_alert("Please enter a host name"); _cv_h.focus(); return false; }
-		if ( !_cv_un.value ) { gui_alert("Please enter a Username"); _cv_un.focus(); return false; }
-	}
-	if( !_tsv.checked && !_tsa.checked && !_tscv.checked ){ gui_alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
+		if ( !_cv_h.value ) { alert("Please enter a host name"); _cv_h.focus(); return false; }
+		if ( !_cv_un.value ) { alert("Please enter a Username"); _cv_un.focus(); return false; }
+	}
+	if( !_tsv.checked && !_tsa.checked && !_tscv.checked ){ alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
 
 	if(_dvcs_v.length ==0 ){
 		ifnewtrunk();

Modified: branches/asterisknow/config/setup/6.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/6.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/6.html (original)
+++ branches/asterisknow/config/setup/6.html Wed May  2 17:51:39 2007
@@ -45,13 +45,6 @@
 }
 
 function localinit(){
-	var focus_fields = [ 'name','maxmsg','maxmessage','maxgreet'];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
-
 	//parent.$('next').disabled = true;
 	parent._$('next').onclick = function(){	 
 		if ( _$('name').value.length==0 ){

Modified: branches/asterisknow/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/7.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/7.html (original)
+++ branches/asterisknow/config/setup/7.html Wed May  2 17:51:39 2007
@@ -195,12 +195,6 @@
 extencallbacks.eachline = true;
 
 function localinit(){
-	var focus_fields = [ 'name','fullname','secret','email','cid_number','context','zapchan'];
-	for( var  r =0; r < focus_fields.length ; r++ ){
-		var d = _$(focus_fields[r]);
-		d.onfocus = function(){ this.className = 'input9_hilight'; }
-		d.onblur = function(){ this.className = 'input9'; }
-	}
 	//parent.$('next').disabled = true;
 	parent._$('next').onclick = function(){	 window.location.href="8.html"; };
 	parent._$('back').disabled = false;

Modified: branches/asterisknow/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/8.html?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/8.html (original)
+++ branches/asterisknow/config/setup/8.html Wed May  2 17:51:39 2007
@@ -35,7 +35,6 @@
 var old_incomingrule, old_fromprovider ;
 var edit_pattern, edit_DIDtrunk, edit_action, edit_priority ;
 var listOfExtensions = [] ;	// to store all the list of extensions to be displayed in the select menu
-var focus_fields = new Array('incomingrule','frompattern','fromprovider','toextension');
 
 user_callbacks.format = function(t, x) {
 	var tmp = asterisk_guiTDPrefix + t.name ; 
@@ -468,10 +467,6 @@
 	if ( originalRequest.responseText.match("Pong") ) {
 		showdiv_statusmessage();
 		setWindowTitle("Incoming Calls");
-		for (var x =0; x < focus_fields.length; x++ ) {
-			$(focus_fields[x]).onfocus = function(){this.className = 'input9_hilight';}
-			$(focus_fields[x]).onblur = function(){this.className = 'input9';}
-		}
 		parent.astmanEngine.config2list("users.conf", _$('users'), new Array(), user_callbacks);
 	}
 }

Modified: branches/asterisknow/config/setup/setup.css
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/setup.css?view=diff&rev=853&r1=852&r2=853
==============================================================================
--- branches/asterisknow/config/setup/setup.css (original)
+++ branches/asterisknow/config/setup/setup.css Wed May  2 17:51:39 2007
@@ -123,6 +123,9 @@
 	padding : 0px 0px 0px 3px;
 }
 
+.input9:focus {
+	background-color:#FFC58A;
+}
 
 .splbutton {
 	font-size:12px;



More information about the asterisk-gui-commits mailing list