pari: trunk r519 - in /trunk/config: ./ scripts/ setup/

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Wed Mar 28 16:51:17 MST 2007


Author: pari
Date: Wed Mar 28 18:51:17 2007
New Revision: 519

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=519
Log:
Part2 of commit 461 svn status

Modified:
    trunk/config/backup.html
    trunk/config/iax.html
    trunk/config/incoming.html
    trunk/config/jabber.html
    trunk/config/jingle.html
    trunk/config/localexts.html
    trunk/config/meetme.html
    trunk/config/menus.html
    trunk/config/moh.html
    trunk/config/numberplan.html
    trunk/config/options.html
    trunk/config/queues.html
    trunk/config/record.html
    trunk/config/scripts/astman.js
    trunk/config/setup/4.html
    trunk/config/setup/6.html
    trunk/config/setup/7.html
    trunk/config/setup/8.html
    trunk/config/setup/install.html
    trunk/config/sip.html
    trunk/config/status.html
    trunk/config/sysinfo.html
    trunk/config/trunks.html
    trunk/config/users.html
    trunk/config/voicemail.html
    trunk/config/zapata.html

Modified: trunk/config/backup.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/backup.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/backup.html (original)
+++ trunk/config/backup.html Wed Mar 28 18:51:17 2007
@@ -135,7 +135,7 @@
 function delete_bkp( filename ){
 	if(!confirm("Delete selected Backup Configuration ?")){ return ; }
 	parent.astmanEngine.run_tool("/bin/rm -f "+ asterisk_ConfigBkpPath + filename , callback=function(){
-		_$('status').innerHTML = " <I> Delete Request Successfull ! </I>";
+		gui_feedback('Delete Request Successfull !','default');
 		window.location.href = window.location.href ;
 	});
 }
@@ -174,6 +174,7 @@
 	var bkpfile =  _nn.value +"__" + year + month + day +".tar";
 
 	parent.astmanEngine.run_tool("/bin/tar -cf "+ asterisk_ConfigBkpPath + bkpfile +" /etc/asterisk/", callback=function(){
+			gui_feedback('Backup Successfull!','blue');
 			window.location.href = window.location.href ;
 		}
 	);
@@ -202,7 +203,6 @@
 		<div id="bkpfilesTable_div" style="height:260px;width=100%; overflow :auto; padding : 0px 0px 0px 0px;">
 			<table id="bkpfilesTable" cellpadding=2 cellspacing=1 border=0 align=center width=500></table>
 		</div>
-		<center><div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div></center>
 		<BR>
 		<div STYLE="position: absolute; left:186; top: 460;">
 			<input type="button" id="takebkp" value="Take a Backup" onclick="take_bkp();" >

Modified: trunk/config/iax.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/iax.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/iax.html (original)
+++ trunk/config/iax.html Wed Mar 28 18:51:17 2007
@@ -28,7 +28,7 @@
 <script>
 var phonecallbacks = new Object;
 var widgets = {};
