pari: branch aadk r615 - in /branches/aadk: ./ config/
config/scripts/
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Thu Apr 5 19:31:31 MST 2007
Author: pari
Date: Thu Apr 5 21:31:30 2007
New Revision: 615
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=615
Log:
Merged revisions 612-613 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r612 | pari | 2007-04-04 18:01:54 -0500 (Wed, 04 Apr 2007) | 1 line
*** New Feature (not finished) : Editing config files from the GUI ****
........
r613 | pari | 2007-04-05 21:20:46 -0500 (Thu, 05 Apr 2007) | 1 line
minor fixes for positioning
........
Added:
branches/aadk/config/feditor.html
- copied unchanged from r613, trunk/config/feditor.html
Modified:
branches/aadk/ (props changed)
branches/aadk/config/cfgbasic.html
branches/aadk/config/localexts.html
branches/aadk/config/meetme.html
branches/aadk/config/queues.html
branches/aadk/config/scripts/astman.js
branches/aadk/config/status.html
branches/aadk/config/voicemail.html
Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 5 21:31:30 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588,605
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-614
Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Thu Apr 5 21:31:30 2007
@@ -106,6 +106,9 @@
// show additional panels for advanced mode
if(window.location.href.match("advanced=yes") ){
panels.splice(10,0,
+
+ new PanelDef("feditor", "File Editor", "accordion-icon.gif", " Manually edit Config Files"),
+
new PanelDef("moh", "Music On Hold", "accordion-icon.gif", " Music on hold sometimes keeps people less angry while they wait for an answer"),
new PanelDef("sip", "SIP", "accordion-icon.gif", "SIP (Session Initiation Protocol) Configuration"),
Modified: branches/aadk/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/localexts.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/localexts.html (original)
+++ branches/aadk/config/localexts.html Thu Apr 5 21:31:30 2007
@@ -196,6 +196,7 @@
</table>
</fieldset>
<center>
+ <div height=10></div><BR>
<input type=button id="save" value="Save"> <input type=button id="cancel" value="Cancel">
</center>
</td>
Modified: branches/aadk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/meetme.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/meetme.html (original)
+++ branches/aadk/config/meetme.html Thu Apr 5 21:31:30 2007
@@ -455,6 +455,7 @@
</table>
</td>
</tr>
+ <tr ><td height=10></td></tr>
<tr onmouseover="show_tooltip('en', 'meetme', 6);">
<td style="cursor: pointer; cursor: hand;">
<img id="split" onClick="togglefeatures()" src="images/split-v.gif">
Modified: branches/aadk/config/queues.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/queues.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/queues.html (original)
+++ branches/aadk/config/queues.html Thu Apr 5 21:31:30 2007
@@ -521,6 +521,7 @@
</table>
</td>
</tr>
+ <tr ><td height=10></td></tr>
<tr onmouseover="show_tooltip('en', 'queues', 4);">
<td style="cursor: pointer; cursor: hand;"><img id="split" onClick="togglefeatures()" src="images/split-v.gif"></td>
</tr>
Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Thu Apr 5 21:31:30 2007
@@ -191,7 +191,7 @@
var b = a[s].subfields ;
json_data += '"' + a[s].categoryname + '" : [ ' ;
for ( var y = 0 ; y < b.length ; y++ ){
- json_data += '"' + b[y] + '"' ;
+ json_data += '"' + escape(b[y]) + '"' ;
if( y < b.length - 1 ){ json_data += ',' ; }
}
if( s < a.length - 1 ){ json_data += ' ],' ; }else{ json_data += ' ]}' ; }
Modified: branches/aadk/config/status.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/status.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/status.html (original)
+++ branches/aadk/config/status.html Thu Apr 5 21:31:30 2007
@@ -130,13 +130,10 @@
</script>
<body id="foo" onload="localajaxinit()" bgcolor="EFEFEF" onunload="localajaxend()">
<div class="mainscreenTitleBar">
- <span style="margin-left: 4px;font-weight:bold">Channels Status</span>
+ <span style="margin-left: 4px;font-weight:bold">Active Channels</span>
</div>
<div class="mainscreenContentBox" id="userscontent">
<table class="mainscreenTable" align="center">
- <tr valign="top" height="18">
- <td> Active Channels: </td>
- </tr>
<tr height=32 valign="middle">
<td align="center">
<input type="submit" onClick="refreshChannelsList()" id="refresh" value="Refresh" onmouseover="show_tooltip('en', 'status', 1);" class="buttonbold">
Modified: branches/aadk/config/voicemail.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/voicemail.html?view=diff&rev=615&r1=614&r2=615
==============================================================================
--- branches/aadk/config/voicemail.html (original)
+++ branches/aadk/config/voicemail.html Thu Apr 5 21:31:30 2007
@@ -374,6 +374,7 @@
</table>
</td>
</tr>
+ <tr ><td height=10></td></tr>
<tr onmouseover="show_tooltip('en', 'voicemail', 8);" >
<td style="cursor: pointer; cursor: hand;"><img id="split" onClick="togglefeatures()" src="images/split-v.gif"></td>
</tr>
More information about the asterisk-gui-commits
mailing list