bkruse: branch asterisknow r1969 - in /branches/asterisknow: ./ config/ confi...

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Wed Dec 12 16:07:12 2007
New Revision: 1969

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1969
Log:
I made a comment in the graphs page (if anyone
actually uncomments and accesses it)

Took the references out of the Makefile.

Fixed an example in astman.js referencing it (just for my peace of mind)

Removed the graphs.sh script, just to make sure.

I left everything in the tooltips, incase we add
it back we can just re-add the script, makefile,
and uncomment the embed in graphs.html

Modified:
    branches/asterisknow/Makefile
    branches/asterisknow/config/graphs.html
    branches/asterisknow/config/scripts/astman.js
    branches/asterisknow/scripts/graphs.sh

Modified: branches/asterisknow/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/Makefile?view=diff&rev=1969&r1=1968&r2=1969
==============================================================================
--- branches/asterisknow/Makefile (original)
+++ branches/asterisknow/Makefile Wed Dec 12 16:07:12 2007
@@ -198,7 +198,6 @@
 	mkdir -p $(CONFIGDIR)/stylesheets
 	mkdir -p $(CONFIGDIR)/bkps
 	mkdir -p $(CONFIGDIR)/setup
-	mkdir -p $(CONFIGDIR)/graphs
 	mkdir -p $(CONFIGDIR)/scripts
 	mkdir -p $(ASTVARLIBDIR)/scripts
 	@echo "Checking For old ztscan and zapscan...."
@@ -247,10 +246,6 @@
 		echo "$$x  -->  $(CONFIGDIR)" ; \
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/ ; \
 	done
-	@for x in config/graphs/*; do \
-		echo "$$x  -->  $(CONFIGDIR)/graphs" ; \
-		$(INSTALL) -m 644 $$x $(CONFIGDIR)/graphs ; \
-	done
 	@for x in config/index; do \
 		echo "$$x  --> $(HTTPDIR)/index.html" ; \
 		$(INSTALL) -m 644 $$x $(HTTPDIR)/index.html ; \

Modified: branches/asterisknow/config/graphs.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/graphs.html?view=diff&rev=1969&r1=1968&r2=1969
==============================================================================
--- branches/asterisknow/config/graphs.html (original)
+++ branches/asterisknow/config/graphs.html Wed Dec 12 16:07:12 2007
@@ -86,8 +86,11 @@
 			<BR>
 			<div id="cpu_div" style="display:none">
 				<div id="cpu" style="font-family:courier; font-size:10pt;"></div><BR>
+				<h3>This Page Is No Longer In Use</h3>
+				<!--
 				<embed id="cpu_embed" type="image/svg+xml" src="graphs/graph_cpu.svgz"
 						width="500" height="250" /> 
+				-->
 			</div>
 		</div>
 	</td>

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=1969&r1=1968&r2=1969
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Wed Dec 12 16:07:12 2007
@@ -26,7 +26,7 @@
 var asterisk_guitoolsversion = "0.7";
 var asterisk_guiversion = "$Revision$";
 var asterisk_guifbt = 3000; // Feedback msg time
-var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */
+var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (listfiles, for example) */
 var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;
 var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";
 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";

Modified: branches/asterisknow/scripts/graphs.sh
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/scripts/graphs.sh?view=diff&rev=1969&r1=1968&r2=1969
==============================================================================
--- branches/asterisknow/scripts/graphs.sh (original)
+++ branches/asterisknow/scripts/graphs.sh Wed Dec 12 16:07:12 2007
@@ -1,55 +1,0 @@
-#!/bin/bash
-
-####################################################################
-####	Copyright Brandon Kruse <bkruse at digium.com> && Digium	####
-####################################################################
-
-#### Props and Credits to the m0n0wall and the xwrt group for information.
-#### Extra licensing information included in the svg files located at
-#### /var/lib/asterisk/static-http/config/graphs/*.svg. Thanks Guys!
-
-echo `date`
-case $1 in
-	cpu)
-		var="`head -n 1 /proc/stat`"
-		echo "$var"
-		;;
-	wan)
-		var="`cat /proc/net/dev | grep eth0`"
-		echo "$var"
-		;;
-	lan) 
-		var="`cat /proc/net/dev | grep eth1`"
-		echo "$var"
-		;;
-	hd)
-		var="`df -h`"	
-		echo "$var"
-		;;
-	mem)
-		var="`free`"
-		echo "$var"
-		;;
-	temp)
-		var="`echo \"temperature sensor?\"`"
-		echo "$var"
-		;;
-	ast)
-		var="`asterisk -rx 'core show channels'`"
-		echo "$var"
-		;;
-	swap)
-		SWAPINFO=$(free | grep "Swap:")
-		nI="0"
-		for CUR_VAR in $SWAPINFO; do
-			case "$nI" in
-				1)	TOTAL_SWAP=$CUR_VAR;;
-				3)	FREE_SWAP=$CUR_VAR
-			break;;
-			esac
-		let "nI+=1"
-		done
-		;;
-	
-esac
-#/proc/net/dev