pari: branch asterisknow r695 - in /branches: aadk/ aadk/config/
aadk/config/...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Wed Apr 18 09:59:02 MST 2007
Author: pari
Date: Wed Apr 18 11:59:01 2007
New Revision: 695
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=695
Log:
Merged revisions 689-694 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r689 | pari | 2007-04-17 18:00:19 -0500 (Tue, 17 Apr 2007) | 1 line
increased the font size and width of the textarea in the file editor
........
r690 | pari | 2007-04-17 18:12:41 -0500 (Tue, 17 Apr 2007) | 1 line
autofocus in file editor
........
r691 | pari | 2007-04-17 18:35:12 -0500 (Tue, 17 Apr 2007) | 1 line
feedback messages for 'Calling Rules'
........
r692 | pari | 2007-04-17 18:46:48 -0500 (Tue, 17 Apr 2007) | 1 line
Feedback messages for 'Incoming Call Rules'
........
r693 | pari | 2007-04-18 11:29:16 -0500 (Wed, 18 Apr 2007) | 1 line
(setup wizard/Calling Rules) Add heading2 mentioning that the user is dealing with calling rules in DialPlan1
........
r694 | pari | 2007-04-18 11:49:32 -0500 (Wed, 18 Apr 2007) | 1 line
increase font size in the setup wizard, add missing image
........
Added:
branches/aadk/config/setup/images/
- copied from r694, trunk/config/setup/images/
branches/aadk/config/setup/images/loading.gif
- copied unchanged from r694, trunk/config/setup/images/loading.gif
branches/asterisknow/config/setup/images/
- copied from r694, trunk/config/setup/images/
branches/asterisknow/config/setup/images/loading.gif
- copied unchanged from r694, trunk/config/setup/images/loading.gif
Modified:
branches/aadk/ (props changed)
branches/aadk/config/feditor.html
branches/aadk/config/incoming.html
branches/aadk/config/numberplan.html
branches/aadk/config/setup/5.html
branches/aadk/config/setup/8.html
branches/aadk/config/setup/setup.css
branches/asterisknow/ (props changed)
branches/asterisknow/config/feditor.html
branches/asterisknow/config/incoming.html
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/setup/5.html
branches/asterisknow/config/setup/8.html
branches/asterisknow/config/setup/setup.css
Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 18 11:59:01 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-686
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-694
Modified: branches/aadk/config/feditor.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/feditor.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/feditor.html (original)
+++ branches/aadk/config/feditor.html Wed Apr 18 11:59:01 2007
@@ -162,6 +162,7 @@
var f = this.getAttribute('context')
_$('context_edited').value = f ;
_$('context_edited').size = f.length;
+ _$('context_edited').focus();
}
@@ -177,6 +178,7 @@
_$('context_Content').value = this.CONTEXTCONTENT ;
_$('context_Content').rows = this.CONTEXTCONTENT_ROWS ;
//_$('context_edited').size = f.length;
+ _$('context_Content').focus();
}
@@ -370,12 +372,14 @@
</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>
- <td valign="top" align="center">
+ <tr>
+ <td valign="top" align="right">
<input id="save_contextContent" type=button value="Save" class="input8" onclick="update_contextContent();">
<input id="cancel_contextContent" type=button value="Cancel" class="input8" onclick="cancel_contextContent();">
</td>
+ </tr>
+ <tr>
+ <td> <textarea id="context_Content" rows=1 cols=95 class="input9"></textarea> </td>
</tr>
</table>
</div>
Modified: branches/aadk/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/incoming.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/incoming.html (original)
+++ branches/aadk/config/incoming.html Wed Apr 18 11:59:01 2007
@@ -311,6 +311,7 @@
refreshtable();
_$('userscontent').style.display = "none";
_$('bg_transparent').style.display ='none';
+ gui_feedback("Added Incoming Rule",'blue');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
@@ -385,6 +386,7 @@
_$('userscontent').style.display = "none";
_$('bg_transparent').style.display ='none';
refreshtable();
+ gui_feedback("Updated Incoming Rule",'blue');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
@@ -432,6 +434,7 @@
// add this to the global object
delete didtrunks[b][a];
refreshtable();
+ gui_feedback("Deleted 'Incoming Rule'",'default');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
Modified: branches/aadk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/numberplan.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/numberplan.html (original)
+++ branches/aadk/config/numberplan.html Wed Apr 18 11:59:01 2007
@@ -181,12 +181,14 @@
// newpriority++;
// }
//}
- add_rule_fromeditform( newpriority, oncomplete = function(){ show_npdata_table(_extv); } );
+ var msg = "Calling Rule Added." ;
+ add_rule_fromeditform( newpriority, oncomplete = function(){ show_npdata_table(_extv);gui_feedback(msg,'blue'); } );
}else{ // update exiting rule
// delete existing rule
// add rule with new values
delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){
- add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){ show_npdata_table(_extv); } );
+ var msg = "Calling Rule Updated." ;
+ add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){show_npdata_table(_extv); gui_feedback(msg,'blue');});
}
);
//$('userscontent').style.display='none';
@@ -371,7 +373,7 @@
function deletecallingrule(a,b){ // a is pattern, b is priority
if(!confirm("Are you sure ?")) { return true; }
- delete_callingrule(a,b, oncomplete = function(){ show_npdata_table( _$('extensions').value ); } ) ;
+ delete_callingrule(a,b, oncomplete = function(){ show_npdata_table( _$('extensions').value ); gui_feedback("Calling Rule Deleted",'default'); } ) ;
}
function delete_callingrule(a,b,oncomplete){ // a is pattern, b is priority
@@ -621,7 +623,7 @@
var opt = {
method: 'get',
asynchronous: true,
- onSuccess: function(t) { location.reload(); },
+ onSuccess: function(t) { gui_feedback("Created Default DialPlan",'green'); location.reload(); },
onFailure: function(t) { gui_alert("Config Error: " + t.status + ": " + t.statusText); }
};
opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
Modified: branches/aadk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/5.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/setup/5.html (original)
+++ branches/aadk/config/setup/5.html Wed Apr 18 11:59:01 2007
@@ -74,13 +74,21 @@
}
function addthe_default_callingplan(){
- t=confirm("A default Dial Plan is not found. \n" + " Do you want to create a default Dial Plan ");
- if(t == false){
- _$('status').innerHTML = "A default DialPlan is not found !! "
- + "<BR> <A href=\"#\" onclick=\"addthe_default_callingplan()\">click here</A> to create a default Dial plan";
- _$('addrule').disabled = 1;
- return true;
- }
+ gui_feedback("A default DialPlan is not found !! ", 5000 );
+ _$('table_one').style.display="none";
+ var newRow = _$('callingRulesTable').insertRow(-1);
+ var newCell0 = newRow.insertCell(0);
+ newCell0 .align = "center";
+ newCell0 .style.fontSize = "14px";
+ newCell0 .style.padding = "15px 0px 30px 0px";
+ newCell0 .innerHTML = "the default DialPlan <B>'DialPlan1'</B> is not found !! "
+ + "<BR><BR><A href=\"#\" class=\"splbutton\" onclick=\"addthe_default_callingplan2()\">Click here</A> to create 'DialPlan1'" ;
+ _$('addrule').disabled = 1;
+ _$('heading2').style.display = "none";
+}
+
+
+function addthe_default_callingplan2(){
var default_planname = 'numberplan-custom-1' ;
var uri = build_action('newcat', 0, default_planname ,"", "");
uri += build_action('append', 1, default_planname,"plancomment", "DialPlan1");
@@ -96,6 +104,7 @@
opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
var tmp = new Ajax.Request(rawman_url, opt);
}
+
trunkcallbacks.format = function(t) {
if ( t.fieldbyname['context'] != asterisk_guiTDPrefix + t.name ) {
@@ -210,6 +219,7 @@
var newRow = _$('callingRulesTable').insertRow(-1);
var newCell0 = newRow.insertCell(0);
newCell0 .align = "center";
+ newCell0 .style.fontSize = "13px";
newCell0 .innerHTML = "<BR>A <I>Calling Rule</I> is not defined<BR><BR> Please click on the 'Add a Calling Rule' button<BR> to add a Calling Rule<BR><BR>" ;
return true;
}
@@ -504,6 +514,7 @@
<!-- this page -->
<select id="extensions" style="display:none"></select>
<div class="heading">Step 5 of <script>document.write(parent.numberofsteps);</script> - Outbound Calling Rules</div>
+ <div id="heading2" style="font-size:13px; padding : 0px 0px 10px 0px;">List of Calling Rules in default dialplan - <B>DialPlan1</B> </div>
<table class="table_blacksm" cellpadding=2 cellspacing=2 border=0 align=center width=500 id="table_one">
<tr> <td width=35>S.No</td>
<td width=90>RuleName</td>
@@ -517,8 +528,7 @@
<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="display:none;" id='status'></div>
<center><input type="button" id="addrule" value="Add a Calling Rule" onclick="add_callingrule();"></center>
<div id="userscontent" STYLE="display:none; position: absolute; left: 225; top: 40; width:500; height:290; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid; z-index:5">
Modified: branches/aadk/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/8.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/setup/8.html (original)
+++ branches/aadk/config/setup/8.html Wed Apr 18 11:59:01 2007
@@ -136,6 +136,7 @@
var newRow = _$('callingRulesTable').insertRow(-1);
var newCell0 = newRow.insertCell(0);
newCell0 .align = "center";
+ newCell0 .style.fontSize = "14px";
newCell0 .innerHTML = "<BR>An <I>incoming Calling Rule</I> is not defined<BR><BR> Please click on 'Add a Incoming Rule' button<BR> to add a new incoming call rule.<BR><BR>" ;
return true;
}
@@ -146,19 +147,22 @@
var sno = _$('callingRulesTable').rows.length + 1;
var newRow = _$('callingRulesTable').insertRow(-1);
newRow.id = "row" + sno;
-
+
var newCell0 = newRow.insertCell(0);
newCell0.innerHTML = sno ;
newCell0.align="center";
newCell0.width=35;
+ newCell0.style.fontSize = "12px";
var newCell1 = newRow.insertCell(1);
- newCell1.innerHTML = convert_tohuman(a,b,c) ;
+ newCell1.innerHTML = convert_tohuman(a,b,c) ;
+ newCell1.style.fontSize = "12px";
var newCell2 = newRow.insertCell(2);
newCell2.innerHTML = "<A href=\"#\" onclick=\"edit_incomingrule('"+ a +"', '"+ b +"', '" + c + "','" + d+"')\">Edit</A> <A href=\"#\" onclick=\"delete_incomingrule('"+ a +"', '"+ b +"', '" + c + "','" + d+"')\">Delete</A>";
newCell2.width=75;
newCell2.align="center";
+ newCell2.style.fontSize = "12px";
return true;
}
@@ -171,9 +175,9 @@
}
if( a == "_X."){ // handling all unmatched
- return " Route all unmatched incoming calls from provider '" + trunk + "' to extension '" + exten[1] + "'" ;
- }
- return " Route incoming calls from provider '" + trunk + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'" ;
+ return " Route all unmatched incoming calls from provider '" + didtrunks[b].trunkname + "' to extension '" + exten[1] + "'" ;
+ }
+ return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'" ;
}
Modified: branches/aadk/config/setup/setup.css
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/setup.css?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/aadk/config/setup/setup.css (original)
+++ branches/aadk/config/setup/setup.css Wed Apr 18 11:59:01 2007
@@ -28,7 +28,7 @@
margin-top: 10px;
color: #000000;
background: #C4C4C4;
- font-size: 60%;
+ font-size: 80%;
/*font-weight: bold;*/
}
@@ -121,4 +121,19 @@
font-size: 9pt;
border:1px solid;
padding : 0px 0px 0px 3px;
-}
+}
+
+
+.splbutton {
+ font-size:12px;
+ background:#FFFFFF none repeat scroll 0%;
+ border:1px solid #8A8A8A;
+ padding:1px 5px 1px 5px; text-decoration:none;
+}
+
+.splbutton:hover {
+ background:#F3640D none repeat scroll 0%;
+ color:#FFFFFF;
+ text-decoration:none;
+}
+
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 18 11:59:01 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-686
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-694
Modified: branches/asterisknow/config/feditor.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/feditor.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/feditor.html (original)
+++ branches/asterisknow/config/feditor.html Wed Apr 18 11:59:01 2007
@@ -162,6 +162,7 @@
var f = this.getAttribute('context')
_$('context_edited').value = f ;
_$('context_edited').size = f.length;
+ _$('context_edited').focus();
}
@@ -177,6 +178,7 @@
_$('context_Content').value = this.CONTEXTCONTENT ;
_$('context_Content').rows = this.CONTEXTCONTENT_ROWS ;
//_$('context_edited').size = f.length;
+ _$('context_Content').focus();
}
@@ -370,12 +372,14 @@
</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>
- <td valign="top" align="center">
+ <tr>
+ <td valign="top" align="right">
<input id="save_contextContent" type=button value="Save" class="input8" onclick="update_contextContent();">
<input id="cancel_contextContent" type=button value="Cancel" class="input8" onclick="cancel_contextContent();">
</td>
+ </tr>
+ <tr>
+ <td> <textarea id="context_Content" rows=1 cols=95 class="input9"></textarea> </td>
</tr>
</table>
</div>
Modified: branches/asterisknow/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/incoming.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/incoming.html (original)
+++ branches/asterisknow/config/incoming.html Wed Apr 18 11:59:01 2007
@@ -311,6 +311,7 @@
refreshtable();
_$('userscontent').style.display = "none";
_$('bg_transparent').style.display ='none';
+ gui_feedback("Added Incoming Rule",'blue');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
@@ -385,6 +386,7 @@
_$('userscontent').style.display = "none";
_$('bg_transparent').style.display ='none';
refreshtable();
+ gui_feedback("Updated Incoming Rule",'blue');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
@@ -432,6 +434,7 @@
// add this to the global object
delete didtrunks[b][a];
refreshtable();
+ gui_feedback("Deleted 'Incoming Rule'",'default');
},
onFailure: function(t) {
gui_alert("Config Error: " + t.status + ": " + t.statusText);
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Wed Apr 18 11:59:01 2007
@@ -181,12 +181,14 @@
// newpriority++;
// }
//}
- add_rule_fromeditform( newpriority, oncomplete = function(){ show_npdata_table(_extv); } );
+ var msg = "Calling Rule Added." ;
+ add_rule_fromeditform( newpriority, oncomplete = function(){ show_npdata_table(_extv);gui_feedback(msg,'blue'); } );
}else{ // update exiting rule
// delete existing rule
// add rule with new values
delete_callingrule(pattern_beingedited,pattern_beingedited_priority, oncomplete = function(){
- add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){ show_npdata_table(_extv); } );
+ var msg = "Calling Rule Updated." ;
+ add_rule_fromeditform( pattern_beingedited_priority, oncomplete = function(){show_npdata_table(_extv); gui_feedback(msg,'blue');});
}
);
//$('userscontent').style.display='none';
@@ -371,7 +373,7 @@
function deletecallingrule(a,b){ // a is pattern, b is priority
if(!confirm("Are you sure ?")) { return true; }
- delete_callingrule(a,b, oncomplete = function(){ show_npdata_table( _$('extensions').value ); } ) ;
+ delete_callingrule(a,b, oncomplete = function(){ show_npdata_table( _$('extensions').value ); gui_feedback("Calling Rule Deleted",'default'); } ) ;
}
function delete_callingrule(a,b,oncomplete){ // a is pattern, b is priority
@@ -621,7 +623,7 @@
var opt = {
method: 'get',
asynchronous: true,
- onSuccess: function(t) { location.reload(); },
+ onSuccess: function(t) { gui_feedback("Created Default DialPlan",'green'); location.reload(); },
onFailure: function(t) { gui_alert("Config Error: " + t.status + ": " + t.statusText); }
};
opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
Modified: branches/asterisknow/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/5.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/setup/5.html (original)
+++ branches/asterisknow/config/setup/5.html Wed Apr 18 11:59:01 2007
@@ -74,13 +74,21 @@
}
function addthe_default_callingplan(){
- t=confirm("A default Dial Plan is not found. \n" + " Do you want to create a default Dial Plan ");
- if(t == false){
- _$('status').innerHTML = "A default DialPlan is not found !! "
- + "<BR> <A href=\"#\" onclick=\"addthe_default_callingplan()\">click here</A> to create a default Dial plan";
- _$('addrule').disabled = 1;
- return true;
- }
+ gui_feedback("A default DialPlan is not found !! ", 5000 );
+ _$('table_one').style.display="none";
+ var newRow = _$('callingRulesTable').insertRow(-1);
+ var newCell0 = newRow.insertCell(0);
+ newCell0 .align = "center";
+ newCell0 .style.fontSize = "14px";
+ newCell0 .style.padding = "15px 0px 30px 0px";
+ newCell0 .innerHTML = "the default DialPlan <B>'DialPlan1'</B> is not found !! "
+ + "<BR><BR><A href=\"#\" class=\"splbutton\" onclick=\"addthe_default_callingplan2()\">Click here</A> to create 'DialPlan1'" ;
+ _$('addrule').disabled = 1;
+ _$('heading2').style.display = "none";
+}
+
+
+function addthe_default_callingplan2(){
var default_planname = 'numberplan-custom-1' ;
var uri = build_action('newcat', 0, default_planname ,"", "");
uri += build_action('append', 1, default_planname,"plancomment", "DialPlan1");
@@ -96,6 +104,7 @@
opt.parameters= "action=updateconfig&srcfilename=" + encodeURIComponent("extensions.conf") + "&dstfilename=" + encodeURIComponent("extensions.conf") + uri;
var tmp = new Ajax.Request(rawman_url, opt);
}
+
trunkcallbacks.format = function(t) {
if ( t.fieldbyname['context'] != asterisk_guiTDPrefix + t.name ) {
@@ -210,6 +219,7 @@
var newRow = _$('callingRulesTable').insertRow(-1);
var newCell0 = newRow.insertCell(0);
newCell0 .align = "center";
+ newCell0 .style.fontSize = "13px";
newCell0 .innerHTML = "<BR>A <I>Calling Rule</I> is not defined<BR><BR> Please click on the 'Add a Calling Rule' button<BR> to add a Calling Rule<BR><BR>" ;
return true;
}
@@ -504,6 +514,7 @@
<!-- this page -->
<select id="extensions" style="display:none"></select>
<div class="heading">Step 4 of <script>document.write(parent.numberofsteps);</script> - Outbound Calling Rules</div>
+ <div id="heading2" style="font-size:13px; padding : 0px 0px 10px 0px;">List of Calling Rules in default dialplan - <B>DialPlan1</B> </div>
<table class="table_blacksm" cellpadding=2 cellspacing=2 border=0 align=center width=500 id="table_one">
<tr> <td width=35>S.No</td>
<td width=90>RuleName</td>
@@ -517,8 +528,7 @@
<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="display:none;" id='status'></div>
<center><input type="button" id="addrule" value="Add a Calling Rule" onclick="add_callingrule();"></center>
<div id="userscontent" STYLE="display:none; position: absolute; left: 225; top: 40; width:500; height:290; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid; z-index:5">
Modified: branches/asterisknow/config/setup/8.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/8.html?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/setup/8.html (original)
+++ branches/asterisknow/config/setup/8.html Wed Apr 18 11:59:01 2007
@@ -136,6 +136,7 @@
var newRow = _$('callingRulesTable').insertRow(-1);
var newCell0 = newRow.insertCell(0);
newCell0 .align = "center";
+ newCell0 .style.fontSize = "14px";
newCell0 .innerHTML = "<BR>An <I>incoming Calling Rule</I> is not defined<BR><BR> Please click on 'Add a Incoming Rule' button<BR> to add a new incoming call rule.<BR><BR>" ;
return true;
}
@@ -146,19 +147,22 @@
var sno = _$('callingRulesTable').rows.length + 1;
var newRow = _$('callingRulesTable').insertRow(-1);
newRow.id = "row" + sno;
-
+
var newCell0 = newRow.insertCell(0);
newCell0.innerHTML = sno ;
newCell0.align="center";
newCell0.width=35;
+ newCell0.style.fontSize = "12px";
var newCell1 = newRow.insertCell(1);
- newCell1.innerHTML = convert_tohuman(a,b,c) ;
+ newCell1.innerHTML = convert_tohuman(a,b,c) ;
+ newCell1.style.fontSize = "12px";
var newCell2 = newRow.insertCell(2);
newCell2.innerHTML = "<A href=\"#\" onclick=\"edit_incomingrule('"+ a +"', '"+ b +"', '" + c + "','" + d+"')\">Edit</A> <A href=\"#\" onclick=\"delete_incomingrule('"+ a +"', '"+ b +"', '" + c + "','" + d+"')\">Delete</A>";
newCell2.width=75;
newCell2.align="center";
+ newCell2.style.fontSize = "12px";
return true;
}
@@ -171,9 +175,9 @@
}
if( a == "_X."){ // handling all unmatched
- return " Route all unmatched incoming calls from provider '" + trunk + "' to extension '" + exten[1] + "'" ;
- }
- return " Route incoming calls from provider '" + trunk + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'" ;
+ return " Route all unmatched incoming calls from provider '" + didtrunks[b].trunkname + "' to extension '" + exten[1] + "'" ;
+ }
+ return " Route incoming calls from provider '" + didtrunks[b].trunkname + "' that macth pattern '" + a + "' to extension '" + exten[1] + "'" ;
}
Modified: branches/asterisknow/config/setup/setup.css
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/setup.css?view=diff&rev=695&r1=694&r2=695
==============================================================================
--- branches/asterisknow/config/setup/setup.css (original)
+++ branches/asterisknow/config/setup/setup.css Wed Apr 18 11:59:01 2007
@@ -28,7 +28,7 @@
margin-top: 10px;
color: #000000;
background: #C4C4C4;
- font-size: 60%;
+ font-size: 80%;
/*font-weight: bold;*/
}
@@ -121,4 +121,19 @@
font-size: 9pt;
border:1px solid;
padding : 0px 0px 0px 3px;
-}
+}
+
+
+.splbutton {
+ font-size:12px;
+ background:#FFFFFF none repeat scroll 0%;
+ border:1px solid #8A8A8A;
+ padding:1px 5px 1px 5px; text-decoration:none;
+}
+
+.splbutton:hover {
+ background:#F3640D none repeat scroll 0%;
+ color:#FFFFFF;
+ text-decoration:none;
+}
+
More information about the asterisk-gui-commits
mailing list