pari: branch asterisknow r749 - in /branches: aadk/ aadk/config/
aadk/config/...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Tue Apr 24 14:49:29 MST 2007
Author: pari
Date: Tue Apr 24 16:49:29 2007
New Revision: 749
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=749
Log:
Merged revisions 747-748 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r747 | pari | 2007-04-24 16:42:39 -0500 (Tue, 24 Apr 2007) | 1 line
replacing the term 'Invalid Trunk' with 'Select a Service Provider'
........
r748 | pari | 2007-04-24 16:48:04 -0500 (Tue, 24 Apr 2007) | 1 line
some more improvements to the previous commit - also make the same change during the setup wizard
........
Modified:
branches/aadk/ (props changed)
branches/aadk/config/numberplan.html
branches/aadk/config/setup/5.html
branches/asterisknow/ (props changed)
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/setup/5.html
Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 24 16:49:29 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-726
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-748
Modified: branches/aadk/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/numberplan.html?view=diff&rev=749&r1=748&r2=749
==============================================================================
--- branches/aadk/config/numberplan.html (original)
+++ branches/aadk/config/numberplan.html Tue Apr 24 16:49:29 2007
@@ -354,14 +354,13 @@
newCell2.innerHTML = (m[a][b].ruledesc) ? m[a][b].ruledesc : a ;
if(newCell2.innerHTML == "custom"){ newCell2.innerHTML = "custom ("+ a + ")"; }
+ var newCell3 = newRow.insertCell(3);
+ newCell3.align="center";
+ newCell3.width=85;
if(c == "invalid" || c== "undefined" ){
- var newCell3 = newRow.insertCell(3);
- newCell3.innerHTML = "<B><font color=red>invalid trunk</font></B>" ;
- newCell3.width=85;
+ newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;' onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";
}else{
- var newCell3 = newRow.insertCell(3);
newCell3.innerHTML = trunks_desc[c].comment ;
- newCell3.width=85;
}
var newCell4 = newRow.insertCell(4);
Modified: branches/aadk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/5.html?view=diff&rev=749&r1=748&r2=749
==============================================================================
--- branches/aadk/config/setup/5.html (original)
+++ branches/aadk/config/setup/5.html Tue Apr 24 16:49:29 2007
@@ -247,14 +247,13 @@
var newCell2 = newRow.insertCell(2);
newCell2.innerHTML = default_np_data[a][b].ruledesc ;
+ var newCell3 = newRow.insertCell(3);
+ newCell3.align="center";
+ newCell3.width=85;
if(c == "invalid" || c== "undefined" ){
- var newCell3 = newRow.insertCell(3);
- newCell3.innerHTML = "<B><font color=red>invalid trunk</font></B>" ;
- newCell3.width=85;
+ newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;' onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";
}else{
- var newCell3 = newRow.insertCell(3);
newCell3.innerHTML = trunks_desc[c].comment ;
- newCell3.width=85;
}
var newCell4 = newRow.insertCell(4);
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 24 16:49:29 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-726
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-748
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=749&r1=748&r2=749
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Tue Apr 24 16:49:29 2007
@@ -354,14 +354,13 @@
newCell2.innerHTML = (m[a][b].ruledesc) ? m[a][b].ruledesc : a ;
if(newCell2.innerHTML == "custom"){ newCell2.innerHTML = "custom ("+ a + ")"; }
+ var newCell3 = newRow.insertCell(3);
+ newCell3.align="center";
+ newCell3.width=85;
if(c == "invalid" || c== "undefined" ){
- var newCell3 = newRow.insertCell(3);
- newCell3.innerHTML = "<B><font color=red>invalid trunk</font></B>" ;
- newCell3.width=85;
+ newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;' onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";
}else{
- var newCell3 = newRow.insertCell(3);
newCell3.innerHTML = trunks_desc[c].comment ;
- newCell3.width=85;
}
var newCell4 = newRow.insertCell(4);
Modified: branches/asterisknow/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/5.html?view=diff&rev=749&r1=748&r2=749
==============================================================================
--- branches/asterisknow/config/setup/5.html (original)
+++ branches/asterisknow/config/setup/5.html Tue Apr 24 16:49:29 2007
@@ -247,14 +247,13 @@
var newCell2 = newRow.insertCell(2);
newCell2.innerHTML = default_np_data[a][b].ruledesc ;
+ var newCell3 = newRow.insertCell(3);
+ newCell3.align="center";
+ newCell3.width=85;
if(c == "invalid" || c== "undefined" ){
- var newCell3 = newRow.insertCell(3);
- newCell3.innerHTML = "<B><font color=red>invalid trunk</font></B>" ;
- newCell3.width=85;
+ newCell3.innerHTML = "<span style='cursor:pointer; color : #0000ff;' onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Select a ServiceProvider</span>";
}else{
- var newCell3 = newRow.insertCell(3);
newCell3.innerHTML = trunks_desc[c].comment ;
- newCell3.width=85;
}
var newCell4 = newRow.insertCell(4);
More information about the asterisk-gui-commits
mailing list