BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Richard Alam 2011-09-12 13:06:49 +00:00
commit 2d2993fa0c
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bbb-api-demo/src/main/webapp/create.jsp
View File

@ -106,8 +106,8 @@ $(document).ready(function(){
// //
String joinURL = getJoinURL(username, meetingID, "false", "<br>Welcome to %%CONFNAME%%.<br>", null, null); String joinURL = getJoinURL(username, meetingID, "false", "<br>Welcome to %%CONFNAME%%.<br>", null, null);
String url = BigBlueButtonURL.replace("bigbluebutton/","demo/");
String inviteURL = BigBlueButtonURL + "demo/create.jsp?action=invite&meetingID=" + URLEncoder.encode(meetingID, "UTF-8"); String inviteURL = url + "create.jsp?action=invite&meetingID=" + URLEncoder.encode(meetingID, "UTF-8");
%> %>
<hr /> <hr />
@ -159,8 +159,8 @@ $(document).ready(function(){
String meetingID = request.getParameter("meetingID"); String meetingID = request.getParameter("meetingID");
String username = request.getParameter("username"); String username = request.getParameter("username");
String enterURL = BigBlueButtonURL String url = BigBlueButtonURL.replace("bigbluebutton/","demo/");
+ "demo/create.jsp?action=join&username=" String enterURL = url + "create.jsp?action=join&username="
+ URLEncoder.encode(username, "UTF-8") + "&meetingID=" + URLEncoder.encode(username, "UTF-8") + "&meetingID="
+ URLEncoder.encode(meetingID, "UTF-8"); + URLEncoder.encode(meetingID, "UTF-8");

43
bigbluebutton-config/bin/bbb-record
View File

@ -37,16 +37,16 @@ mark_for_rebuild() {
for type in $TYPES; do for type in $TYPES; do
if [ -d $BASE/process/$type/$MEETING_ID ]; then if [ -d $BASE/process/$type/$MEETING_ID ]; then
rm -rf $BASE/process/$type/$MEETING_ID rm -rf $BASE/process/$type/$MEETING_ID
else # else
echo "Warn: Didn't find $BASE/process/$type/$MEETING_ID" # echo "Warn: Didn't find $BASE/process/$type/$MEETING_ID"
exit 1 # exit 1
fi fi
if [ -f $STATUS/processed/$MEETING_ID-$type.done ]; then if [ -f $STATUS/processed/$MEETING_ID-$type.done ]; then
rm $STATUS/processed/$MEETING_ID-$type.done rm $STATUS/processed/$MEETING_ID-$type.done
else # else
echo "Warn: Didn't find $STATUS/processed/$MEETING_ID-$type.done" # echo "Warn: Didn't find $STATUS/processed/$MEETING_ID-$type.done"
exit 1 # exit 1
fi fi
if [ -d $BASE/publish/$type/$MEETING_ID ]; then if [ -d $BASE/publish/$type/$MEETING_ID ]; then
@ -84,8 +84,11 @@ usage() {
echo "Configuration:" echo "Configuration:"
echo " --version Display BigBlueButton version (packages)" echo " --version Display BigBlueButton version (packages)"
echo echo
echo "Reporting:"
echo " --list List all recordings"
echo
echo "Monitoring:" echo "Monitoring:"
echo " --watch monitor processing of recordings: watch -n 2 \"bbb-record --watch\"" echo " --watch Watch processing of recordings"
echo " --rebuild [meetingID] rebuild the output for meetingID" echo " --rebuild [meetingID] rebuild the output for meetingID"
echo " --deletall delete all meetings and recordings" echo " --deletall delete all meetings and recordings"
echo echo
@ -103,6 +106,17 @@ while [ $# -gt 0 ]; do
shift shift
continue continue
fi fi
if [ "$1" = "-list" -o "$1" = "--list" ]; then
LIST=1
shift
continue
fi
if [ "$1" = "--list20" ]; then
LIST=1
HEAD=20
shift
continue
fi
if [ "$1" = "-rebuild" -o "$1" = "--rebuild" ]; then if [ "$1" = "-rebuild" -o "$1" = "--rebuild" ]; then
need_root need_root
if [ ! -z "${2}" ]; then if [ ! -z "${2}" ]; then
@ -176,7 +190,7 @@ if [ $DELETEALL ]; then
done done
fi fi
if [ $WATCH ]; then if [ $LIST ]; then
#ps -fC god #ps -fC god
@ -192,13 +206,18 @@ if [ $WATCH ]; then
echo "MeetingID Time Slides Recorded Archived Processed Published Description" echo "MeetingID Time Slides Recorded Archived Processed Published Description"
echo "------------------------------------------------------ ---------------------------- ------ -------- -------- -------------------- -------------------- -----------------------------" echo "------------------------------------------------------ ---------------------------- ------ -------- -------- -------------------- -------------------- -----------------------------"
if [ -z $HEAD ]; then
# If we're not called with --list20, show all recordings
HEAD=99999
fi
for meeting in $(ls -u /var/bigbluebutton | grep "[0-9]\{13\}$"); do for meeting in $(ls -u /var/bigbluebutton | grep "[0-9]\{13\}$" | head -n $HEAD); do
echo -n "$meeting" echo -n "$meeting"
timestamp=$(echo $meeting | sed s/.*-//g) timestamp=$(echo $meeting | sed s/.*-//g)
epoc=$(($timestamp/1000)) epoc=$(($timestamp/1000))
echo -n " " echo -n " "
echo -n $(date --date "Jan 1, 1970 00:00:00 +0000 + $epoc seconds") echo -n $(date --date "Jan 1, 1970 00:00:00 +0000 + $epoc seconds") | awk '{ printf("%-28s",$0) }'
printf "%7s" $(find /var/bigbluebutton/$meeting/$meeting -name "*.swf" | wc -l) printf "%7s" $(find /var/bigbluebutton/$meeting/$meeting -name "*.swf" | wc -l)
#echo "/var/bigbluebutton/$meeting/$meeting" #echo "/var/bigbluebutton/$meeting/$meeting"
@ -278,4 +297,6 @@ done
fi fi
if [ $WATCH ]; then
watch -n 2 "bbb-record --list20"
fi

11
record-and-playback/slides/playback/slides/css/bbb.playback.css
View File

@ -56,7 +56,10 @@ br{
#mid {display:none} #mid {display:none}
#footer{ #footer{
position: absolute; margin-left: auto;
bottom: 0; margin-right: auto;
left: 40%; font-size:0.75em;
} color: #666;
text-align: center;
}