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

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Thu Mar 29 11:07:57 MST 2007


Author: pari
Date: Thu Mar 29 13:07:56 2007
New Revision: 546

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=546
Log:
Merged revisions 545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r545 | pari | 2007-03-29 13:04:17 -0500 (Thu, 29 Mar 2007) | 1 line

cleanup setup wizard - few more commits will follow
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/setup/3.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/setup/3.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 29 13:07:56 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536,538,543
+/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545

Modified: branches/aadk/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/3.html?view=diff&rev=546&r1=545&r2=546
==============================================================================
--- branches/aadk/config/setup/3.html (original)
+++ branches/aadk/config/setup/3.html Thu Mar 29 13:07:56 2007
@@ -25,70 +25,70 @@
 	<link href="setup.css" media="all" rel="Stylesheet" type="text/css" />
 </HEAD>
 <script src="../scripts/prototype.js"></script>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
+<SCRIPT>
+
 var rawman_url;
 var usercallbacks = new Object;
 var fieldnames = new Array( 'save','userbase','localextenlength','allow_aliasextns');
-var widgets = new Array;
+var widgets = {};
 var go = "";
 var nextpage = "4.html";
-var prevpage = "1.html";
+var prevpage = "2.html";
 
 function localinit(){
-	parent.$('next').disabled = true;
-	parent.$('next').onclick = function(){	 
-			if( !$('save').disabled ){
-					go = nextpage;
-					$('save').click();
-			}else{
-				window.location.href=nextpage; 
-			}
-	};			
-	parent.$('back').disabled = true;
-	parent.$('back').onclick  = function(){	 
-			if( !$('save').disabled ){
-					go = prevpage;
-					$('save').click();
-			}else{
-				window.location.href=prevpage; 
-			}
+	parent._$('next').disabled = true;
+	parent._$('next').onclick = function(){	 
+		if( !_$('save').disabled ){
+			go = nextpage;
+			_$('save').click();
+		}else{
+			window.location.href=nextpage; 
+		}
+	};
+	parent._$('back').disabled = true;
+	parent._$('back').onclick  = function(){	 
+		if( !_$('save').disabled ){
+			go = prevpage;
+			_$('save').click();
+		}else{
+			window.location.href=prevpage; 
+		}
 	};
 	rawman_url = parent.rawman_url ;
 	parent.astmanEngine.setURL(rawman_url);
-	$('localextenlength').addEventListener("change", update_spae, false);
+	_$('localextenlength').addEventListener("change", update_spae, false);
 	ping();
 }
 
 function ping(){
-		var opt = {
-			method: 'get',
-			asynchronous: true,
-			onComplete: isloggedin
-		};
-		opt.parameters="action=ping" ;
-		var tmp = new Ajax.Request(rawman_url , opt);
+	var opt = {
+		method: 'get',
+		asynchronous: true,
+		onComplete: isloggedin
+	};
+	opt.parameters="action=ping" ;
+	var tmp = new Ajax.Request(rawman_url , opt);
 }
 
 function isloggedin(originalRequest){
-		if ( originalRequest.responseText.match("Error") ) {
-			// User is not logged in , show him the login screen
-			parent.window.location.href = parent.window.location.href ; 
+	if ( originalRequest.responseText.match("Error") ) {
+		// User is not logged in , show him the login screen
+		parent.window.location.href = parent.window.location.href ; 
+	}
+
+	if ( originalRequest.responseText.match("Pong") ) {
+		// read users.conf to get localextenlength and userbase
+		for (var x =0 ; x < fieldnames.length ; x++ ) {
+			widgets[fieldnames[x]] = _$(fieldnames[x]);
+			widgets[fieldnames[x]].disabled = true;
 		}
-
-		if ( originalRequest.responseText.match("Pong") ) {
-			// read users.conf to get localextenlength and userbase
-			for (var x =0 ; x < fieldnames.length ; x++ ) {
-				widgets[fieldnames[x]] = $(fieldnames[x]);
-				widgets[fieldnames[x]].disabled = true;
-			}
-			parent.astmanEngine.config2list("users.conf", $('devices'),widgets, usercallbacks);
-		}
+		parent.astmanEngine.config2list("users.conf", _$('devices'),widgets, usercallbacks);
+	}
 }
 
 usercallbacks.format =  function(t) {
 	if(t.name == "general" ){
-			return t.name;
+		return t.name;
 	}
 	return null;
 }
@@ -98,87 +98,96 @@
 }
 
 usercallbacks.beforeSaving= function(){
-		if(	$('localextenlength').value != $('userbase').value.length ){
-			alert("'length of Local Extensions' does not match \n the 'length of the Starting point of Allocation'");
-			return false;
-		}
+	if(	_$('localextenlength').value != _$('userbase').value.length ){
+		alert("'length of Local Extensions' does not match \n the 'length of the Starting point of Allocation'");
+		return false;
+	}
 	return true;
 }
 
 
 usercallbacks.loaded = function(){
-		$('localextenlength').addEventListener("change", store_extlength, false);
-		parent.astmanEngine.pollEvents();
-		$('devices').selectitem(0);
-		parent.$('next').disabled = false;	
-		parent.$('back').disabled = false;
-		if ( typeof $('devices').stored_config.catbyname['general'].fieldbyname['localextenlength'] == "undefined" ){ 
-				var opt = {
-						method: 'get',
-						asynchronous: true,
-						onSuccess: function(t) { 
-									$('localextenlength').selectedIndex = 2 ;
-									parent.localextenlength = 4 ;
-						},
-						onFailure: function(t) {
-							alert("Config Error: " + t.status + ": " + t.statusText);
-						}
-					};
-					opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent("users.conf") + "&dstfilename=" + encodeURIComponent("users.conf") + "&Action-000000=update&Cat-000000=general&Var-000000=localextenlength&Value-000000=4"; ;
-					var tmp = new Ajax.Request(rawman_url, opt);
-		}
+	_$('localextenlength').addEventListener("change", store_extlength, false);
+	parent.astmanEngine.pollEvents();
+	_$('devices').selectitem(0);
+	parent._$('next').disabled = false;	
+	parent._$('back').disabled = false;
+	if ( typeof _$('devices').stored_config.catbyname['general'].fieldbyname['localextenlength'] == "undefined" ){ 
+		var opt = {
+			method: 'get',
+			asynchronous: true,
+			onSuccess: function(t) { 
+				_$('localextenlength').selectedIndex = 2 ;
+				parent.localextenlength = 4 ;
+			},
+			onFailure: function(t) {
+				alert("Config Error: " + t.status + ": " + t.statusText);
+			}
+		};
+		opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent("users.conf") + "&dstfilename=" + encodeURIComponent("users.conf") + "&Action-000000=update&Cat-000000=general&Var-000000=localextenlength&Value-000000=4"; ;
+		var tmp = new Ajax.Request(rawman_url, opt);
+	}
 }
 
 function store_extlength(){
-	parent.localextenlength = $('localextenlength').value ;
-	parent.userbase = $('userbase').value ;
+	parent.localextenlength = _$('localextenlength').value ;
+	parent.userbase = _$('userbase').value ;
 }
 
 function update_spae(){
-		if(	$('localextenlength').value == $('userbase').value.length ) return;
-		if(	$('localextenlength').value < $('userbase').value.length ){
-				$('userbase').value = $('userbase').value.substr(0,$('localextenlength').value);
-				return;
+	if( _$('localextenlength').value == _$('userbase').value.length ) return;
+	if( _$('localextenlength').value < _$('userbase').value.length ){
+		_$('userbase').value = _$('userbase').value.substr(0,_$('localextenlength').value);
+		return;
+	}
+	if( _$('localextenlength').value > _$('userbase').value.length ){
+		while ( _$('localextenlength').value != _$('userbase').value.length  ){
+			_$('userbase').value = _$('userbase').value + "0" ;
 		}
-		if(	$('localextenlength').value > $('userbase').value.length ){
-				while ( $('localextenlength').value != $('userbase').value.length  ){
-					$('userbase').value = $('userbase').value + "0" ; 
-				}
-		}
+	}
 }
-//-->
 </SCRIPT>
 <BODY bgcolor="#FFFFFF" onload="localinit()" topmargin=0 leftmargin=0 onunload="store_extlength()">
 <table width="100%" height="100%" border=0 cellpadding=0 cellspacing=0>
-	<tr><td width="190" valign=top align=left>
-					<div id="menu">
-					<table cellpadding=3 cellspacing=2 border=0 id="sidelist">
-						<tr><td width=3></td><td>Start</td></tr>
-						<tr><td></td><td>Verify Analog Ports</td></tr>
-						<!-- <tr><td></td><td>Date & Time</td></tr> -->
-						<tr><td></td><td class="slselected">Local Extension Settings</td></tr>
-						<tr><td></td><td>Service Providers</td></tr>
-						<tr><td></td><td>Calling Rules</td></tr>
-						<tr><td></td><td>VoiceMail Settings</td></tr>
-						<tr><td></td><td>User Extensions</td></tr>
-						<tr><td></td><td>Incoming Calls</td></tr>
-						<!-- <tr><td></td><td>VoiceMenus</td></tr> -->
-						<tr><td></td><td>Finish</td></tr>
-					</table>
-					</div>
-			</td>
-			<td valign=top align=center>
-			<!--  this page -->
-					<select id="devices" style="display:none"></select> <input type=button id="save" value="Submit" style="display:none">
-					<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script>&nbsp;&nbsp;- Local Extension Settings</div>
-					<p class="subheading">	Local Extensions are <select id="localextenlength">
-																	<option value="2">2</option><option value="3">3</option><option value="4" selected>4</option><option value="5">5</option></select> digits long&nbsp;
-					</p>
-					<p class="subheading">First Extension Number : <input type=text id="userbase" size=5 dfalt="6000">	</p>
-					<p class="subheading"><input type=checkbox id="allow_aliasextns"> Allow analog phones to be assigned to multiple extensions</p>
-			<!--  this page -->
-			</td>
-		</tr>
+<tr>	<td width="190" valign=top align=left>
+		<div id="menu">
+		<table cellpadding=3 cellspacing=2 border=0 id="sidelist">
+			<tr><td width=3></td><td>Start</td></tr>
+			<tr><td></td><td>Verify Analog Ports</td></tr>
+			<tr><td></td><td>Date & Time</td></tr>
+			<tr><td></td><td class="slselected">Local Extension Settings</td></tr>
+			<tr><td></td><td>Service Providers</td></tr>
+			<tr><td></td><td>Calling Rules</td></tr>
+			<tr><td></td><td>VoiceMail Settings</td></tr>
+			<tr><td></td><td>User Extensions</td></tr>
+			<tr><td></td><td>Incoming Calls</td></tr>
+			<!-- <tr><td></td><td>VoiceMenus</td></tr> -->
+			<tr><td></td><td>Finish</td></tr>
+		</table>
+		</div>
+	</td>
+	<td valign=top align=center>
+	<!--  this page -->
+		<select id="devices" style="display:none"></select>
+		<input type=button id="save" value="Submit" style="display:none">
+		
+		<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script>&nbsp;&nbsp;- Local Extension Settings</div>
+		<p class="subheading">	Local Extensions are 
+			<select id="localextenlength">
+				<option value="2">2</option>
+				<option value="3">3</option>
+				<option value="4" selected>4</option>
+				<option value="5">5</option>
+			</select> digits long&nbsp;
+		</p>
+
+		<p class="subheading">First Extension Number : <input type=text id="userbase" size=5 dfalt="6000">	</p>
+
+		<p class="subheading"><input type=checkbox id="allow_aliasextns"> Allow analog phones to be assigned to multiple extensions</p>
+
+	<!--  this page -->
+	</td>
+</tr>
 </table>
 </BODY>
-</HTML>
+</HTML>

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 29 13:07:56 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536,538,543
+/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545

Modified: branches/asterisknow/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/3.html?view=diff&rev=546&r1=545&r2=546
==============================================================================
--- branches/asterisknow/config/setup/3.html (original)
+++ branches/asterisknow/config/setup/3.html Thu Mar 29 13:07:56 2007
@@ -25,70 +25,70 @@
 	<link href="setup.css" media="all" rel="Stylesheet" type="text/css" />
 </HEAD>
 <script src="../scripts/prototype.js"></script>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
+<SCRIPT>
+
 var rawman_url;
 var usercallbacks = new Object;
 var fieldnames = new Array( 'save','userbase','localextenlength','allow_aliasextns');
-var widgets = new Array;
+var widgets = {};
 var go = "";
 var nextpage = "4.html";
 var prevpage = "1.html";
 
 function localinit(){
-	parent.$('next').disabled = true;
-	parent.$('next').onclick = function(){	 
-			if( !$('save').disabled ){
-					go = nextpage;
-					$('save').click();
-			}else{
-				window.location.href=nextpage; 
-			}
-	};			
-	parent.$('back').disabled = true;
-	parent.$('back').onclick  = function(){	 
-			if( !$('save').disabled ){
-					go = prevpage;
-					$('save').click();
-			}else{
-				window.location.href=prevpage; 
-			}
+	parent._$('next').disabled = true;
+	parent._$('next').onclick = function(){	 
+		if( !_$('save').disabled ){
+			go = nextpage;
+			_$('save').click();
+		}else{
+			window.location.href=nextpage; 
+		}
+	};
+	parent._$('back').disabled = true;
+	parent._$('back').onclick  = function(){	 
+		if( !_$('save').disabled ){
+			go = prevpage;
+			_$('save').click();
+		}else{
+			window.location.href=prevpage; 
+		}
 	};
 	rawman_url = parent.rawman_url ;
 	parent.astmanEngine.setURL(rawman_url);
-	$('localextenlength').addEventListener("change", update_spae, false);
+	_$('localextenlength').addEventListener("change", update_spae, false);
 	ping();
 }
 
 function ping(){
-		var opt = {
-			method: 'get',
-			asynchronous: true,
-			onComplete: isloggedin
-		};
-		opt.parameters="action=ping" ;
-		var tmp = new Ajax.Request(rawman_url , opt);
+	var opt = {
+		method: 'get',
+		asynchronous: true,
+		onComplete: isloggedin
+	};
+	opt.parameters="action=ping" ;
+	var tmp = new Ajax.Request(rawman_url , opt);
 }
 
 function isloggedin(originalRequest){
-		if ( originalRequest.responseText.match("Error") ) {
-			// User is not logged in , show him the login screen
-			parent.window.location.href = parent.window.location.href ; 
+	if ( originalRequest.responseText.match("Error") ) {
+		// User is not logged in , show him the login screen
+		parent.window.location.href = parent.window.location.href ; 
+	}
+
+	if ( originalRequest.responseText.match("Pong") ) {
+		// read users.conf to get localextenlength and userbase
+		for (var x =0 ; x < fieldnames.length ; x++ ) {
+			widgets[fieldnames[x]] = _$(fieldnames[x]);
+			widgets[fieldnames[x]].disabled = true;
 		}
-
-		if ( originalRequest.responseText.match("Pong") ) {
-			// read users.conf to get localextenlength and userbase
-			for (var x =0 ; x < fieldnames.length ; x++ ) {
-				widgets[fieldnames[x]] = $(fieldnames[x]);
-				widgets[fieldnames[x]].disabled = true;
-			}
-			parent.astmanEngine.config2list("users.conf", $('devices'),widgets, usercallbacks);
-		}
+		parent.astmanEngine.config2list("users.conf", _$('devices'),widgets, usercallbacks);
+	}
 }
 
 usercallbacks.format =  function(t) {
 	if(t.name == "general" ){
-			return t.name;
+		return t.name;
 	}
 	return null;
 }
@@ -98,87 +98,96 @@
 }
 
 usercallbacks.beforeSaving= function(){
-		if(	$('localextenlength').value != $('userbase').value.length ){
-			alert("'length of Local Extensions' does not match \n the 'length of the Starting point of Allocation'");
-			return false;
-		}
+	if(	_$('localextenlength').value != _$('userbase').value.length ){
+		alert("'length of Local Extensions' does not match \n the 'length of the Starting point of Allocation'");
+		return false;
+	}
 	return true;
 }
 
 
 usercallbacks.loaded = function(){
-		$('localextenlength').addEventListener("change", store_extlength, false);
-		parent.astmanEngine.pollEvents();
-		$('devices').selectitem(0);
-		parent.$('next').disabled = false;	
-		parent.$('back').disabled = false;
-		if ( typeof $('devices').stored_config.catbyname['general'].fieldbyname['localextenlength'] == "undefined" ){ 
-				var opt = {
-						method: 'get',
-						asynchronous: true,
-						onSuccess: function(t) { 
-									$('localextenlength').selectedIndex = 2 ;
-									parent.localextenlength = 4 ;
-						},
-						onFailure: function(t) {
-							alert("Config Error: " + t.status + ": " + t.statusText);
-						}
-					};
-					opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent("users.conf") + "&dstfilename=" + encodeURIComponent("users.conf") + "&Action-000000=update&Cat-000000=general&Var-000000=localextenlength&Value-000000=4"; ;
-					var tmp = new Ajax.Request(rawman_url, opt);
-		}
+	_$('localextenlength').addEventListener("change", store_extlength, false);
+	parent.astmanEngine.pollEvents();
+	_$('devices').selectitem(0);
+	parent._$('next').disabled = false;	
+	parent._$('back').disabled = false;
+	if ( typeof _$('devices').stored_config.catbyname['general'].fieldbyname['localextenlength'] == "undefined" ){ 
+		var opt = {
+			method: 'get',
+			asynchronous: true,
+			onSuccess: function(t) { 
+				_$('localextenlength').selectedIndex = 2 ;
+				parent.localextenlength = 4 ;
+			},
+			onFailure: function(t) {
+				alert("Config Error: " + t.status + ": " + t.statusText);
+			}
+		};
+		opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent("users.conf") + "&dstfilename=" + encodeURIComponent("users.conf") + "&Action-000000=update&Cat-000000=general&Var-000000=localextenlength&Value-000000=4"; ;
+		var tmp = new Ajax.Request(rawman_url, opt);
+	}
 }
 
 function store_extlength(){
-	parent.localextenlength = $('localextenlength').value ;
-	parent.userbase = $('userbase').value ;
+	parent.localextenlength = _$('localextenlength').value ;
+	parent.userbase = _$('userbase').value ;
 }
 
 function update_spae(){
-		if(	$('localextenlength').value == $('userbase').value.length ) return;
-		if(	$('localextenlength').value < $('userbase').value.length ){
-				$('userbase').value = $('userbase').value.substr(0,$('localextenlength').value);
-				return;
+	if( _$('localextenlength').value == _$('userbase').value.length ) return;
+	if( _$('localextenlength').value < _$('userbase').value.length ){
+		_$('userbase').value = _$('userbase').value.substr(0,_$('localextenlength').value);
+		return;
+	}
+	if( _$('localextenlength').value > _$('userbase').value.length ){
+		while ( _$('localextenlength').value != _$('userbase').value.length  ){
+			_$('userbase').value = _$('userbase').value + "0" ;
 		}
-		if(	$('localextenlength').value > $('userbase').value.length ){
-				while ( $('localextenlength').value != $('userbase').value.length  ){
-					$('userbase').value = $('userbase').value + "0" ; 
-				}
-		}
+	}
 }
-//-->
 </SCRIPT>
 <BODY bgcolor="#FFFFFF" onload="localinit()" topmargin=0 leftmargin=0 onunload="store_extlength()">
 <table width="100%" height="100%" border=0 cellpadding=0 cellspacing=0>
-	<tr><td width="190" valign=top align=left>
-					<div id="menu">
-					<table cellpadding=3 cellspacing=2 border=0 id="sidelist">
-						<tr><td width=3></td><td>Start</td></tr>
-						<tr><td></td><td>Verify Analog Ports</td></tr>
-						<!-- <tr><td></td><td>Date & Time</td></tr> -->
-						<tr><td></td><td class="slselected">Local Extension Settings</td></tr>
-						<tr><td></td><td>Service Providers</td></tr>
-						<tr><td></td><td>Calling Rules</td></tr>
-						<tr><td></td><td>VoiceMail Settings</td></tr>
-						<tr><td></td><td>User Extensions</td></tr>
-						<tr><td></td><td>Incoming Calls</td></tr>
-						<!-- <tr><td></td><td>VoiceMenus</td></tr> -->
-						<tr><td></td><td>Finish</td></tr>
-					</table>
-					</div>
-			</td>
-			<td valign=top align=center>
-			<!--  this page -->
-					<select id="devices" style="display:none"></select> <input type=button id="save" value="Submit" style="display:none">
-					<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script>&nbsp;&nbsp;- Local Extension Settings</div>
-					<p class="subheading">	Local Extensions are <select id="localextenlength">
-																	<option value="2">2</option><option value="3">3</option><option value="4" selected>4</option><option value="5">5</option></select> digits long&nbsp;
-					</p>
-					<p class="subheading">First Extension Number : <input type=text id="userbase" size=5 dfalt="6000">	</p>
-					<p class="subheading"><input type=checkbox id="allow_aliasextns"> Allow analog phones to be assigned to multiple extensions</p>
-			<!--  this page -->
-			</td>
-		</tr>
+<tr>	<td width="190" valign=top align=left>
+		<div id="menu">
+		<table cellpadding=3 cellspacing=2 border=0 id="sidelist">
+			<tr><td width=3></td><td>Start</td></tr>
+			<tr><td></td><td>Verify Analog Ports</td></tr>
+			<!-- <tr><td></td><td>Date & Time</td></tr> -->
+			<tr><td></td><td class="slselected">Local Extension Settings</td></tr>
+			<tr><td></td><td>Service Providers</td></tr>
+			<tr><td></td><td>Calling Rules</td></tr>
+			<tr><td></td><td>VoiceMail Settings</td></tr>
+			<tr><td></td><td>User Extensions</td></tr>
+			<tr><td></td><td>Incoming Calls</td></tr>
+			<!-- <tr><td></td><td>VoiceMenus</td></tr> -->
+			<tr><td></td><td>Finish</td></tr>
+		</table>
+		</div>
+	</td>
+	<td valign=top align=center>
+	<!--  this page -->
+		<select id="devices" style="display:none"></select>
+		<input type=button id="save" value="Submit" style="display:none">
+		
+		<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script>&nbsp;&nbsp;- Local Extension Settings</div>
+		<p class="subheading">	Local Extensions are 
+			<select id="localextenlength">
+				<option value="2">2</option>
+				<option value="3">3</option>
+				<option value="4" selected>4</option>
+				<option value="5">5</option>
+			</select> digits long&nbsp;
+		</p>
+
+		<p class="subheading">First Extension Number : <input type=text id="userbase" size=5 dfalt="6000">	</p>
+
+		<p class="subheading"><input type=checkbox id="allow_aliasextns"> Allow analog phones to be assigned to multiple extensions</p>
+
+	<!--  this page -->
+	</td>
+</tr>
 </table>
 </BODY>
 </HTML>



More information about the asterisk-gui-commits mailing list