From dc1819b8ca5f6d1465d9ef873149abc9e56a8244 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Fri, 9 Sep 2011 16:19:28 -0700 Subject: [PATCH 1/6] Minor tweaks on the fotter for playback --- .../slides/playback/slides/css/bbb.playback.css | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/record-and-playback/slides/playback/slides/css/bbb.playback.css b/record-and-playback/slides/playback/slides/css/bbb.playback.css index a3825397d7..d8982bc86e 100755 --- a/record-and-playback/slides/playback/slides/css/bbb.playback.css +++ b/record-and-playback/slides/playback/slides/css/bbb.playback.css @@ -56,7 +56,10 @@ br{ #mid {display:none} #footer{ - position: absolute; - bottom: 0; - left: 40%; -} \ No newline at end of file + margin-left: auto; + margin-right: auto; + font-size:0.75em; + color: #666; + + text-align: center; +} From 581c104afc61c705925fa57214807bb7596fda73 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sat, 10 Sep 2011 06:35:32 -0700 Subject: [PATCH 2/6] added --list to list all recordings, --watch now watches the processing of the top 20 recordings --- bigbluebutton-config/bin/bbb-record | 43 +++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record index b97a5d5e3a..170788ff49 100755 --- a/bigbluebutton-config/bin/bbb-record +++ b/bigbluebutton-config/bin/bbb-record @@ -37,16 +37,16 @@ mark_for_rebuild() { for type in $TYPES; do if [ -d $BASE/process/$type/$MEETING_ID ]; then rm -rf $BASE/process/$type/$MEETING_ID - else - echo "Warn: Didn't find $BASE/process/$type/$MEETING_ID" - exit 1 +# else +# echo "Warn: Didn't find $BASE/process/$type/$MEETING_ID" +# exit 1 fi if [ -f $STATUS/processed/$MEETING_ID-$type.done ]; then rm $STATUS/processed/$MEETING_ID-$type.done - else - echo "Warn: Didn't find $STATUS/processed/$MEETING_ID-$type.done" - exit 1 +# else +# echo "Warn: Didn't find $STATUS/processed/$MEETING_ID-$type.done" +# exit 1 fi if [ -d $BASE/publish/$type/$MEETING_ID ]; then @@ -84,8 +84,11 @@ usage() { echo "Configuration:" echo " --version Display BigBlueButton version (packages)" echo + echo "Reporting:" + echo " --list List all recordings" + echo 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 " --deletall delete all meetings and recordings" echo @@ -103,6 +106,17 @@ while [ $# -gt 0 ]; do shift continue 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 need_root if [ ! -z "${2}" ]; then @@ -176,7 +190,7 @@ if [ $DELETEALL ]; then done fi -if [ $WATCH ]; then +if [ $LIST ]; then #ps -fC god @@ -192,13 +206,18 @@ if [ $WATCH ]; then echo "MeetingID Time Slides Recorded Archived Processed Published Description" 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" timestamp=$(echo $meeting | sed s/.*-//g) epoc=$(($timestamp/1000)) 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) #echo "/var/bigbluebutton/$meeting/$meeting" @@ -278,4 +297,6 @@ done fi - +if [ $WATCH ]; then + watch -n 2 "bbb-record --list20" +fi From e0af72fdf4c9ec40254a66ad002e92786f2587b9 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sat, 10 Sep 2011 11:50:24 -0700 Subject: [PATCH 3/6] Fixed path in create.jsp that was preventing the invite URL from working --- bbb-api-demo/src/main/webapp/create.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bbb-api-demo/src/main/webapp/create.jsp b/bbb-api-demo/src/main/webapp/create.jsp index f6b4ddaa05..cc3a76c1cf 100755 --- a/bbb-api-demo/src/main/webapp/create.jsp +++ b/bbb-api-demo/src/main/webapp/create.jsp @@ -106,8 +106,8 @@ $(document).ready(function(){ // String joinURL = getJoinURL(username, meetingID, "false", "
Welcome to %%CONFNAME%%.
", null, null); - - String inviteURL = BigBlueButtonURL + "demo/create.jsp?action=invite&meetingID=" + URLEncoder.encode(meetingID, "UTF-8"); + String url = BigBlueButtonURL.replace("bigbluebutton/","demo/"); + String inviteURL = url + "create.jsp?action=invite&meetingID=" + URLEncoder.encode(meetingID, "UTF-8"); %>
@@ -159,8 +159,8 @@ $(document).ready(function(){ String meetingID = request.getParameter("meetingID"); String username = request.getParameter("username"); - String enterURL = BigBlueButtonURL - + "demo/create.jsp?action=join&username=" + String url = BigBlueButtonURL.replace("bigbluebutton/","demo/"); + String enterURL = url + "create.jsp?action=join&username=" + URLEncoder.encode(username, "UTF-8") + "&meetingID=" + URLEncoder.encode(meetingID, "UTF-8"); From aaeb2bb186f5840ebbb4539b42d4c466c16e2eec Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sun, 11 Sep 2011 14:11:50 -0700 Subject: [PATCH 4/6] Fixed small typo for bbb-record --watch --- bigbluebutton-config/bin/bbb-record | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record index 170788ff49..8902c47694 100755 --- a/bigbluebutton-config/bin/bbb-record +++ b/bigbluebutton-config/bin/bbb-record @@ -111,7 +111,7 @@ while [ $# -gt 0 ]; do shift continue fi - if [ "$1" "--list20" ]; then + if [ "$1" = "--list20" ]; then LIST=1 HEAD=20 shift From f44c51a36d444994bd4a5542d96155fb61f22c74 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sun, 11 Sep 2011 16:16:15 -0700 Subject: [PATCH 5/6] Turned off autoJoin=true for config.xml ... welcome message tells users how to join audio --- bigbluebutton-client/resources/config.xml.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index b9526fd119..ed60e2fe5c 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -48,7 +48,7 @@ From 21b71b8052e5cef8a163a733b7f93464120245cb Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Sun, 11 Sep 2011 17:57:28 -0700 Subject: [PATCH 6/6] Turned back on autoJoin for audio to ensure users get a recording with audio --- bigbluebutton-client/resources/config.xml.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index ed60e2fe5c..b9526fd119 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -48,7 +48,7 @@