diff --git a/www/GNUmakefile.in b/www/GNUmakefile.in index e45165acc0f5960810fbafd9f827f03b4238a5b9..4847c362ed1a9423c3d013e335215629789935b0 100644 --- a/www/GNUmakefile.in +++ b/www/GNUmakefile.in @@ -100,7 +100,7 @@ HYFILES += $(wildcard $(SRCDIR)/hyperviewer/*.html) HYFILES += $(wildcard $(SRCDIR)/hyperviewer/*.jpg) HYFILES += $(wildcard $(SRCDIR)/hyperviewer/*.gif) -USRPFILES = $(wildcard $(SRCDIR)/usrp/*.php) +USRPFILES = $(wildcard $(SRCDIR)/usrp/*.php3) USRPFILES += $(wildcard $(SRCDIR)/usrp/*.html) # need to make it *.gz; with simply "*", diff --git a/www/menu.php3 b/www/menu.php3 index b9e7ce985eb0ce2c367cb40c711d0428a2203e7d..d1cc4feb82eb7ea9cc1d953b1867b651f782ab2a 100644 --- a/www/menu.php3 +++ b/www/menu.php3 @@ -79,7 +79,8 @@ function WRITESIDEBARDIVIDER() { # link looks different. Not sure its really necessary. # function WRITESIDEBARBUTTON($text, $base, $link ) { - $link = "$base/$link"; + if ($base) + $link = "$base/$link"; SIDEBARCELL("$text"); } @@ -598,6 +599,26 @@ function WRITESIDEBAR() { echo "\n"; } +# +# Simple version of above, that just writes the given menu. +# +function WRITESIMPLESIDEBAR($menudefs) { + $menutitle = $menudefs['title']; + + echo " + "; + echo "\n"; + + each($menudefs); + while (list($key, $val) = each($menudefs)) { + WRITESIDEBARBUTTON("$key", null, "$val"); + } + echo "\n"; +} + # # spits out beginning part of page # @@ -773,6 +794,9 @@ function PAGEHEADER($title, $view = NULL) { if (!isset($view['hide_sidebar'])) { WRITESIDEBAR(); } + elseif (isset($view['menu'])) { + WRITESIMPLESIDEBAR($view['menu']); + } FINISHSIDEBAR(); echo "

\n"; @@ -792,14 +816,17 @@ function PAGEHEADER($title, $view = NULL) { $minor = ""; $build = ""; TBGetVersionInfo($major, $minor, $build); + if ($view['hide_versioninfo'] == 1) + $versioninfo = ""; + else + $versioninfo = "Vers: $major.$minor Build: $build"; $now = date("D M d g:ia T"); echo "$title

\n"; echo "\n"; echo ""; echo " "; - echo " "; + echo " "; echo " "; echo "
". - "Vers: $major.$minor Build: $build$versioninfo  "; if ($login_uid) { diff --git a/www/sdr/docwrapper.php3 b/www/sdr/docwrapper.php3 new file mode 100644 index 0000000000000000000000000000000000000000..049157fc48a49fce5eb593b68fc14d9fab40a3fe --- /dev/null +++ b/www/sdr/docwrapper.php3 @@ -0,0 +1,83 @@ + + + + + \n"; +} +else { + echo " + Printable version of this document
\n"; +} + +if ($textfile) { + echo "\n"; +} + +readfile("$docname"); + +if ($textfile) { + echo "\n"; +} + +# +# Standard Testbed Footer +# +if ($printable) { + echo " + \n"; +} +else { + PAGEFOOTER(); +} +?> + diff --git a/www/sdr/faq.html b/www/sdr/faq.html new file mode 100644 index 0000000000000000000000000000000000000000..f45113f7a8b4ff96316a21ceaf3da1b556bc7db1 --- /dev/null +++ b/www/sdr/faq.html @@ -0,0 +1,21 @@ + +
+

Frequently Asked Questions

+
+ +

Contents

+ + +
+ +
    +
  • + What is a GNU Radio? +

    Tell me more, tell me more +

diff --git a/www/sdr/index.php3 b/www/sdr/index.php3 new file mode 100755 index 0000000000000000000000000000000000000000..b123309b63fdf6b304ded24a1156f45a8605dc69 --- /dev/null +++ b/www/sdr/index.php3 @@ -0,0 +1,19 @@ +\n"; +echo "Tell me more, tell me more
\n"; + +# +# Standard Testbed Footer +# +PAGEFOOTER(); + +?> diff --git a/www/sdr/news.html b/www/sdr/news.html new file mode 100644 index 0000000000000000000000000000000000000000..059e94701a3fc8ccc02acaeacff4cf67e06d3cbe --- /dev/null +++ b/www/sdr/news.html @@ -0,0 +1,12 @@ + +
+

Recent News

+
+ +
    +
  • Tell me more, tell me more +
diff --git a/www/sdr/users.html b/www/sdr/users.html new file mode 100644 index 0000000000000000000000000000000000000000..006d032d1dbe244b40d574ff210f564c6e995da6 --- /dev/null +++ b/www/sdr/users.html @@ -0,0 +1,12 @@ + +
+

USRP Users

+
+ +
    +
  • Tell me more, tell me more +
diff --git a/www/sdr/usrpdefs.php3 b/www/sdr/usrpdefs.php3 new file mode 100644 index 0000000000000000000000000000000000000000..13cddb7d170a87b9e4a012c7c634315693a5a6c1 --- /dev/null +++ b/www/sdr/usrpdefs.php3 @@ -0,0 +1,25 @@ + 1, + 'hide_banner' => 1, + 'hide_versioninfo' => 1, + 'menu' => $USRP_MENU, + ); +?>