bkruse: branch asterisknow r682 - in /branches/asterisknow: ./ config/ config...

[asterisk-gui-commits at lists.digium.com]

Author: bkruse
Date: Mon Apr 16 19:13:14 2007
New Revision: 682

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=682
Log:
Merged revisions 680-681 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r680 | pari | 2007-04-16 16:37:41 -0500 (Mon, 16 Apr 2007) | 1 line

list only .conf files in the file editor
........
r681 | bkruse | 2007-04-16 19:11:40 -0500 (Mon, 16 Apr 2007) | 1 line

Minor spelling change... Wraup != Wrapup
........


Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/feditor.html
    branches/asterisknow/config/scripts/tooltip.js

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 16 19:13:14 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-677
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-681

Modified: branches/asterisknow/config/feditor.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/feditor.html?view=diff&rev=682&r1=681&r2=682
==============================================================================
--- branches/asterisknow/config/feditor.html (original)
+++ branches/asterisknow/config/feditor.html Mon Apr 16 19:13:14 2007
@@ -118,6 +118,7 @@
 				}
 				recfiles[i] = recfiles[i].replace(/^\s*|\s*$/g,'') ;
 				if( recfiles[i] == "" ){ continue; }
+				if( recfiles[i].substr( (recfiles[i].length - 5), recfiles[i].length) != ".conf") { continue; }
 				file_name = recfiles[i].stripTags() ;
 				New_OPTION = document.createElement('option');
 				New_OPTION.text =  file_name  ;

Modified: branches/asterisknow/config/scripts/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/tooltip.js?view=diff&rev=682&r1=681&r2=682
==============================================================================
--- branches/asterisknow/config/scripts/tooltip.js (original)
+++ branches/asterisknow/config/scripts/tooltip.js Mon Apr 16 19:13:14 2007
@@ -77,7 +77,7 @@
 	tooltips['queues'].en[3] = "<B>Agents:</B> This selection shows all Users defined as Agents in their User conf.  Checking a User here makes them a member of the current Queue.";
 	tooltips['queues'].en[4] = "<B>Advanced:</B> Advanced Queue Configuration Options";
 	tooltips['queues'].en[5] = "<B>Timeout:</B> This option defines the time in seconds that an Agent's phone rings before the next Agent is rung, i.e. \"15\" ";
-	tooltips['queues'].en[6] = "<B>Wraup Time:</B> After a successful call, time time in seconds that an Agent remains free before another call is sent to them. Default is 0, which is No Delay.";
+	tooltips['queues'].en[6] = "<B>Wrapup Time:</B> After a successful call, time time in seconds that an Agent remains free before another call is sent to them. Default is 0, which is No Delay.";
 	tooltips['queues'].en[7] = "<B>AutoFill</B> Defining this option causes the Queue, when multiple calls are in it at the same time, to push them to Agents simultaneously.  Thus, instead of completing one call to an Agent at a time, the Queue will complete as many calls simultaneously to the available Agents.";
 	tooltips['queues'].en[8] = "<B> AutoPause:</B> Enabling this option pauses an Agent if they fail to answer a call.";
 	tooltips['queues'].en[9] = "<B> MaxLen:</B> This option sets the maximum number of callers that may wait in a Queue. Default is 0, Unlimited.";