pari: branch asterisknow r649 - in /branches: aadk/ aadk/config/ aadk/config/...

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Wed Apr 11 15:23:11 MST 2007 

Author: pari
Date: Wed Apr 11 17:23:11 2007
New Revision: 649

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=649
Log:
merging recent changes in the trunk

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/feditor.html
    branches/aadk/config/numberplan.html
    branches/aadk/config/scripts/astman.js
    branches/aadk/config/trunks.html
    branches/aadk/config/users.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/feditor.html
    branches/asterisknow/config/numberplan.html
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/config/trunks.html
    branches/asterisknow/config/users.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 11 17:23:11 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-637
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-648

Modified: branches/aadk/config/feditor.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/feditor.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/aadk/config/feditor.html (original)
+++ branches/aadk/config/feditor.html Wed Apr 11 17:23:11 2007
@@ -35,8 +35,10 @@
 		method: 'get',
 		asynchronous: true,
 		onSuccess: function() {
+			_$('AddContext').style.display = "none";
 			_$('div_editcontext').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Deleted','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -61,8 +63,10 @@
 		method: 'get',
 		asynchronous: true,
 		onSuccess: function() {
+			_$('AddContext').style.display = "none";
 			_$('div_editcontext').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Updated','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -84,33 +88,30 @@
 	top._$('mainscreen').width= 798;
 	setWindowTitle("File Editor");
 	parent.loadscreen(this);
+	setTimeout( function(){ _$('filename').focus();}, 200);
 
 }
 
 
 function loadfile(){
 	global_fileBeingEdited = _$('filename').value ;
+	_$('AddContext').style.display = "none";
+	_$('div_filename').style.display = "";
+	_$('CurrentFileName').innerHTML = global_fileBeingEdited;
 	config2json( global_fileBeingEdited, 0, fileparsed ) ;
 }
 
 
 function showeditcontext(){
+	_$('AddContext').style.display = "none";
 	_$('div_editcontextContent').style.display = "none";
 	//move div_editcontext ontop of h_id and display it
 	var h_id = this.getAttribute('id') ;
 	global_contextBeingEdited = this.getAttribute('context');
-	
-	var tmp_left = _$(h_id).offsetLeft;
-	var tmp_top = _$(h_id).offsetTop;
-	var tmp_parent = _$(h_id);
-	while(tmp_parent.offsetParent != document.body){
-		tmp_parent = tmp_parent.offsetParent;
-		tmp_left += tmp_parent.offsetLeft;
-		tmp_top += tmp_parent.offsetTop;
-	}
-	_$('div_editcontext').style.left = tmp_left + 6;
-	_$('div_editcontext').style.top = tmp_top + 3 ;
+
+	_$(h_id).insertBefore(_$('div_editcontext'), null );
 	_$('div_editcontext').style.display = "";
+
 	var f = this.getAttribute('context')
 	_$('context_edited').value = f ;
 	_$('context_edited').size = f.length;
@@ -118,21 +119,12 @@
 
 
 function showeditcontextContent(){
+	_$('AddContext').style.display = "none";
 	_$('div_editcontext').style.display = "none";
 	var i_id = this.getAttribute('id') ;
 	global_contextBeingEdited = this.getAttribute('context');
 	
-	var tmp_left = _$(i_id).offsetLeft;
-	var tmp_top = _$(i_id).offsetTop;
-	var tmp_parent = _$(i_id);
-	while(tmp_parent.offsetParent != document.body){
-		tmp_parent = tmp_parent.offsetParent;
-		tmp_left += tmp_parent.offsetLeft;
-		tmp_top += tmp_parent.offsetTop;
-	}
-
-	_$('div_editcontextContent').style.left = tmp_left + 6;
-	_$('div_editcontextContent').style.top = tmp_top + 3 ;
+	_$(i_id).insertBefore(_$('div_editcontextContent'), null );
 	_$('div_editcontextContent').style.display = "";
 	
 	_$('context_Content').value = this.CONTEXTCONTENT ;
@@ -174,6 +166,7 @@
 		onSuccess: function() {
 			_$('div_editcontextContent').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Content Updated','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -189,6 +182,12 @@
 
 
 function fileparsed(b){
+	
+	_$('temp_holding').insertBefore(_$('div_editcontext'), null );
+	_$('temp_holding').insertBefore(_$('div_editcontextContent'), null );
+	_$('div_editcontext').style.display = "none";
+	_$('div_editcontextContent').style.display = "none";
+
 	//alert(b);
 	var zz = _$('file_output');
 	var c = eval('(' + b + ')');
@@ -212,6 +211,7 @@
 			h.style.width = '95%';
 			h.style.fontFamily = "'trebuchet ms',helvetica,sans-serif";
 			h.style.fontSize = '10pt' ;
+			var s_id = "span_" + d;
 			h.innerHTML = "  [" + d + "]";
 			zz.appendChild(h);
 			Rico.Corner.round(h_id, {compact:true});
@@ -245,24 +245,83 @@
 		}
 	}
 
-}
-
-
+
+	var space = document.createElement("div");
+	space.style.height = '50px';
+	zz.appendChild(space);
+
+}
+
+function stopBubble(b) {
+    if (!b) { b = window.event; }
+    b.cancelBubble = true;
+}
+
+function show_addcontext(){
+	_$('New_ContextName').value = "";	
+	var acb = _$('AddContextButton');
+
+	var tmp_left = acb.offsetLeft -1;
+	var tmp_top = acb.offsetTop -1 ;
+	var tmp_parent = acb;
+
+	while(tmp_parent.offsetParent != document.body){
+		tmp_parent = tmp_parent.offsetParent;
+		tmp_left += tmp_parent.offsetLeft;
+		tmp_top += tmp_parent.offsetTop;
+	}
+	_$('AddContext').style.left = tmp_left;
+	_$('AddContext').style.top = tmp_top ;
+	_$('AddContext').style.display = "" ;
+	_$('New_ContextName').focus();
+}
+
+
+function cancel_addcontext(){
+ _$('AddContext').style.display = "none";
+ _$('New_ContextName').value = "";
+}
+
+function add_context(){
+	var uri = build_action('newcat', 0, _$('New_ContextName').value ,"", "");
+
+	var opt = {
+		method: 'get',
+		asynchronous: true,
+		onSuccess: function() {
+			cancel_addcontext(); 
+			global_contextBeingEdited = "";
+			gui_feedback('New Context Added','blue');
+			config2json( global_fileBeingEdited, 0, fileparsed );
+		},
+		onFailure: function(t) {
+			gui_alert("Config Error: " + t.status + ": " + t.statusText);
+			gui_alert("Failed to Add New context ");
+		}
+	};
+	opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent(global_fileBeingEdited) + "&dstfilename=" + encodeURIComponent(global_fileBeingEdited) + uri;
+	var tmp = new Ajax.Request(asterisk_rawmanPath, opt);
+}
 </script>
 <body id="foo" onload="localajaxinit()"  bgcolor="FFFFFF" onunload="resetmainscreen();">
 <div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
 	<span style="margin-left: 4px;font-weight:bold;">File Editor</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
-	<span><input id="filename" size=15 style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;">&nbsp;<input type="button" value="Go" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="loadfile();"></span>
+	<span><input id="filename" size=15 class="input9">&nbsp;<input type="button" value="Go" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="loadfile();"></span>
+</div>
+<div style="display:none; font-size:14px; font-weight:bold; font-family:helvetica,sans-serif,'trebuchet ms'; padding : 6px 0px 6px 10px;" id="div_filename">
+	<span id="CurrentFileName"></span>&nbsp;&nbsp;
+	<a href=# class="splbutton" onclick="show_addcontext();" id="AddContextButton">Add Context</a>
 </div>
 <div id="file_output" style="height:475px;width= 770px; overflow :auto;" align="center"></div>
-<div id="div_editcontext" style="display:none; z-index:1000; position: absolute;background-color : #4D5423">
+<span id="temp_holding"></span>
+<span id="div_editcontext" style="display:none; z-index:1000; background-color : #4D5423" onclick="stopBubble(event)">
 	<input id="context_edited" size=15 class="input8">&nbsp;
 	<input id="save_context" type=button value="Save" class="input8" onclick="update_context();">&nbsp;
 	<input id="cancel_context" type=button value="Cancel" class="input8" onclick="cancel_context();">&nbsp;
 	<input id="delete_context" type=button value="Delete" class="input8" onclick="delete_context();">
-</div>
-<div id="div_editcontextContent" style="display:none; z-index:1001; position: absolute;background-color : #E0E6C4">
+</span>
+<div id="div_editcontextContent" style="display:none; z-index:1001; background-color : #E0E6C4"  onclick="stopBubble(event)">
 	<table>
 	<tr>	
 	<td>	<textarea id="context_Content" rows=1 cols=50 class="input8"></textarea>	</td>
@@ -273,4 +332,9 @@
 	</tr>
 	</table>
 </div>
+<div id="AddContext" style="display:none; position:absolute; z-index:1004; background-color : #C1D7EC; padding : 6px 6px 6px 10px;">
+Add New Context : <input id="New_ContextName" size=20 class="input9">&nbsp;
+		<input type="button" value="Add" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="add_context();">&nbsp;
+		<input type="button" value="Cancel" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="cancel_addcontext();">
+</div>
 </body>

Modified: branches/aadk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/numberplan.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/aadk/config/numberplan.html (original)
+++ branches/aadk/config/numberplan.html Wed Apr 11 17:23:11 2007
@@ -564,9 +564,9 @@
 	for( var d in c ){
 		if ( c.hasOwnProperty(d) && c[d]['context'] && (c[d]['context'] == asterisk_guiTDPrefix + d ) ) {
 			trunks_desc[d] = new Object();
-			trunks_desc[d].comment = (c[d]['trunkname']) ? c[d]['trunkname'] : d ;
+			trunks_desc[d].comment = (c[d]['trunkname']) ? unescape(c[d]['trunkname']) : d ;
 			var New_OPTION = document.createElement('option');
-			New_OPTION.text =  trunks_desc[d].comment ;
+			New_OPTION.text =  unescape(trunks_desc[d].comment) ;
 			New_OPTION.value =d ;
 			try {
 				_$('trunks').add(New_OPTION, null); // W3C way

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Wed Apr 11 17:23:11 2007
@@ -204,9 +204,9 @@
 			for ( var y in b ){ 
 				if ( b.hasOwnProperty(y) ){ 
 					if(hascomma){
-						json_data += ', "' + y + '":"' + b[y] + '"' ; 
+						json_data += ', "' + y + '":"' + escape(b[y]) + '"' ; 
 					}else{
-						json_data += '"' + y + '":"' + b[y] + '"' ; 
+						json_data += '"' + y + '":"' + escape(b[y]) + '"' ; 
 						hascomma = 1;
 					}
 				} 
@@ -1459,11 +1459,7 @@
 				if (savewidget) {
 					widgets[x].savewidget = savewidget;
 					if ((widgets[x].type == 'checkbox') || (widgets[x].type == 'radio')) {
-						widgets[x].onclick = function() {
-							this.savewidget.activateSave();
-							if (this.altonclick)
-								this.altonclick();
-						}
+						add_event( widgets[x] , 'click', function() { this.savewidget.activateSave(); if (this.altonclick){this.altonclick();} });
 						if (widgets[x].altonclick)
 							widgets[x].altonclick();
 					} else {

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Wed Apr 11 17:23:11 2007
@@ -581,7 +581,8 @@
 
 function preparemenus(){
 	var menu_div = document.getElementById('mymenu') ;
-	menu_div.style.width="90";
+	menu_div.style.width="80";
+	menu_div.style.borderColor = "#eee #bbb #bbb #ddd";
 	add_event( document.body , "click", function(){ _$('mymenu').style.display="none"; } );
 
 	var menuitem1 = document.createElement('div');
@@ -1033,7 +1034,7 @@
 </div>
 <!-- Users content DIV -->
 <!-- Codecs content DIV -->
-<div id="codecs_content" STYLE="display:none; position: absolute; left: 20; top: 125; width:350;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">
+<div id="codecs_content" STYLE="display:none; position: absolute; left: 20; top: 125; width:350; height:245;  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 , 'codecs_content');">
 	<TR bgcolor="#7E5538"  style="background-image:url('images/title_gradient.gif');">
 		<TD Height="20" align="center" style="cursor: move"><font style="color:#FFFFFF; font-size: 12px; font-weight:bold;">Codec Preferences</font></TD>

Modified: branches/aadk/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/users.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/aadk/config/users.html (original)
+++ branches/aadk/config/users.html Wed Apr 11 17:23:11 2007
@@ -241,7 +241,7 @@
 		if ( c.hasOwnProperty(d) && d.substr(0,11) == 'numberplan-'  ) {
 			var New_OPTION = document.createElement('option');
 			if(c[d]['plancomment'])
-				New_OPTION.text =  c[d]['plancomment'] ;
+				New_OPTION.text =  unescape( c[d]['plancomment'] ) ;
 			else
 				New_OPTION.text =  d ;
 			New_OPTION.value = d ;

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 11 17:23:11 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-637
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-648

Modified: branches/asterisknow/config/feditor.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/feditor.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/asterisknow/config/feditor.html (original)
+++ branches/asterisknow/config/feditor.html Wed Apr 11 17:23:11 2007
@@ -35,8 +35,10 @@
 		method: 'get',
 		asynchronous: true,
 		onSuccess: function() {
+			_$('AddContext').style.display = "none";
 			_$('div_editcontext').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Deleted','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -61,8 +63,10 @@
 		method: 'get',
 		asynchronous: true,
 		onSuccess: function() {
+			_$('AddContext').style.display = "none";
 			_$('div_editcontext').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Updated','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -84,33 +88,30 @@
 	top._$('mainscreen').width= 798;
 	setWindowTitle("File Editor");
 	parent.loadscreen(this);
+	setTimeout( function(){ _$('filename').focus();}, 200);
 
 }
 
 
 function loadfile(){
 	global_fileBeingEdited = _$('filename').value ;
+	_$('AddContext').style.display = "none";
+	_$('div_filename').style.display = "";
+	_$('CurrentFileName').innerHTML = global_fileBeingEdited;
 	config2json( global_fileBeingEdited, 0, fileparsed ) ;
 }
 
 
 function showeditcontext(){
+	_$('AddContext').style.display = "none";
 	_$('div_editcontextContent').style.display = "none";
 	//move div_editcontext ontop of h_id and display it
 	var h_id = this.getAttribute('id') ;
 	global_contextBeingEdited = this.getAttribute('context');
-	
-	var tmp_left = _$(h_id).offsetLeft;
-	var tmp_top = _$(h_id).offsetTop;
-	var tmp_parent = _$(h_id);
-	while(tmp_parent.offsetParent != document.body){
-		tmp_parent = tmp_parent.offsetParent;
-		tmp_left += tmp_parent.offsetLeft;
-		tmp_top += tmp_parent.offsetTop;
-	}
-	_$('div_editcontext').style.left = tmp_left + 6;
-	_$('div_editcontext').style.top = tmp_top + 3 ;
+
+	_$(h_id).insertBefore(_$('div_editcontext'), null );
 	_$('div_editcontext').style.display = "";
+
 	var f = this.getAttribute('context')
 	_$('context_edited').value = f ;
 	_$('context_edited').size = f.length;
@@ -118,21 +119,12 @@
 
 
 function showeditcontextContent(){
+	_$('AddContext').style.display = "none";
 	_$('div_editcontext').style.display = "none";
 	var i_id = this.getAttribute('id') ;
 	global_contextBeingEdited = this.getAttribute('context');
 	
-	var tmp_left = _$(i_id).offsetLeft;
-	var tmp_top = _$(i_id).offsetTop;
-	var tmp_parent = _$(i_id);
-	while(tmp_parent.offsetParent != document.body){
-		tmp_parent = tmp_parent.offsetParent;
-		tmp_left += tmp_parent.offsetLeft;
-		tmp_top += tmp_parent.offsetTop;
-	}
-
-	_$('div_editcontextContent').style.left = tmp_left + 6;
-	_$('div_editcontextContent').style.top = tmp_top + 3 ;
+	_$(i_id).insertBefore(_$('div_editcontextContent'), null );
 	_$('div_editcontextContent').style.display = "";
 	
 	_$('context_Content').value = this.CONTEXTCONTENT ;
@@ -174,6 +166,7 @@
 		onSuccess: function() {
 			_$('div_editcontextContent').style.display = "none"; 
 			global_contextBeingEdited = "";
+			gui_feedback('Context Content Updated','blue');
 			config2json( global_fileBeingEdited, 0, fileparsed );
 		},
 		onFailure: function(t) {
@@ -189,6 +182,12 @@
 
 
 function fileparsed(b){
+	
+	_$('temp_holding').insertBefore(_$('div_editcontext'), null );
+	_$('temp_holding').insertBefore(_$('div_editcontextContent'), null );
+	_$('div_editcontext').style.display = "none";
+	_$('div_editcontextContent').style.display = "none";
+
 	//alert(b);
 	var zz = _$('file_output');
 	var c = eval('(' + b + ')');
@@ -212,6 +211,7 @@
 			h.style.width = '95%';
 			h.style.fontFamily = "'trebuchet ms',helvetica,sans-serif";
 			h.style.fontSize = '10pt' ;
+			var s_id = "span_" + d;
 			h.innerHTML = "&nbsp;&nbsp;[" + d + "]";
 			zz.appendChild(h);
 			Rico.Corner.round(h_id, {compact:true});
@@ -245,24 +245,83 @@
 		}
 	}
 
-}
-
-
+
+	var space = document.createElement("div");
+	space.style.height = '50px';
+	zz.appendChild(space);
+
+}
+
+function stopBubble(b) {
+    if (!b) { b = window.event; }
+    b.cancelBubble = true;
+}
+
+function show_addcontext(){
+	_$('New_ContextName').value = "";	
+	var acb = _$('AddContextButton');
+
+	var tmp_left = acb.offsetLeft -1;
+	var tmp_top = acb.offsetTop -1 ;
+	var tmp_parent = acb;
+
+	while(tmp_parent.offsetParent != document.body){
+		tmp_parent = tmp_parent.offsetParent;
+		tmp_left += tmp_parent.offsetLeft;
+		tmp_top += tmp_parent.offsetTop;
+	}
+	_$('AddContext').style.left = tmp_left;
+	_$('AddContext').style.top = tmp_top ;
+	_$('AddContext').style.display = "" ;
+	_$('New_ContextName').focus();
+}
+
+
+function cancel_addcontext(){
+ _$('AddContext').style.display = "none";
+ _$('New_ContextName').value = "";
+}
+
+function add_context(){
+	var uri = build_action('newcat', 0, _$('New_ContextName').value ,"", "");
+
+	var opt = {
+		method: 'get',
+		asynchronous: true,
+		onSuccess: function() {
+			cancel_addcontext(); 
+			global_contextBeingEdited = "";
+			gui_feedback('New Context Added','blue');
+			config2json( global_fileBeingEdited, 0, fileparsed );
+		},
+		onFailure: function(t) {
+			gui_alert("Config Error: " + t.status + ": " + t.statusText);
+			gui_alert("Failed to Add New context ");
+		}
+	};
+	opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent(global_fileBeingEdited) + "&dstfilename=" + encodeURIComponent(global_fileBeingEdited) + uri;
+	var tmp = new Ajax.Request(asterisk_rawmanPath, opt);
+}
 </script>
 <body id="foo" onload="localajaxinit()"  bgcolor="FFFFFF" onunload="resetmainscreen();">
 <div style="font-size : 12px; padding : 4px 6px 4px 6px; border-style : solid none solid none; border-top-color : #BDC7E7; border-bottom-color : #182052; border-width : 1px 0px 1px 0px; background-color : #ef8700; color : #ffffff;">
 	<span style="margin-left: 4px;font-weight:bold;">File Editor</span>
 	<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" >&nbsp;<img src="images/refresh.png" title=" Refresh " border=0 >&nbsp;</span>
-	<span><input id="filename" size=15 style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;">&nbsp;<input type="button" value="Go" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="loadfile();"></span>
+	<span><input id="filename" size=15 class="input9">&nbsp;<input type="button" value="Go" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="loadfile();"></span>
+</div>
+<div style="display:none; font-size:14px; font-weight:bold; font-family:helvetica,sans-serif,'trebuchet ms'; padding : 6px 0px 6px 10px;" id="div_filename">
+	<span id="CurrentFileName"></span>&nbsp;&nbsp;
+	<a href=# class="splbutton" onclick="show_addcontext();" id="AddContextButton">Add Context</a>
 </div>
 <div id="file_output" style="height:475px;width= 770px; overflow :auto;" align="center"></div>
-<div id="div_editcontext" style="display:none; z-index:1000; position: absolute;background-color : #4D5423">
+<span id="temp_holding"></span>
+<span id="div_editcontext" style="display:none; z-index:1000; background-color : #4D5423" onclick="stopBubble(event)">
 	<input id="context_edited" size=15 class="input8">&nbsp;
 	<input id="save_context" type=button value="Save" class="input8" onclick="update_context();">&nbsp;
 	<input id="cancel_context" type=button value="Cancel" class="input8" onclick="cancel_context();">&nbsp;
 	<input id="delete_context" type=button value="Delete" class="input8" onclick="delete_context();">
-</div>
-<div id="div_editcontextContent" style="display:none; z-index:1001; position: absolute;background-color : #E0E6C4">
+</span>
+<div id="div_editcontextContent" style="display:none; z-index:1001; background-color : #E0E6C4"  onclick="stopBubble(event)">
 	<table>
 	<tr>	
 	<td>	<textarea id="context_Content" rows=1 cols=50 class="input8"></textarea>	</td>
@@ -273,4 +332,9 @@
 	</tr>
 	</table>
 </div>
+<div id="AddContext" style="display:none; position:absolute; z-index:1004; background-color : #C1D7EC; padding : 6px 6px 6px 10px;">
+Add New Context : <input id="New_ContextName" size=20 class="input9">&nbsp;
+		<input type="button" value="Add" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="add_context();">&nbsp;
+		<input type="button" value="Cancel" style="font-size: 8pt; border:1px solid; padding : 0px 0px 0px 0px;" onclick="cancel_addcontext();">
+</div>
 </body>

Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Wed Apr 11 17:23:11 2007
@@ -564,9 +564,9 @@
 	for( var d in c ){
 		if ( c.hasOwnProperty(d) && c[d]['context'] && (c[d]['context'] == asterisk_guiTDPrefix + d ) ) {
 			trunks_desc[d] = new Object();
-			trunks_desc[d].comment = (c[d]['trunkname']) ? c[d]['trunkname'] : d ;
+			trunks_desc[d].comment = (c[d]['trunkname']) ? unescape(c[d]['trunkname']) : d ;
 			var New_OPTION = document.createElement('option');
-			New_OPTION.text =  trunks_desc[d].comment ;
+			New_OPTION.text =  unescape(trunks_desc[d].comment) ;
 			New_OPTION.value =d ;
 			try {
 				_$('trunks').add(New_OPTION, null); // W3C way

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Wed Apr 11 17:23:11 2007
@@ -203,9 +203,9 @@
 			for ( var y in b ){ 
 				if ( b.hasOwnProperty(y) ){ 
 					if(hascomma){
-						json_data += ', "' + y + '":"' + b[y] + '"' ; 
+						json_data += ', "' + y + '":"' + escape(b[y]) + '"' ; 
 					}else{
-						json_data += '"' + y + '":"' + b[y] + '"' ; 
+						json_data += '"' + y + '":"' + escape(b[y]) + '"' ; 
 						hascomma = 1;
 					}
 				} 
@@ -1458,11 +1458,7 @@
 				if (savewidget) {
 					widgets[x].savewidget = savewidget;
 					if ((widgets[x].type == 'checkbox') || (widgets[x].type == 'radio')) {
-						widgets[x].onclick = function() {
-							this.savewidget.activateSave();
-							if (this.altonclick)
-								this.altonclick();
-						}
+						add_event( widgets[x] , 'click', function() { this.savewidget.activateSave(); if (this.altonclick){this.altonclick();} });
 						if (widgets[x].altonclick)
 							widgets[x].altonclick();
 					} else {

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Wed Apr 11 17:23:11 2007
@@ -581,7 +581,8 @@
 
 function preparemenus(){
 	var menu_div = document.getElementById('mymenu') ;
-	menu_div.style.width="90";
+	menu_div.style.width="80";
+	menu_div.style.borderColor = "#eee #bbb #bbb #ddd";
 	add_event( document.body , "click", function(){ _$('mymenu').style.display="none"; } );
 
 	var menuitem1 = document.createElement('div');
@@ -1033,7 +1034,7 @@
 </div>
 <!-- Users content DIV -->
 <!-- Codecs content DIV -->
-<div id="codecs_content" STYLE="display:none; position: absolute; left: 20; top: 125; width:350;  background-color:#F4EFE5;   border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">
+<div id="codecs_content" STYLE="display:none; position: absolute; left: 20; top: 125; width:350; height:245;  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 , 'codecs_content');">
 	<TR bgcolor="#7E5538"  style="background-image:url('images/title_gradient.gif');">
 		<TD Height="20" align="center" style="cursor: move"><font style="color:#FFFFFF; font-size: 12px; font-weight:bold;">Codec Preferences</font></TD>

Modified: branches/asterisknow/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/users.html?view=diff&rev=649&r1=648&r2=649
==============================================================================
--- branches/asterisknow/config/users.html (original)
+++ branches/asterisknow/config/users.html Wed Apr 11 17:23:11 2007
@@ -271,7 +271,7 @@
 		if ( c.hasOwnProperty(d) && d.substr(0,11) == 'numberplan-'  ) {
 			var New_OPTION = document.createElement('option');
 			if(c[d]['plancomment'])
-				New_OPTION.text =  c[d]['plancomment'] ;
+				New_OPTION.text =  unescape( c[d]['plancomment'] ) ;
 			else
 				New_OPTION.text =  d ;
 			New_OPTION.value = d ;

More information about the asterisk-gui-commits mailing list