diff --git a/bbb-api-demo/src/main/webapp/demo1.jsp b/bbb-api-demo/src/main/webapp/demo1.jsp
index dac5a1216bac53c8b0ea135534b8192512a509c4..bd7b7982ce5de683c81e92cae3f0595bb0b44213 100755
--- a/bbb-api-demo/src/main/webapp/demo1.jsp
+++ b/bbb-api-demo/src/main/webapp/demo1.jsp
@@ -36,8 +36,6 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
<%@ include file="bbb_api.jsp"%>
-<br>
-
<%
if (request.getParameterMap().isEmpty()) {
//
@@ -46,7 +44,7 @@ if (request.getParameterMap().isEmpty()) {
%>
<%@ include file="demo_header.jsp"%>
-<h2>Demo #1: Join a Course</h2>
+<h2>Join Demo Meeting</h2>
<FORM NAME="form1" METHOD="GET">
diff --git a/bbb-api-demo/src/main/webapp/demo2.jsp b/bbb-api-demo/src/main/webapp/demo2.jsp
index c52438c6921cc737278ee7bc26813ca53a9fac73..bd2e9fb3466b67ab1e7eb50058b429a3a581eac1 100755
--- a/bbb-api-demo/src/main/webapp/demo2.jsp
+++ b/bbb-api-demo/src/main/webapp/demo2.jsp
@@ -30,14 +30,12 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Join a Selected Course</title>
+<title>Join Selected</title>
</head>
<body>
<%@ include file="bbb_api.jsp"%>
-<br>
-
<%
if (request.getParameterMap().isEmpty()) {
//
@@ -47,7 +45,7 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
<%@ include file="demo_header.jsp"%>
-<h2>Demo #2: Join a Selected Course</h2>
+<h2>Join Selected</h2>
<FORM NAME="form1" METHOD="GET">
diff --git a/bbb-api-demo/src/main/webapp/demo3.jsp b/bbb-api-demo/src/main/webapp/demo3.jsp
index 457ebbcc969972a505aed6274c281baa41eefc55..3d587b43e9353fc1d0a852fcdf875cb239c2fe76 100755
--- a/bbb-api-demo/src/main/webapp/demo3.jsp
+++ b/bbb-api-demo/src/main/webapp/demo3.jsp
@@ -30,14 +30,12 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Join a Course (Password Required)</title>
+ <title>Join Password</title>
</head>
<body>
<%@ include file="bbb_api.jsp"%>
-<br>
-
<%
//
@@ -148,7 +146,7 @@ if (request.getParameterMap().isEmpty()) {
%>
<%@ include file="demo_header.jsp"%>
-<h2>Demo #3: Join a Course (password required)</h2>
+<h2>Join a Session (password required)</h2>
<FORM NAME="form1" METHOD="GET">
@@ -171,7 +169,7 @@ if (request.getParameterMap().isEmpty()) {
<td>
</td>
<td style="text-align: right; ">
- Course:</td>
+ Session:</td>
<td>
</td>
diff --git a/bbb-api-demo/src/main/webapp/demo4.jsp b/bbb-api-demo/src/main/webapp/demo4.jsp
index 512e4cdcc909e928a90a98819e1718627d18168c..ee29bb82ed37fe33dcc3c28b82db64083b956ff1 100755
--- a/bbb-api-demo/src/main/webapp/demo4.jsp
+++ b/bbb-api-demo/src/main/webapp/demo4.jsp
@@ -47,8 +47,6 @@ Author: Islam El-Ashi <ielashi@gmail.com>
<%@ include file="bbb_api.jsp"%>
-<br>
-
<%@ include file="demo_header.jsp"%>
diff --git a/bbb-api-demo/src/main/webapp/demo6.jsp b/bbb-api-demo/src/main/webapp/demo6.jsp
index 0e7f91a75592827ba99fc8824d4b3e33c2630728..3ae292260639d9afc96773a5f88d46638e18061d 100755
--- a/bbb-api-demo/src/main/webapp/demo6.jsp
+++ b/bbb-api-demo/src/main/webapp/demo6.jsp
@@ -71,7 +71,7 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
// Assume we want to create a meeting
//
%>
- <h2>Demo Recording</h2>
+ <h2>Record (Matterhorn)</h2>
<form id="formcreate" name="formcreate" method="get" action="">
<fieldset>
@@ -256,6 +256,8 @@ Error: getJoinURL() failed
}
%>
+About Matterhorn: XXX
+
<%@ include file="demo_footer.jsp"%>
</body>
diff --git a/bbb-api-demo/src/main/webapp/demo7.jsp b/bbb-api-demo/src/main/webapp/demo7.jsp
index 374fcc175b7feb7621e03e4e0c78709ddef28a43..a00e20ee58901da8d7a61b125e2b71d1a956c885 100755
--- a/bbb-api-demo/src/main/webapp/demo7.jsp
+++ b/bbb-api-demo/src/main/webapp/demo7.jsp
@@ -1,10 +1,10 @@
<html>
- <head><title>Preupload Presentation</title></head></p> <p>
+ <head><title>Join & Upload Presentation</title></head></p> <p>
<body>
<%@ include file="bbb_api.jsp"%>
<%@ include file="demo_header.jsp"%>
-<h2>Demo #7: Upload a presentation before joining a Course...</h2>
+<h2>Join & Upload Presentation</h2>
<form action="demo7.jsp" method="post" enctype="multipart/form-data" name="form1" id="form1">
<table cellpadding="5" cellspacing="5" style="width: 400px;">
<tbody>
diff --git a/bbb-api-demo/src/main/webapp/demo8.jsp b/bbb-api-demo/src/main/webapp/demo8.jsp
index 3a32bb2e524a19a467281e5d060715977ab72fbc..895277cc948465398b670eaf307de366c3ab8cc0 100755
--- a/bbb-api-demo/src/main/webapp/demo8.jsp
+++ b/bbb-api-demo/src/main/webapp/demo8.jsp
@@ -1,5 +1,5 @@
<html>
- <head><title>Preupload Presentation</title></head></p> <p>
+ <head><title>Join & Upload Presentation (URL)</title></head></p> <p>
<body>
<%@ include file="bbb_api.jsp"%>
<%@ include file="demo_header.jsp"%>
@@ -11,7 +11,7 @@ String name2="pdfs/Demo456.pdf";
String name3="pdfs/Demo789.pdf";
%>
-<h2>Demo #8: Send a presentation URL before joining a Course...</h2>
+<h2>Join & Upload Presentation (URL)</h2>
<form action="demo8.jsp" method="post" enctype
="multipart/form-data" name="form1" id="form1">
<table cellpadding="5" cellspacing="5" style="width: 400px;">
diff --git a/bbb-api-demo/src/main/webapp/demo_header.jsp b/bbb-api-demo/src/main/webapp/demo_header.jsp
index 938cfb80a98b2fc77d21247c0cfb83082d8f5c22..ea72b7e0bedddbb6f9797c39a35de51bfadf1501 100755
--- a/bbb-api-demo/src/main/webapp/demo_header.jsp
+++ b/bbb-api-demo/src/main/webapp/demo_header.jsp
@@ -1,11 +1,11 @@
-<img src="/bigbluebutton/images/bbb_banner.jpg" /><br>
-<a href="demo1.jsp">Join a Course</a> |
-<a href="demo10.jsp">Join a Course (Recorded) </a> |
-<a href="demo2.jsp">Join a Selected Course</a> |
-<a href="demo3.jsp">Join a Course (password required)</a> |
-<a href="demo4.jsp">Activity Monitor</a> |
-<a href="create.jsp">Create Your Own Meeting</a> |
-<a href="demo6.jsp">Record Meeting</a> |
-<a href="demo7.jsp">Auto Upload File</a> |
-<a href="demo8.jsp">Auto Upload File URL</a>
-
+<img src="/bigbluebutton/images/bbb_banner.jpg" /><br>
+<a href="demo1.jsp">Join</a> |
+<a href="demo2.jsp">Join Selected</a> |
+<a href="demo3.jsp">Join Password</a> |
+<a href="demo7.jsp">Join & Upload</a> |
+<a href="demo8.jsp">Join & Upload</a> (URL)
+<a href="demo10.jsp">Record</a> |
+<a href="demo6.jsp">Record</a> (Matterhorn)
+<a href="create.jsp">Create your own Session</a>
+<a href="demo4.jsp">Activity Monitor</a>
+