projects / freetel-svn-tracking.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2513d20)
initial menu and banner support
authordrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Mon, 4 Jan 2010 06:34:28 +0000 (06:34 +0000)
committerdrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Mon, 4 Jan 2010 06:34:28 +0000 (06:34 +0000)
git-svn-id: https://svn.code.sf.net/p/freetel/code@91 01035d8c-6547-0410-b346-abe4f91aad63

easy-asterisk-gui/Makefile patch | blob | history
easy-asterisk-gui/banner.html [new file with mode: 0644] patch | blob
easy-asterisk-gui/check_loggedin.sh [new file with mode: 0644] patch | blob
easy-asterisk-gui/dashboard.sh patch | blob | history
easy-asterisk-gui/menu.html [new file with mode: 0644] patch | blob
easy-asterisk-gui/network.sh patch | blob | history

diff --git a/easy-asterisk-gui/Makefile b/easy-asterisk-gui/Makefile
index 45912145971774d718f225fa648bb3e51ecdae3a..d74d6568da7f448239e97c68b49b15f178a12afc 100644 (file)
--- a/easy-asterisk-gui/Makefile
+++ b/easy-asterisk-gui/Makefile
@@ -9,4 +9,4 @@ TESTIP=192.168.1.150
 #      rcp index.html root@$(TESTIP):/var/lib/asterisk/static-http/
 
 test:
-       rcp logout.sh login.sh dashboard.sh dashboard.js network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin
+       rcp banner.html menu.html check_loggedin.sh logout.sh login.sh dashboard.sh dashboard.js network.sh network.js set_network.sh tooltip.js tooltip.css root@$(TESTIP):/www/cgi-bin
diff --git a/easy-asterisk-gui/banner.html b/easy-asterisk-gui/banner.html
new file mode 100644 (file)
index 0000000..432c7cd
--- /dev/null
+++ b/easy-asterisk-gui/banner.html
@@ -0,0 +1 @@
+    <tr><td colspan="2"><h1>Easy Asterisk</h1></td></tr>
diff --git a/easy-asterisk-gui/check_loggedin.sh b/easy-asterisk-gui/check_loggedin.sh
new file mode 100644 (file)
index 0000000..3d0f975
--- /dev/null
+++ b/easy-asterisk-gui/check_loggedin.sh
@@ -0,0 +1,9 @@
+echo $HTTP_COOKIE | grep "loggedin" > /dev/null
+if [ $? -eq 1 ]; then
+    echo "<html>"
+    echo "<head>"
+    echo '<meta http-equiv="REFRESH" content="0;url=http:login.sh">'
+    echo "</head>"
+    echo "</html>"
+    exit
+fi
diff --git a/easy-asterisk-gui/dashboard.sh b/easy-asterisk-gui/dashboard.sh
index a791856e43c3d751e0eff5d4564769a4668eb7c6..d1ea69445e5ea700d97eccf4accc59fa4f90283b 100644 (file)
--- a/easy-asterisk-gui/dashboard.sh
+++ b/easy-asterisk-gui/dashboard.sh
@@ -14,15 +14,7 @@ fi
 
 # Construct the web page -------------------------------
 
-echo $HTTP_COOKIE | grep "loggedin" > /dev/null
-if [ $? -eq 1 ]; then
-    echo "<html>"
-    echo "<head>"
-    echo '<meta http-equiv="REFRESH" content="0;url=http:login.sh">'
-    echo "</head>"
-    echo "</html>"
-    exit
-fi
+sh check_loggedin.sh
 
 cat <<EOF
 <script src="prototype.js"></script>
@@ -41,19 +33,34 @@ cat << EOF
 <title>Easy Asterisk - Dashboard</title>
 <body onload="localInit()">
 <div id="t1" class="tip">Tells you if I can reach the Internet.  If not "Good" check your network settings, in particular Gateway and DNS.</div>
-<form action="/cgi-bin/set_network.sh" onsubmit="return validate_form(this)" method="get">
-<table align="center" width=600>
-<tr>
-  <tr><td colspan="2" align="left"><h2>Dashboard</h2></td>
-  <tr onMouseOver="popUp(event,'t1')" onmouseout="popUp(event,'t1')">
-      <td>Internet Connection:</td>
-      <td><div id="internet" >
-      <span style="margin-left: 4px;font-weight:bold">&nbsp;</span></div></td>
-      
-  </tr>
-</tr>
+
+<table align="center" width=800>
+EOF
+cat banner.html
+echo "    <tr>"
+cat menu.html    
+cat <<EOF
+
+    <td>
+
+    <form action="/cgi-bin/set_network.sh" onsubmit="return validate_form(this)" method="get">
+    <table align="right" width=600>
+    <tr>
+      <tr><td colspan="2" align="left"><h2>Dashboard</h2></td>
+      <tr onMouseOver="popUp(event,'t1')" onmouseout="popUp(event,'t1')">
+         <td>Internet Connection:</td>
+         <td><div id="internet" >
+         <span style="margin-left: 4px;font-weight:bold">&nbsp;</span></div></td>
+
+      </tr>
+    </table>
+    </form>
+
+    </td>
+
+    </tr>
+
 </table>
-</form>
 EOF
 
 echo $HTTP_COOKIE
diff --git a/easy-asterisk-gui/menu.html b/easy-asterisk-gui/menu.html
new file mode 100644 (file)
index 0000000..e5d4945
--- /dev/null
+++ b/easy-asterisk-gui/menu.html
@@ -0,0 +1,6 @@
+    <td>
+       <table align="right" width=200>
+       <tr><td>Menu 1</td></tr>
+       <tr><td>Menu 2</td></tr>
+       </table>
+    </td>
diff --git a/easy-asterisk-gui/network.sh b/easy-asterisk-gui/network.sh
index 771cd8dcf47fe567bf5ba7a70eec54b033079268..33ee3b140343a0a6496708c588b8a71a436f879f 100644 (file)
--- a/easy-asterisk-gui/network.sh
+++ b/easy-asterisk-gui/network.sh
@@ -33,6 +33,8 @@ fi
 
 # Construct the web page -------------------------------
 
+sh check_loggedin.sh
+
 cat <<EOF
 <script src="prototype.js"></script>
 <link href="astman.css" media="all" rel="Stylesheet" type="text/css" />
Mirror of the freetel SVN https://svn.code.sf.net/p/freetel/code/