bkruse: branch aadk r622 - in /branches/aadk: ./ config/ config/graphs/ confi...

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

Author: bkruse
Date: Fri Apr  6 17:04:04 2007
New Revision: 622

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

........
r620 | bkruse | 2007-04-06 16:48:49 -0500 (Fri, 06 Apr 2007) | 1 line

Wow, The gui can graph CPU usage, just a proof of concept.....I will do more with this later (600 lines :X)
........


Added:
    branches/aadk/config/graphs/
      - copied from r620, trunk/config/graphs/
    branches/aadk/config/graphs.html
      - copied unchanged from r620, trunk/config/graphs.html
    branches/aadk/config/graphs/graph_cpu.svg
      - copied unchanged from r620, trunk/config/graphs/graph_cpu.svg
    branches/aadk/scripts/graphs.sh
      - copied unchanged from r620, trunk/scripts/graphs.sh
Modified:
    branches/aadk/   (props changed)
    branches/aadk/Makefile
    branches/aadk/config/cfgbasic.html
    branches/aadk/config/scripts/tooltip.js

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr  6 17:04:04 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-614
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-614,620

Modified: branches/aadk/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/Makefile?view=diff&rev=622&r1=621&r2=622
==============================================================================
--- branches/aadk/Makefile (original)
+++ branches/aadk/Makefile Fri Apr  6 17:04:04 2007
@@ -220,6 +220,7 @@
 	mkdir -p $(CONFIGDIR)/stylesheets
 	mkdir -p $(CONFIGDIR)/bkps
 	mkdir -p $(CONFIGDIR)/setup
+	mkdir -p $(CONFIGDIR)/graphs
 	mkdir -p $(ASTETCDIR)/scripts
 	@for x in gui_configs/*; do \
 		echo "$$x  -->  $(ASTETCDIR)" ; \
@@ -248,6 +249,10 @@
 	@for x in scripts/*; do \
 		echo "$$x  -->  $(ASTETCDIR)/scripts" ; \
 		$(INSTALL) -m 755 $$x $(ASTETCDIR)/scripts ; \
+	done
+	@for x in config/graphs/*; do \
+		echo "$$x  -->  $(CONFIGDIR)/graphs" ; \
+		$(INSTALL) -m 644 $$x $(CONFIGDIR)/graphs ; \
 	done
 	@if [ -x /usr/sbin/asterisk-gui-post-install ]; then \
 		/usr/sbin/asterisk-gui-post-install $(DESTDIR) . ; \

Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=622&r1=621&r2=622
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Fri Apr  6 17:04:04 2007
@@ -92,6 +92,8 @@
 		"Allows you to record custom voicemenus over a phone"),
 	
 	new PanelDef("status", "Active Channels", "accordion-icon.gif", "Monitor active channels."),
+
+	new PanelDef("graphs", "Graphs", "accordion-icon.gif", "View Graphs of your System Information."),
 
 	new PanelDef("sysinfo", "System Info", "accordion-icon.gif", "System Information."),
 
@@ -308,4 +310,4 @@
 		</td>
 </tr>
 </table>
-</body>
+</body>

Modified: branches/aadk/config/scripts/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/tooltip.js?view=diff&rev=622&r1=621&r2=622
==============================================================================
--- branches/aadk/config/scripts/tooltip.js (original)
+++ branches/aadk/config/scripts/tooltip.js Fri Apr  6 17:04:04 2007
@@ -29,6 +29,7 @@
 	tooltips['users'] .en[14] = "<B>3-Way Calling:</B>Check this option if the User or Phone should have 3-Way Calling capability."; //3-Way Calling:
 	tooltips['users'] .en[15] = "<B>Is Agent:</B> Check this option if this User or Phone is an Call Queue Member (Agent)"; //Is Agent:
 	tooltips['users'] .en[16] = "<B>VM Password:</B> Voicemail Password for this user, Ex: \"1234\"."; //Voicemail Password
+	tooltips['users'] .en[17] = "<B>Hints:</B> If checked the phone being called will be sent a \"hint\" to light up status lamps on SIP phones."; // Hint phone before being dialed.
 
 // Tooltips for Conferencing (meetme)
 	tooltips['meetme']= new Object;
@@ -247,3 +248,7 @@
 	tooltips['sysinfo'].en[1] = "<B>ifconfig:</B> Network devices information (ifconfig)";
 	tooltips['sysinfo'].en[2] = "<B>Resources:</B> Disk and Memory usage information";
 	tooltips['sysinfo'].en[3] = "<B>Logs:</B> Asterisk Log files";
+
+	tooltips['graph']= new Object;
+	tooltips['graph'].en = new Array;
+	tooltips['graph'].en[0] = "<B>CPU Usage:</B> Real-Time Updating Graph For CPU Usage";