-var fieldnames = ['accountcode', 'adsi', 'allow', 'amaflags', 'authdebug', 'autokill', 'bandwidth', 'bindaddr', 'bindport', 'cancel', 'codecpriority', 'delayreject', 'disallow', 'dropcount', 'forcejitterbuffer', 'iaxcompat', 'iaxmaxthreadcount', 'iaxthreadcount', 'jitterbuffer', 'jittershrinkrate', 'language', 'maxexcessbuffer', 'maxjitterbuffer', 'maxjitterinterps', 'maxregexpire', 'minexcessbuffer', 'minregexpire', 'mohinterpret', 'mohsuggest', 'nochecksums', 'regcontext', 'register', 'resyncthreshold', 'rtautoclear', 'rtcachefriends', 'rtignoreexpire', 'rtupdate', 'save', 'status', 'tos', 'trunkfreq', 'trunktimestamps'];
+var fieldnames = ['accountcode', 'adsi', 'allow', 'amaflags', 'authdebug', 'autokill', 'bandwidth', 'bindaddr', 'bindport', 'cancel', 'codecpriority', 'delayreject', 'disallow', 'dropcount', 'forcejitterbuffer', 'iaxcompat', 'iaxmaxthreadcount', 'iaxthreadcount', 'jitterbuffer', 'jittershrinkrate', 'language', 'maxexcessbuffer', 'maxjitterbuffer', 'maxjitterinterps', 'maxregexpire', 'minexcessbuffer', 'minregexpire', 'mohinterpret', 'mohsuggest', 'nochecksums', 'regcontext', 'register', 'resyncthreshold', 'rtautoclear', 'rtcachefriends', 'rtignoreexpire', 'rtupdate', 'save', 'tos', 'trunkfreq', 'trunktimestamps'];
 
 phonecallbacks.format = function(t) {
 	if(t.name.match('general'))
@@ -348,7 +348,6 @@
 </div>
 <HR>
 	<table align="center" cellpadding=0 cellspacing=0 border=0>
-		<tr><td colspan=2 align=center height=20><div  id='status'></div></td></tr>
 		<tr><td colspan=2 align=center>
 			<input type='button' id='save' value='Save' class="buttonbold">&nbsp;
 			<input type='button' id='cancel' value='Cancel' class="buttonbold">

Modified: trunk/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/incoming.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/incoming.html (original)
+++ trunk/config/incoming.html Wed Mar 28 18:51:17 2007
@@ -484,7 +484,6 @@
 	<div id="callingRulesTable_div" style="height:250px;width=100%; overflow :auto; padding : 0px 0px 0px 0px;">
 		<table id="callingRulesTable" cellpadding=2 cellspacing=1 border=0 align=center width=500></table>
 	</div>
-	<center><div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div></center><BR>
 	<center><input type="button" id="adddid" value="Add a Incoming Rule" onclick="add_incomingrule();" onmouseover="show_tooltip('en', 'incoming',0);"></center>
 	<div id="userscontent" STYLE="display:none; position: absolute; left: 20; top: 40; width:475; height:190; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">
 	<table width="100%" cellpadding=0 cellspacing=0 onmousedown="startDrag(event , 'userscontent');">

Modified: trunk/config/jabber.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/jabber.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/jabber.html (original)
+++ trunk/config/jabber.html Wed Mar 28 18:51:17 2007
@@ -28,7 +28,7 @@
 <script>
 var phonecallbacks = new Object;
 var widgets = {};
-var fieldnames = ['buddy', 'cancel', 'delete', 'name', 'new', 'port', 'save', 'secret', 'serverhost', 'status', 'statusmessage', 'timeout', 'type', 'username', 'usesasl', 'usetls'];
+var fieldnames = ['buddy', 'cancel', 'delete', 'name', 'new', 'port', 'save', 'secret', 'serverhost', 'statusmessage', 'timeout', 'type', 'username', 'usesasl', 'usetls'];
 
 phonecallbacks.format = function(t) {
 	tmp = t.name.split('general');
@@ -116,7 +116,6 @@
 					<tr>	<td class="field_text">Use SASL:</td>
 						<td><input type="checkbox" id='usesasl'></td>
 					</tr>
-					<tr>	<td colspan='2' align='center'><div style="height:15px" id='status'></div></td>	</tr>
 					</table>
 				</td>
 			</tr>

Modified: trunk/config/jingle.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/jingle.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/jingle.html (original)
+++ trunk/config/jingle.html Wed Mar 28 18:51:17 2007
@@ -28,7 +28,7 @@
 <script>
 var phonecallbacks = new Object;
 var widgets = {};
-var fieldnames = ['allow', 'cancel', 'connection', 'context', 'delete', 'disallow', 'name', 'new', 'save', 'status', 'username'];
+var fieldnames = ['allow', 'cancel', 'connection', 'context', 'delete', 'disallow', 'name', 'new', 'save', 'username'];
 
 phonecallbacks.format = function(t) {
 	var tmp = t.name.split('general');
@@ -224,10 +224,6 @@
 					<tr>	<td>Connection:</td>
 						<td><input size='12' id='connection'  class="input8"></td>
 					</tr>
-					<tr>	<td colspan='2' align='center'>
-							<div style="height:15px" id='status'></div>
-						</td>
-					</tr>
 					</table>
 				</td>
 				</tr>

Modified: trunk/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/localexts.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/localexts.html (original)
+++ trunk/config/localexts.html Wed Mar 28 18:51:17 2007
@@ -27,7 +27,7 @@
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
 <script>
 var usercallbacks = new Object;
-var fieldnames = ['allow_aliasextns', 'allow_an_extns', 'callwaiting', 'cancel', 'hasagent', 'hasdirectory', 'hasiax', 'hasmanager', 'hassip', 'hasvoicemail', 'localextenlength', 'save', 'status', 'threewaycalling', 'userbase', 'vmsecret'];
+var fieldnames = ['allow_aliasextns', 'allow_an_extns', 'callwaiting', 'cancel', 'hasagent', 'hasdirectory', 'hasiax', 'hasmanager', 'hassip', 'hasvoicemail', 'localextenlength', 'save', 'threewaycalling', 'userbase', 'vmsecret'];
 var widgets = {};
 var focus_fields = new Array('localextenlength','userbase','vmsecret');
 
@@ -196,7 +196,6 @@
 		</table>
 	</fieldset>
 	<center>
-		<div style="height:15px" id='status'></div><BR>
 		<input type=button id="save" value="Save">&nbsp;&nbsp;<input type=button id="cancel" value="Cancel">
 	</center>
 </td>

Modified: trunk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/meetme.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/meetme.html (original)
+++ trunk/config/meetme.html Wed Mar 28 18:51:17 2007
@@ -32,7 +32,7 @@
 var callbacks = new Object;
 var usercallbacks = new Object;
 var meetmecallbacks = { };
-var fieldnames = ['announce', 'cancel', 'delete', 'menu', 'music', 'name', 'newitem', 'quiet', 'record', 'room', 'save', 'setmarked', 'status', 'waitmarked'];
+var fieldnames = ['announce', 'cancel', 'delete', 'menu', 'music', 'name', 'newitem', 'quiet', 'record', 'room', 'save', 'setmarked', 'waitmarked'];
 var focus_fields = new Array('name','room', 'pin','pinadmin');
 
 function changed_extension() {
@@ -451,7 +451,6 @@
 					<td class="field_text">Announce callers</td>
 					<td><input type='checkbox' id='announce'></td>
 				</tr>
-				<tr>	<td colspan='2' align='center'><div style="height:15px" id='status'></div></td>	</tr>
 				<tr>	<td colspan='2'></td>	</tr>
 				</table>
 			</td>

Modified: trunk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/menus.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/menus.html (original)
+++ trunk/config/menus.html Wed Mar 28 18:51:17 2007
@@ -32,7 +32,7 @@
 var extencallbacks = new Object;
 var usercallbacks = new Object;
 var numcallbacks = new Object;
-var fieldnames = new Array('delete', 'status', 'new','save','cancel');
+var fieldnames = new Array('delete', 'new','save','cancel');
 var voicemenusdata = new Object;
 var current_context;
 var keys = new Array('0','1','2','3','4','5','6','7','8','9','*','#','t','i');
@@ -296,7 +296,7 @@
 			_nsa.selectedIndex = 0;
 			_$('deletestep').disabled = false;
 			_steps.selectedIndex = _steps.length - 1 ;
-			_$('status').innerHTML = "<i>New step added !</i>";
+			gui_feedback('New step added !','blue');
 			update_updown();
 			_nsv.value = "";
 			_nsv.style.display = "none" ;
@@ -399,7 +399,7 @@
 		asynchronous: true,
 		onSuccess: function() { 
 			setTimeout( function(){_$('status_message').style.display="none"; },sc_displaytime );
-			_$('status').innerHTML = "<i>Updated.</i>";
+			gui_feedback('Updated.','blue');
 			_$('savevmenu').disabled = true;
 			_$('save').disabled = true;
 			_$('cancel').disabled = true;
@@ -612,7 +612,7 @@
 			_steps.options[a].text = _steps.options[b].text;
 			_steps.options[b].text = buffer;
 			_steps.selectedIndex = b;
-			_$('status').innerHTML = "<i>Step Priority Updated!</i>";
+			gui_feedback('Step Priority Updated!','blue');
 			update_updown();
 
 		},
@@ -648,7 +648,7 @@
 				}
 			}
 			_steps.remove( _steps.selectedIndex);
-			_$('status').innerHTML = "<i>Step Deleted !</i>";
+			gui_feedback('Step Deleted !','default');
 			_$('deletestep').disabled = true;
 		},
 		onFailure: function(t) {
@@ -1183,10 +1183,6 @@
 				</div>
 				</td>
 			</tr>
-			<tr>	<td colspan=2 align="center">
-				<div style="height:15px" id='status'></div>
-				</td>
-			</tr>
 			</table>
 		</td>
 	</tr>

Modified: trunk/config/moh.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/moh.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/moh.html (original)
+++ trunk/config/moh.html Wed Mar 28 18:51:17 2007
@@ -28,7 +28,7 @@
 <script>
 var mohcallbacks = new Object;
 var widgets = {};
-var fieldnames = ['application', 'cancel', 'delete', 'directory', 'format', 'mode', 'name', 'new', 'random', 'save', 'status']; 
+var fieldnames = ['application', 'cancel', 'delete', 'directory', 'format', 'mode', 'name', 'new', 'random', 'save']; 
 
 mohcallbacks.format = function(t) {
 	return t.name;
@@ -99,7 +99,6 @@
 					<tr>	<td class="field_text">Random:</td>
 						<td><input type=checkbox id='random'></td>
 					</tr>
-					<tr>	<td colspan='2' align='center'><div style="height:15px" id='status'></div></td>	</tr>
 					</table>
 				</td>
 				</tr>

Modified: trunk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/numberplan.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/numberplan.html (original)
+++ trunk/config/numberplan.html Wed Mar 28 18:51:17 2007
@@ -31,7 +31,7 @@
 var trunks_desc = { };
 var numplan_callbacks = { };
 var numberplansdata = { };
-var fieldnames = ['cancel', 'delete', 'include', 'name', 'new', 'plancomment', 'save', 'status'];
+var fieldnames = ['cancel', 'delete', 'include', 'name', 'new', 'plancomment', 'save'];
 var focus_fields = ['beginswith', 'followedby', 'pattern', 'plancomment', 'prepend', 'rulename', 'strip', 'trunks'];
 //var default_numberplan = 0;
 var isnewrule ;
@@ -253,7 +253,7 @@
 	}}
 
 	if(rules_nosp.length > 0 ){
-		_$('status').innerHTML = "Note: A Service Provider is not defined for the Rule(s) <BR>" + rules_nosp ;
+		gui_feedback("A Service Provider is not defined for the Rule(s)<BR>" + rules_nosp,'default');
 		_trunks.selectedIndex = -1;
 	}
 
@@ -673,7 +673,6 @@
 		<div id="callingRulesTable_div" style="height:260px;width=100%; overflow :auto; padding : 0px 0px 0px 0px;">
 			<table id="callingRulesTable" cellpadding=2 cellspacing=1 border=0 align=center width=500></table>
 		</div>
-		<center><div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div></center>
 		<BR>
 		<div STYLE="position: absolute; left:186; top: 460;">
 			<input type="button" id="addrule" value="Add a Calling Rule" onclick="add_callingrule();"  onmouseover="show_tooltip('en', 'callingrules', 4);">

Modified: trunk/config/options.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/options.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/options.html (original)
+++ trunk/config/options.html Wed Mar 28 18:51:17 2007
@@ -94,7 +94,7 @@
 		asynchronous: true,
 		onSuccess: function() { 
 			_$('status_message').style.display='none';
-			_$('status').innerHTML = " <I> Configuration Saved ! </I>";
+			gui_feedback('Configuration Saved!','blue');
 			_$('save').disabled=true;
 			_$('cancel').disabled=true;
 			if( default_bindaddress != _bindaddr.value || default_port != _bindport.value ){
@@ -119,7 +119,7 @@
 		alert("Password Updated!!  \n\n You will be now redirected to the login page \n You must relogin using your new password") ;
 		window.location.href=window.location.href;
 	}else{
-		_$('status').innerHTML= originalRequest.responseText ;
+		gui_feedback(originalRequest.responseText,'default');
 		return;
 	}
 }
@@ -304,7 +304,6 @@
 		</div>
 		</td>
 	</tr>
-	<tr><td valign="top" align=center><div  id='status'></div></td></tr>
 	<tr><td></td></tr>
 </table>
 </div>

Modified: trunk/config/queues.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/queues.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/queues.html (original)
+++ trunk/config/queues.html Wed Mar 28 18:51:17 2007
@@ -36,7 +36,7 @@
 var widgets = {};
 var queueagents = new  Array;
 var queuenames = new Array;
-var fieldnames = ['agents', 'autofill', 'autopause', 'cancel', 'delete', 'fullname', 'joinempty', 'leavewhenempty', 'maxlen', 'musicclass', 'name', 'new', 'reportholdtime', 'save', 'status', 'strategy', 'timeout', 'wrapuptime'];
+var fieldnames = ['agents', 'autofill', 'autopause', 'cancel', 'delete', 'fullname', 'joinempty', 'leavewhenempty', 'maxlen', 'musicclass', 'name', 'new', 'reportholdtime', 'save', 'strategy', 'timeout', 'wrapuptime'];
 var focus_fields = ['fullname', 'maxlen', 'musicclass', 'name', 'strategy', 'timeout', 'wrapuptime'];
 var k =0;
 var j = -1; 
@@ -124,7 +124,7 @@
 		asynchronous: true,
 		onSuccess: function() { 
 			$('status_message').style.display='none';
-			$('status').innerHTML = "<i>Updated.</i>";
+			gui_feedback('Updated','blue');
 			$('new').disabled = false;
 			$('save_q').disabled = true;
 			$('save').disabled = true;
@@ -517,7 +517,6 @@
 							<div id="testmulti" style='border:1px solid; font-size: 8pt; height:75px; width: 200px;overflow :auto;'></div>
 						</td>
 					</tr>
-					<tr><td colspan='2' align='center'><div style="height:15px" id='status'></div></td></tr>
 					<tr><td colspan='2'></td></tr>
 				</table>
 			</td>

Modified: trunk/config/record.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/record.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/record.html (original)
+++ trunk/config/record.html Wed Mar 28 18:51:17 2007
@@ -137,7 +137,7 @@
 	var opt = {
 		method: 'get',
 		asynchronous: true,
-		onSuccess: function(t) { _$('status').innerHTML = " <I> Play Request Successfull ! </I>"; },
+		onSuccess: function(t) { gui_feedback('Play Request Successfull !','blue'); },
 		onFailure: function(t) { gui_alert("Config Error: " + t.status + ": " + t.statusText); }
 	};
 	opt.parameters ="action=originate&channel=Local/"+extension + "&context="+asterisk_guitools+"&exten=play_file&priority=1&Variable=var1%3d"+ encodeURIComponent( filename );
@@ -193,7 +193,7 @@
 function delete_sounds(filename){
 	if(!confirm("Delete selected file ?")){ return ; }
 	parent.astmanEngine.run_tool("/bin/rm -f "+ asterisk_menusRecord_path + filename , callback=function(){
-		_$('status').innerHTML = " <I> Delete Request Successfull ! </I>";
+		gui_feedback('Delete Request Successfull !','default');
 		window.location.href = window.location.href ;
 	});
 }
@@ -219,8 +219,6 @@
 		<div id="recfilesTable_div" style="height:260px;width=100%; overflow :auto; padding : 0px 0px 0px 0px;">
 			<table id="recfilesTable" cellpadding=2 cellspacing=1 border=0 align=center width=500></table>
 		</div>
-		<center><div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div></center>
-		<BR>
 		<div STYLE="position: absolute; left:186; top: 460;">
 			<input type="button" id="vvv" value="Record a new Voice Menu" onclick="show_record();"  onmouseover="show_tooltip('en', 'record', 0);">
 		</div>

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Wed Mar 28 18:51:17 2007
@@ -37,7 +37,7 @@
 
 function gui_feedback(a,b,c){ 
 // a is msg, b is color (optional ), c is display time in milliseconds(optional, default to asterisk_guifbt)
-	if(!b){
+	if(!b || b=='default'){
 		var b = "#DA2804"; // dark reddish brown
 	}
 	if(b=='blue'){ 
@@ -52,7 +52,7 @@
 	_g.style.color = b;
 	_g.innerHTML = a ;
 	_f.style.display = '';
-	window.setTimeout( function(){top._$('feedback_round').style.display = "none"; }, c );
+	top.window.setTimeout( function(){top._$('feedback_round').style.display = "none"; }, c );
 }
 
 
@@ -560,25 +560,25 @@
 	var tmp = box.options[box.selectedIndex].value.split(']');
 	if (tmp.length > 1) {
 		if (box.stored_config.catbyname[tmp[0]].subfields[tmp[1]].name.length < 1) {
-			if (select_item(box,"Discard new entry?") && box.widgets['status']){
-				box.widgets['status'].innerHTML = "<i>New entry cancelled!</i>";
+			if (select_item(box,"Discard new entry?")){
+				gui_feedback("New Entry cancelled!",'default') ;
 				box.selectedIndex = -1;
 			}
 		} else {
-			if (select_item(box) && box.widgets['status'])
-				box.widgets['status'].innerHTML = "<i>Changes cancelled!</i>";
+			if (select_item(box))
+				gui_feedback("Changes cancelled!",'default') ;
 		}
 	} else {
 		if (box.options[box.selectedIndex].value == "") {
-			if (select_item(box,"Discard new entry?") && box.widgets['status']){
-				box.widgets['status'].innerHTML = "<i>New entry cancelled!</i>";
+			if (select_item(box,"Discard new entry?")){
+				gui_feedback("New Entry cancelled!",'default') ;
 				//box.selectedIndex = -1;
 				if (box.callbacks.cancelnewcategory) 
 					box.callbacks.cancelnewcategory();
 			}
 		} else {
-			if (select_item(box) && box.widgets['status']){
-				box.widgets['status'].innerHTML = "<i>Changes cancelled!</i>";
+			if (select_item(box)) {
+				gui_feedback("Changes cancelled!",'default') ; 
 				if (box.callbacks.cancelchanges) 
 					box.callbacks.cancelchanges();
 			}
@@ -622,8 +622,7 @@
 //			if(action_issuccess(t.responseText) ){
 				if (box.callbacks.oncategorydelete) 
 					box.callbacks.oncategorydelete(value);
-				if (box.widgets['status']) 
-					box.widgets['status'].innerHTML = "<i>Deleted.</i>";
+				gui_feedback('Deleted','default');
 				if (box.callbacks.delchanges)
 					box.callbacks.delchanges(box, box.delvalue, box.delcat);
 //			}else{
@@ -673,8 +672,7 @@
 			}
 		}
 		if (updatebox && oldname == "") {
-			if (box.widgets['status']) 
-				box.widgets['status'].innerHTML = "<i>Deleted.</i>";
+				gui_feedback('Deleted','default');
 		} else {
 			uri = build_action('delete', 0, tmp[0], subname, "", suborig);
 			opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent(box.config_file) + "&dstfilename=" +
@@ -694,8 +692,7 @@
 		delete box.stored_config.catbyname[value];
 		--box.stored_config.catcnt;
 		if (updatebox && box.options[box.selectedIndex].value == "") {
-			if (box.widgets['status']) 
-				box.widgets['status'].innerHTML = "<i>Deleted.</i>";
+				gui_feedback('Deleted','default');
 		} else {
 			uri = build_action('delcat', 0, value, "", "");
 			opt.parameters="action=updateconfig&srcfilename=" + encodeURIComponent(box.config_file) + "&dstfilename=" +
@@ -763,8 +760,7 @@
 		box.widgets['delete'].disabled = false;
 	if (box.widgets['cancel'])
 		box.widgets['cancel'].disabled = false;
-	if (box.widgets['status']) 
-		box.widgets['status'].innerHTML = "<i>Creating new entry!</i>";
+	gui_feedback('Creating new entry!','green');
 	if (box.widgets['name']){
 		box.widgets['name'].value = name;
 		//box.widgets['name'].focus();
@@ -821,8 +817,7 @@
 		box.widgets['delete'].disabled = false;
 	if (box.widgets['cancel'])
 		box.widgets['cancel'].disabled = false;
-	if (box.widgets['status']) 
-		box.widgets['status'].innerHTML = "<i>Creating new entry!</i>";
+	gui_feedback('Creating new entry!','green');
 	if (box.widgets['name'])
 		box.widgets['name'].value = name;
 }
@@ -840,8 +835,7 @@
 				box.widgets['newitem'].disabled = false;
 			if (box.widgets['cancel'])
 				box.widgets['cancel'].disabled = true;
-			if (box.widgets['status']) 
-				box.widgets['status'].innerHTML = "<i>Configuration saved!</i>";
+			gui_feedback('Configuration saved!','blue');
 			if (box.callbacks.savechanges)
 				box.callbacks.savechanges();
 		},
@@ -875,8 +869,7 @@
 				box.widgets['newitem'].disabled = false;
 			if (box.widgets['cancel'])
 				box.widgets['cancel'].disabled = true;
-			if (box.widgets['status']) 
-				box.widgets['status'].innerHTML = "<i>Configuration saved!</i>";
+			gui_feedback('Configuration saved!','blue');
 			if (box.callbacks.savechanges)
 				box.callbacks.savechanges();
 		},
@@ -985,7 +978,7 @@
 	}
 	if (!uri.length) {
 		if (!box.callbacks.savechanges || !box.callbacks.savechanges()) {
-			if (box.widgets['status']){  box.widgets['status'].innerHTML = "<i>No changes made!</i>"; }
+			 gui_feedback('No changes made!','green');
 		}
 		if (box.widgets['save']){  box.widgets['save'].disabled = true; }
 		if (box.widgets['cancel']) { box.widgets['cancel'].disabled = true; }
@@ -1284,7 +1277,7 @@
 		
 		for (var x in widgets) {  if( widgets.hasOwnProperty(x) ){
 			var src;
-			if ((x == 'save') || (x == 'cancel') || (x == 'name') || (x == 'new') || (x == 'newitem') || (x == 'status') || (x == 'delete'))
+			if ((x == 'save') || (x == 'cancel') || (x == 'name') || (x == 'new') || (x == 'newitem') || (x == 'delete'))
 				continue;
 			if (widgets[x].name)
 				src = widgets[x].name;
@@ -1353,11 +1346,8 @@
 		var thevalue;
 		var savewidget = widgets['save'];
 		var cancelwidget = widgets['cancel'];
-		var statuswidget = widgets['status'];
 		if (savewidget) {
 			savewidget.activateSave = function(t) {
-				if (this.statuswidget)
-					this.statuswidget.innerHTML = '';
 				savewidget.disabled = false;
 				if (savewidget.cancelwidget) {
 					savewidget.cancelwidget.disabled = false;
@@ -1371,7 +1361,7 @@
 		}
 		for (var x in widgets) { if( widgets.hasOwnProperty(x) ){
 			var src;
-			if ((x == 'save') || (x == 'cancel') || (x == 'new') || (x == 'newitem') || (x == 'status') || (x == 'delete'))
+			if ((x == 'save') || (x == 'cancel') || (x == 'new') || (x == 'newitem') || (x == 'delete'))
 				continue;
 			if (widgets[x].name)
 				src = widgets[x].name;
@@ -1415,7 +1405,6 @@
 
 				if (savewidget) {
 					widgets[x].savewidget = savewidget;
-					widgets[x].statuswidget = statuswidget;
 					widgets[x].onclick = function() {
 						this.oldvalue = this.value;
 						return true;
@@ -1469,7 +1458,6 @@
 
 				if (savewidget) {
 					widgets[x].savewidget = savewidget;
-					widgets[x].statuswidget = statuswidget;
 					if ((widgets[x].type == 'checkbox') || (widgets[x].type == 'radio')) {
 						widgets[x].onclick = function() {
 							this.savewidget.activateSave();
@@ -1488,11 +1476,9 @@
 							pattern = this.getAttribute('pattern');
 							if (pattern && check_pattern(pattern, this.oldvalue) && !check_pattern(pattern, this.value)) {
 								this.value = this.oldvalue;
-								if (widgets['status']) 
-									widgets['status'].innerHTML = "<font size='-1' color=red>Invalid Character !</font>";
+								gui_feedback('Invalid Character !','red');
 							} else{
-								if (widgets['status']) 
-									widgets['status'].innerHTML = "";
+								gui_feedback('','default',10);
 								this.savewidget.activateSave();
 							}
 							return true;
@@ -1535,8 +1521,6 @@
 				widgets[x].innerHTML = thevalue;
 			}
 		}}
-		if (widgets['status']) 
-			widgets['status'].innerHTML = "";
 	};
 	this.doConfig = function(t, box) {
 		if( t[0].headers['message'] && t[0].headers['message'] == "Config file not found" ){
@@ -1707,10 +1691,6 @@
 				delete_item(this.hostselectbox);
 			}
 		}
-		if (widgets['status']) {
-			widgets['status'].disabled = false;
-		}
-		
 		tmp = new Ajax.Request(this.url, opt);
 	};
 

Modified: trunk/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/4.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/setup/4.html (original)
+++ trunk/config/setup/4.html Wed Mar 28 18:51:17 2007
@@ -36,7 +36,7 @@
 var phonecallbacks = new Object;
 var providercallbacks = new Object;
 var globalvars = new Object;
-var fieldnames = ['callerid', 'cancel', 'context', 'delete', 'dialformat', 'fromdomain', 'fromuser', 'group', 'hasexten', 'hasiax', 'hassip', 'host', 'host', 'insecure', 'name', 'new', 'provider', 'registeriax', 'registersip', 'save', 'secret', 'status', 'trunkname', 'trunkstyleanalog', 'trunkstylecustomvoip', 'trunkstylevoip', 'username', 'zapchan'];
+var fieldnames = ['callerid', 'cancel', 'context', 'delete', 'dialformat', 'fromdomain', 'fromuser', 'group', 'hasexten', 'hasiax', 'hassip', 'host', 'host', 'insecure', 'name', 'new', 'provider', 'registeriax', 'registersip', 'save', 'secret', 'trunkname', 'trunkstyleanalog', 'trunkstylecustomvoip', 'trunkstylevoip', 'username', 'zapchan'];
 
 var provfieldnames = new Array('providerdesc', 'providerlogo');
 var isnewtrunk;
@@ -740,7 +740,6 @@
 <table id="serviceproviderstable" cellpadding=2 cellspacing=1 border=0 align=center width=500>
 </table>
 </div>
-<div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div>
 <input type='button' id='new' value='Add Service Provider'>
 </center>
 
@@ -787,7 +786,6 @@
 				<div id='voip' style='display:none' align="center">
 						<table align="center"  class="font85">
 						<tr><td style='width:80px' valign='top' class="field_text">Provider:</td><td><select size='4' id='provider' style='width:200px' altonchange='selectprovider()' class="input8"></select></td></tr>
-						<tr><td colspan='2' align='center'><div style="height:15px" id='status'></div></td></tr>
 						<tr><td colspan='2' align='center' id='providerlogo_image'></td></tr>
 						<tr><td colspan='2' align='center'><div id='providerdesc' align='left' style='width:230px;height:100px; font-size:10px'></div></td></tr>
 						<tr><td class="field_text">Username:</td><td><input size='20' id='username' class="input8"></td></tr>

Modified: trunk/config/setup/6.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/6.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/setup/6.html (original)
+++ trunk/config/setup/6.html Wed Mar 28 18:51:17 2007
@@ -32,7 +32,7 @@
 var vmexten='';
 var voicemailcallbacks = new Object;
 var callbacks = new Object;
-var vmfields = ['attach', 'cancel', 'maxgreet', 'maxmessage', 'maxmsg', 'save', 'status'];
+var vmfields = ['attach', 'cancel', 'maxgreet', 'maxmessage', 'maxmsg', 'save'];
 var fields = new Array('name');
 var vmwidgets = new Array;
 var widgets = new Array;
@@ -296,7 +296,6 @@
 							</td>
 					</tr>
 					<tr><td>Max&nbsp;greeting&nbsp;(seconds)</td><td>&nbsp;<input size=4 id='maxgreet' pattern='^\d*$' class="input8" dfalt=60></td></tr>
-					<tr><td colspan='2' align='center'><div style="height:15px" id='status'></div></td></tr>
 			</table>					
 			<div style="display:none"><input type='button' id='save' value='Save'>&nbsp;<input type='button' id='cancel' value='Cancel'></div>
 			<!--  this page -->

Modified: trunk/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/7.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/setup/7.html (original)
+++ trunk/config/setup/7.html Wed Mar 28 18:51:17 2007
@@ -36,7 +36,7 @@
 var phonecallbacks = new Object;
 var numcallbacks = new Object;
 var extencallbacks = new Object;
-var fieldnames = ['callwaiting', 'cancel', 'cid_number', 'context', 'delete', 'email', 'fullname', 'group', 'hasagent', 'hasdirectory', 'hasiax', 'hasmanager', 'hassip', 'hasvoicemail', 'host', 'mailbox', 'name', 'new', 'save', 'secret', 'status', 'threewaycalling', 'zapchan'];
+var fieldnames = ['callwaiting', 'cancel', 'cid_number', 'context', 'delete', 'email', 'fullname', 'group', 'hasagent', 'hasdirectory', 'hasiax', 'hasmanager', 'hassip', 'hasvoicemail', 'host', 'mailbox', 'name', 'new', 'save', 'secret', 'threewaycalling', 'zapchan'];
 
 var allow_aliasextns;
 
@@ -438,7 +438,7 @@
 				</table>
 				<table id="userstable" cellpadding=2 cellspacing=1 border=0 align=center width=600>
 				</table>
-				<div style="height:25px" id='status'></div>
+				<div style="height:25px"></div>
 				<input type='button' id='new' value='Add User Extension'>
 			<!--  this page -->
 			</td>

Modified: trunk/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/8.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/setup/8.html (original)
+++ trunk/config/setup/8.html Wed Mar 28 18:51:17 2007
@@ -528,7 +528,6 @@
 			</div>
 		</font>
 
-		<center><div style="height:25px;color: #FF0000;" id='status'  class="field_text9"></div></center>
 		<BR>
 		<center><input type="button" id="adddid" value="Add a Incoming Rule" onclick="add_incomingrule();"></center>
 		<div id="userscontent" STYLE="display:none; position: absolute; left: 227; top: 70; width:475; height:190;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">

Modified: trunk/config/setup/install.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/install.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/setup/install.html (original)
+++ trunk/config/setup/install.html Wed Mar 28 18:51:17 2007
@@ -28,8 +28,7 @@
 <script src="../scripts/prototype.js"></script>
 <script src="../scripts/astman.js"></script>
 <script>
-var rawman_url = "../../../rawman";
-var asterisk_guitools = "asterisk_guitools";
+var rawman_url = "../" + asterisk_rawmanPath;
 var fxoports = new Array();
 var fxsports = new Array();
 var numberofsteps = 7;
@@ -47,7 +46,7 @@
 	}
 }
 
-astmanEngine.setURL('../../rawman');
+astmanEngine.setURL(rawman_url);
 astmanEngine.setEventCallback(eventeater.eventcb);
 </script>
 <body onload="localinit()" topmargin=0  bgcolor="FFFFFF">
@@ -55,7 +54,11 @@
 	<TR><TD height=70 bgcolor="#EFEFEF" align="center">
 		<TABLE cellpadding=0 cellspacing=0 border=0 width=780 align="center" >
 		<TR><TD><IMG src="digiumlogo.gif" border=0></TD>
-		    <TD><FONT SIZE="+1" COLOR="#666666">Welcome to Asterisk GUI setup wizard</FONT></TD>
+			<TD align="center">	<FONT SIZE="+1" COLOR="#666666">Welcome to Asterisk GUI setup wizard</FONT>
+				<div id="feedback_round" style="display:none;background-color: #EFEFEF; width:400px" align="center">
+					<div align="center" id='feedback' style="font-family: Arial, sans-serif, Helvetica, Trebuchet MS ;font-size: 13px;font-weight : bold;"></div>
+				</div>
+			</TD>
 		</TR>
 		</TABLE>
 	     </TD>

Modified: trunk/config/sip.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/sip.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/sip.html (original)
+++ trunk/config/sip.html Wed Mar 28 18:51:17 2007
@@ -28,7 +28,7 @@
 <script>
 var phonecallbacks = new Object;
 var widgets = {};
-var fieldnames = ['allow' ,'allowexternaldomains' ,'allowexternalinvites' ,'allowguest' ,'allowoverlap' ,'allowsubscribe' ,'allowtransfer' ,'alwaysauthreject' ,'autodomain' ,'bindaddr' ,'bindport' ,'callevents' ,'cancel' ,'canreinvite' ,'checkmwi' ,'compactheaders' ,'context' ,'defaultexpiry' ,'disallow' ,'domain' ,'domain' ,'dtmfmode' ,'dumphistory' ,'externhost' ,'externip' ,'externrefresh' ,'fromdomain' ,'g726nonstandard' ,'ignoreregexpire' ,'jbenable' ,'jbforce' ,'jbimpl' ,'jblog' ,'jbmaxsize' ,'jbresyncthreshold' ,'language' ,'localnet' ,'maxcallbitrate' ,'maxexpiry' ,'minexpiry' ,'mohinterpret' ,'mohsuggest' ,'nat' ,'notifymimetype' ,'notifyringing' ,'pedantic' ,'progressinband' ,'promiscredir' ,'realm' ,'recordhistory' ,'register' ,'registerattempts' ,'registertimeout' ,'relaxdtmf' ,'rtautoclear' ,'rtcachefriends' ,'rtpholdtimeout' ,'rtptimeout' ,'rtsavesysname' ,'rtupdate' ,'save' ,'sendrpid' ,'sipdebug' ,'srvlookup' ,'status' ,'subscribecontext' ,'t1min' ,'t38pt_udp
 tl' ,'tos_audio' ,'tos_sip' ,'tos_video' ,'trustrpid' ,'useragent' ,'usereqphone' ,'videosupport'] ;
+var fieldnames = ['allow' ,'allowexternaldomains' ,'allowexternalinvites' ,'allowguest' ,'allowoverlap' ,'allowsubscribe' ,'allowtransfer' ,'alwaysauthreject' ,'autodomain' ,'bindaddr' ,'bindport' ,'callevents' ,'cancel' ,'canreinvite' ,'checkmwi' ,'compactheaders' ,'context' ,'defaultexpiry' ,'disallow' ,'domain' ,'domain' ,'dtmfmode' ,'dumphistory' ,'externhost' ,'externip' ,'externrefresh' ,'fromdomain' ,'g726nonstandard' ,'ignoreregexpire' ,'jbenable' ,'jbforce' ,'jbimpl' ,'jblog' ,'jbmaxsize' ,'jbresyncthreshold' ,'language' ,'localnet' ,'maxcallbitrate' ,'maxexpiry' ,'minexpiry' ,'mohinterpret' ,'mohsuggest' ,'nat' ,'notifymimetype' ,'notifyringing' ,'pedantic' ,'progressinband' ,'promiscredir' ,'realm' ,'recordhistory' ,'register' ,'registerattempts' ,'registertimeout' ,'relaxdtmf' ,'rtautoclear' ,'rtcachefriends' ,'rtpholdtimeout' ,'rtptimeout' ,'rtsavesysname' ,'rtupdate' ,'save' ,'sendrpid' ,'sipdebug' ,'srvlookup' ,'subscribecontext' ,'t1min' ,'t38pt_udptl' ,'tos_
 audio' ,'tos_sip' ,'tos_video' ,'trustrpid' ,'useragent' ,'usereqphone' ,'videosupport'] ;
 
 phonecallbacks.format = function(t) { 
 	tmp = t.name.split('general');
@@ -621,7 +621,6 @@
 </div>
 <HR>
 	<table align="center" cellpadding=0 cellspacing=0>
-	<tr><td colspan=2 align=center height=20><div  id='status'></div></td></tr>
 	<tr><td colspan=2 align=center><input type='button' id='save' value='Save' class="buttonbold">&nbsp;<input type='button' id='cancel' value='Cancel' class="buttonbold"></td></tr>
 	</table>
 </div>

Modified: trunk/config/status.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/status.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/status.html (original)
+++ trunk/config/status.html Wed Mar 28 18:51:17 2007
@@ -38,7 +38,7 @@
 
 function afterHangup(){
 	refreshChannelsList();
-	_$('status').innerHTML = "Hungup " + hungupchan;
+	gui_feedback("Hungup " + hungupchan,'default');
 }
 
 
@@ -63,14 +63,14 @@
 
 function afterTransfer(){
 	refreshChannelsList();
-	_$('status').innerHTML = "Transferred " + transferredchan;
+	gui_feedback("Transferred " + transferredchan,'default');
 }
 
 function refreshChannelsList() {
 	selectedchan = null;
 	_$('transfer').disabled = 1;
 	_$('hangup').disabled = 1;
-	_$('status').innerHTML = "<i>Updating channel status...</i>";
+	gui_feedback('Updating channel status...','green',1500);
 	parent.astmanEngine.channelClear();
 	parent.astmanEngine.sendRequest('action=status', onStatusCheck);
 	updateButtons();
@@ -84,7 +84,7 @@
 	for (i=1;i<msgs.length - 1;i++) 
 		parent.astmanEngine.channelUpdate(msgs[i]);
 	_$('channellist').innerHTML = parent.astmanEngine.channelTable(channelsCallback);
-	_$('status').innerHTML = "Ready";
+	gui_feedback('Ready','blue',4000);
 }
 
 
@@ -135,9 +135,7 @@
 <div class="mainscreenContentBox" id="userscontent">
 <table class="mainscreenTable" align="center">
 	<tr valign="top" height="18">
-		<td>
-		Active Channels: <div  id='status'></div>
-		</td>
+		<td> Active Channels: </td>
 	</tr>
 	<tr height=32 valign="middle">
 		<td align="center">

Modified: trunk/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/sysinfo.html?view=diff&rev=519&r1=518&r2=519
==============================================================================
--- trunk/config/sysinfo.html (original)
+++ trunk/config/sysinfo.html Wed Mar 28 18:51:17 2007
@@ -220,11 +220,6 @@
 		</div>
 	</td>
 	</tr>
-	<tr>
-	<td valign="top" align=center>
-		<div  id='status'></div>
-	</td>
-	</tr>
 	<tr><td></td></tr>
 </table>
 </div>

Modified: trunk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/trunks.html?view=diff&rev=519&r1=518&r2=519

[... 98 lines stripped ...]


More information about the asterisk-gui-commits mailing list