bkruse: branch asterisknow r1753 - in /branches/asterisknow: ./ config/script...

Author: bkruse
Date: Fri Oct 26 17:38:52 2007
New Revision: 1753

URL: http://svn.digium.com/view/asterisk-gui?view=rev&am
p;rev=1753
Log:
Merged revisions 1751 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4


........
r1751 | bkruse | 2007-10-26 17:17:42 -0500 (Fri, 26 Oct
2007) | 3 lines

fixed a whacky images setting


........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/tools/zapscan

Propchange: branches/asterisknow/
------------------------------------------------------------
------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/
branches/asterisknow/config/scripts/astman.js?view=diff&
rev=1753&r1=1752&r2=1753
============================================================
==================
--- branches/asterisknow/config/scripts/astman.js
(original)
+++ branches/asterisknow/config/scripts/astman.js Fri Oct 26
17:38:52 2007
 -579,7
+579,7 
 	_hs.borderColor= "#7E5538";
 	_hs.borderStyle= "solid";
 	h.innerHTML = '<BR><BR><TABLE border=0
cellpadding=0 cellspacing=3 align=center>' +
-			'<TR><TD><img
src="/asterisk/static/config/images/loading.gif"&g
t;</TD>' +
+			'<TR><TD><img
src="images/loading.gif"></TD>' +
 			'<TD valign=middle
align=center>&nbsp;&nbsp;<div
id=message_text></div></TD></TR></TA
BLE>';
 	document.body.appendChild(h);
 }

Modified: branches/asterisknow/tools/zapscan
URL: http://svn.digium.com/view/asterisk-gui/branches/as
terisknow/tools/zapscan?view=diff&rev=1753&r1=1752&a
mp;r2=1753
============================================================
==================
--- branches/asterisknow/tools/zapscan (original)
+++ branches/asterisknow/tools/zapscan Fri Oct 26 17:38:52
2007
 -6,7
+6,7 
 	( echo "; Created by zapscan -- edit
zapata.conf.zapscan instead" ; cat
/etc/asterisk/zapata.conf.zapscan ) >
/etc/asterisk/zapata.conf
 	rm -f /etc/asterisk/zapscan.conf
 	echo -n "Scanning for zaptel devices..."
-	if `which zapscan.bin`; then
+	if zapscan.bin; then
 		echo "OK"
 	else
 		echo "Failed!"


_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.c
om--

asterisk-gui-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-g
ui-commits