diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
index e3f12208b8203d0c9909ff981f6fff2360a8189a..858398532500815d6667fedda5677f8f979249ea 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
@@ -12,8 +12,8 @@ object Role extends Enumeration {
object Metadata extends Enumeration {
type Metadata = String
- val INACTIVITY_DEADLINE = "mconf-live-inactivity-deadline"
- val INACTIVITY_TIMELEFT = "mconf-live-inactivity-timeleft"
+ val INACTIVITY_DEADLINE = "inactivity-deadline"
+ val INACTIVITY_TIMELEFT = "inactivity-timeleft"
}
object GuestPolicy extends Enumeration {
diff --git a/bbb-client-check/locale/en_US/resources.properties b/bbb-client-check/locale/en_US/resources.properties
index a5fae5ffee63c46ec66bca8949c9d76b9e85b14e..852de1d304967899f80fde38b0756b14737eb7be 100755
--- a/bbb-client-check/locale/en_US/resources.properties
+++ b/bbb-client-check/locale/en_US/resources.properties
@@ -1,4 +1,4 @@
-bbbsystemcheck.title = Mconf-Live Client Check
+bbbsystemcheck.title = BigBlueButton Client Check
bbbsystemcheck.refresh = Refresh
bbbsystemcheck.mail = Mail
bbbsystemcheck.version = Client Check Version
diff --git a/bbb-client-check/locale/pt_BR/resources.properties b/bbb-client-check/locale/pt_BR/resources.properties
index 6bbc290dc71b057d0f9443e729fb0d1bd9fe96da..be2d6a47196e9bd49dc5a2370aa4a99126824a67 100644
--- a/bbb-client-check/locale/pt_BR/resources.properties
+++ b/bbb-client-check/locale/pt_BR/resources.properties
@@ -1,4 +1,4 @@
-bbbsystemcheck.title = Diagnóstico do cliente Mconf-Live
+bbbsystemcheck.title = Diagnóstico do cliente BigBlueButton
bbbsystemcheck.refresh = Recarregar
bbbsystemcheck.mail = E-mail
bbbsystemcheck.version = Versão deste verificador
diff --git a/bigbluebutton-client/build.xml b/bigbluebutton-client/build.xml
index b19f94f949014371e35186125ece60cab72d8e90..9258b0ccf394b601f4b031754618347dce27a9a7 100755
--- a/bigbluebutton-client/build.xml
+++ b/bigbluebutton-client/build.xml
@@ -431,7 +431,7 @@
<fileset dir="${PROD_RESOURCES_DIR}/help"/>
</copy>
<copy file="${PROD_RESOURCES_DIR}/BigBlueButtonTest.html" todir="${OUTPUT_DIR}" overwrite="true"/>
- <copy file="${PROD_RESOURCES_DIR}/MconfLive.html" todir="${OUTPUT_DIR}" overwrite="true"/>
+ <copy file="${PROD_RESOURCES_DIR}/BigBlueButton.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/ScreenshareStandalone.html" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/get_flash_player.gif" todir="${OUTPUT_DIR}" overwrite="true"/>
<copy file="${PROD_RESOURCES_DIR}/bbb.gif" todir="${OUTPUT_DIR}" overwrite="true"/>
@@ -461,8 +461,8 @@
<target name="generate-html-wrapper">
<html-wrapper
- title="Mconf-Live"
- file="MconfLive.html"
+ title="BigBlueButton"
+ file="BigBlueButton.html"
height="100%"
width="100%"
bgcolor="grey"
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 0bdc88042c5701bc01bacafb1311b62839fc7f78..500a34d926c35a8f6b67e64bde7cdc1a220b6b84 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -443,6 +443,7 @@ bbb.layout.name.webcamsfocus = Webcam Meeting
bbb.layout.name.presentfocus = Presentation Meeting
bbb.layout.name.lectureassistant = Lecture Assistant
bbb.layout.name.lecture = Lecture
+bbb.layout.name.sharednotes = Shared Notes
bbb.layout.addCurrentToFileWindow.title = Add current Layout to file
bbb.layout.addCurrentToFileWindow.text = Do you want to save the current layout to file?
bbb.layout.denyAddToFile.toolTip = Deny adding the current layout
@@ -492,7 +493,7 @@ bbb.endSession.confirm.message = If you close the session, all participants will
bbb.connection.failure=Detected Connectivity Problems
bbb.connection.reconnecting=Reconnecting
bbb.connection.reestablished=Connection reestablished
-bbb.connection.bigbluebutton=Main
+bbb.connection.bigbluebutton=BigBlueButton
bbb.connection.sip=SIP
bbb.connection.video=Video
bbb.connection.deskshare=Deskshare
diff --git a/bigbluebutton-client/locale/pt_BR/bbbResources.properties b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
index 04cdddf6d551cafb3f6b58cc4bc001d117821950..f35e521e91b7669ee5d970314c332d26bf67d842 100644
--- a/bigbluebutton-client/locale/pt_BR/bbbResources.properties
+++ b/bigbluebutton-client/locale/pt_BR/bbbResources.properties
@@ -476,7 +476,7 @@ bbb.endSession.confirm.message = Se você encerrar a sessão, todos os participa
bbb.connection.failure=Problemas de conectividade detectados
bbb.connection.reconnecting=Reconectando
bbb.connection.reestablished=Conexão restabelecida
-bbb.connection.bigbluebutton=Principal
+bbb.connection.bigbluebutton=BigBlueButton
bbb.connection.sip=SIP
bbb.connection.video=Video
bbb.connection.deskshare=Deskshare
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index a897e4739a23c19e949817990881db0aa88eaa3e..7c02c2f0563d9bcbbe002a3199a21d3650bd4bcb 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -9,7 +9,7 @@
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter"/>
<language userSelectionEnabled="true" />
<skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf?v=VERSION" />
- <branding logo="logo.png" copyright="© 2017 <u><a href="http://www.mconf.org" target="_blank">http://www.mconf.org</a></u>" background="" toolbarColor="" toolbarColorAlphas="" />
+ <branding logo="logo.png" copyright="© 2017 <u><a href="http://www.bigbluebutton.org" target="_blank">http://www.bigbluebutton.org</a></u>" background="" toolbarColor="" toolbarColorAlphas="" />
<shortcutKeys showButton="true" />
<browserVersions chrome="CHROME_VERSION" firefox="FIREFOX_VERSION" flash="FLASH_VERSION" java="1.7.0_51" />
<layout showLogButton="false" defaultLayout="bbb.layout.name.defaultlayout"
diff --git a/bigbluebutton-client/resources/prod/MconfLive.html b/bigbluebutton-client/resources/prod/BigBlueButton.html
similarity index 79%
rename from bigbluebutton-client/resources/prod/MconfLive.html
rename to bigbluebutton-client/resources/prod/BigBlueButton.html
index 7604598933200c3da23dc1bb2efa4ce8c3adf327..8a2a6d318b4434d48973e5c0a579504d6e8f2c3c 100755
--- a/bigbluebutton-client/resources/prod/MconfLive.html
+++ b/bigbluebutton-client/resources/prod/BigBlueButton.html
@@ -64,9 +64,9 @@
attributes.name = "BigBlueButton";
attributes.align = "middle";
attributes.tabIndex = 0;
-
- // In Chrome 56 Google started blocking Flash by default so we force the SWF to
- // be loaded in the DOM rather than relying on the SWFObject code to detect
+
+ // In Chrome 56 Google started blocking Flash by default so we force the SWF to
+ // be loaded in the DOM rather than relying on the SWFObject code to detect
// Flash because it can't.
var browserInfo = determineBrowser();
if (browserInfo && browserInfo[0] === "Chrome") {
@@ -80,7 +80,7 @@
} else {
swfobject.embedSWF("BigBlueButton.swf?v=VERSION", "altFlash", "100%", "100%", "11.0.0", "expressInstall.swf", flashvars, params, attributes, embedCallback);
}
-
+
function embedCallback(e) {
// Work around pixel alignment bug with Chrome 21 on Mac.
// See: http://code.google.com/p/bigbluebutton/issues/detail?id=1294
@@ -137,8 +137,50 @@
</script>
<script type="text/javascript">
window.onload = function() {
+ var checkRequest = $.ajax({
+ dataType: 'json',
+ url: '/html5client/check'
+ });
+ checkRequest.done(function(data) {
+ if(typeof data.html5clientStatus !== "undefined" && data.html5clientStatus === "running" && document.getElementById('html5Section') != null) {
+ document.getElementById('html5Section').style.display='inherit';
+ }
+ });
+
if (fillContent) fillContent();
};
+
+ function html5() {
+ // no Flash detected on the client
+ var originalPath, enterRequest, authToken, meetingId, userId;
+ originalPath = document.location.pathname;
+
+ // use the enter api to detect the meetingid, userid and authToken
+ // and reuse them to join via the HTML5 client
+ enterRequest = $.ajax({
+ dataType: 'json',
+ url: '/bigbluebutton/api/enter' + document.location.search
+ });
+
+ enterRequest.done(function(enterData) {
+ meetingId = enterData.response.meetingID;
+ userId = enterData.response.externUserID;
+ authToken = enterData.response.authToken;
+
+ if ((meetingId != null) && (userId != null) && (authToken != null)) {
+ // redirect to the html5 client with the received info
+ // format <IP>/html5client/<meetingId>/<userId>/<authToken>
+ document.location.pathname = "/html5client/join/"+meetingId+"/"+userId+"/"+authToken;
+ } else {
+ // go back to the redirection page
+ document.location.pathname = originalPath;
+ }
+ });
+
+ enterRequest.fail(function(enterData, textStatus, errorThrown){
+ BBBLog.debug("Enter request failed");
+ });
+ }
</script>
</head>
@@ -159,6 +201,10 @@
<a href="http://www.adobe.com/go/getflashplayer">
<img src="get_flash_player.gif" alt="Get Adobe Flash player" />
</a>
+ <div id="html5Section" style="display:none">
+ <p style="margin-left:50px;" >OR</p>
+ <button type="button" onclick="html5();"><h3>Launch the HTML5 client instead</h3></button>
+ </div>
</div>
</div>
</div>
diff --git a/bigbluebutton-client/resources/prod/bbb.gif b/bigbluebutton-client/resources/prod/bbb.gif
index b532f3b80eef7306bf4f29ab3a9ad286c83c7c2e..b01a452375a5213065dc237f34f22d97c3f69473 100644
Binary files a/bigbluebutton-client/resources/prod/bbb.gif and b/bigbluebutton-client/resources/prod/bbb.gif differ
diff --git a/bigbluebutton-client/resources/prod/layout.xml b/bigbluebutton-client/resources/prod/layout.xml
index 99f5f748df630beed9bee969e55357edaf947240..da13bce36760c12b762af87bb1ba2487ff73462c 100755
--- a/bigbluebutton-client/resources/prod/layout.xml
+++ b/bigbluebutton-client/resources/prod/layout.xml
@@ -1,43 +1,135 @@
<?xml version="1.0"?>
<layouts>
<layout name="bbb.layout.name.defaultlayout" default="true">
- <window name="VideoDock" minimized="false" maximized="false" hidden="false" width="0.2888030888030888" height="0.4113821138211382" minWidth="-1" x="0.7104247104247104" y="0.5804878048780487" order="2"/>
- <window name="UsersWindow" minimized="false" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="3"/>
- <window name="PresentationWindow" minimized="false" maximized="false" hidden="false" width="0.4888030888030888" height="0.9934959349593496" minWidth="-1" x="0.21853281853281853" y="0" order="1"/>
- <window name="CaptionWindow" minimized="false" maximized="false" hidden="true" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
- <window name="SharedNotesWindow" minimized="false" maximized="false" hidden="false" width="0.21621621621621623" height="0.3073170731707317" minWidth="-1" x="0" y="0.6861788617886179" order="4"/>
- <window name="ChatWindow" minimized="false" maximized="false" hidden="false" width="0.2888030888030888" height="0.5756097560975609" minWidth="-1" x="0.7104247104247104" y="0" order="0"/>
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" width="0.513" height="1" x="0.180" y="0" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
+ <window name="VideoDock" width="0.177" height="0.313" x="0" y="0.687" minWidth="280" />
+ <window name="ChatWindow" width="0.304" height="1" x="0.696" y="0" />
+ <window name="UsersWindow" width="0.177" height="0.679" x="0" y="0" minWidth="280" />
+ </layout>
+ <layout name="bbb.layout.name.closedcaption">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" width="0.513" height="0.684" x="0.180" y="0" />
+ <window name="CaptionWindow" width="0.513" height="0.308" x="0.180" y="0.692" />
+ <window name="VideoDock" width="0.177" height="0.308" x="0" y="0.687" minWidth="280" />
+ <window name="ChatWindow" width="0.304" height="1" x="0.696" y="0" />
+ <window name="UsersWindow" width="0.177" height="0.679" x="0" y="0" minWidth="280" />
</layout>
<layout name="bbb.layout.name.videochat">
- <window name="VideoDock" minimized="false" maximized="true" hidden="false" width="0.2888030888030888" height="0.4113821138211382" minWidth="-1" x="0.7104247104247104" y="0.5804878048780487" order="0"/>
- <window name="UsersWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="2"/>
- <window name="PresentationWindow" minimized="true" maximized="false" hidden="false" width="0.4888030888030888" height="0.9934959349593496" minWidth="-1" x="0.21853281853281853" y="0" order="3"/>
- <window name="CaptionWindow" minimized="false" maximized="false" hidden="true" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
- <window name="SharedNotesWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.3073170731707317" minWidth="-1" x="0" y="0.6861788617886179" order="1"/>
- <window name="ChatWindow" minimized="true" maximized="false" hidden="false" width="0.2888030888030888" height="0.5756097560975609" minWidth="-1" x="0.7104247104247104" y="0" order="4"/>
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="VideoDock" width="1" height="1" x="0" y="0" order="0"/>
+ <window name="ChatWindow" width="0.303125" height="0.9955703211517165" x="0.3229166666666667" y="0.9656699889258029" order="4" hidden="true" />
+ <window name="PresentationWindow" minimized="true" order="1" hidden="true" />
+ <window name="UsersWindow" minimized="true" hidden="true" order="2"/>
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
</layout>
<layout name="bbb.layout.name.webcamsfocus">
- <window name="VideoDock" minimized="false" maximized="false" hidden="false" width="0.6563706563706564" height="0.9951219512195122" minWidth="-1" x="0" y="0" order="2"/>
- <window name="UsersWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="2"/>
- <window name="PresentationWindow" minimized="false" maximized="false" hidden="false" width="0.33976833976833976" height="0.4585365853658537" minWidth="-1" x="0.6579150579150579" y="0.5349593495934959" order="4"/>
- <window name="CaptionWindow" minimized="false" maximized="false" hidden="true" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
- <window name="SharedNotesWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.3073170731707317" minWidth="-1" x="0" y="0.6861788617886179" order="1"/>
- <window name="ChatWindow" minimized="false" maximized="false" hidden="false" width="0.338996138996139" height="0.5300813008130081" minWidth="-1" x="0.6579150579150579" y="0" order="0"/>
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="VideoDock" width="0.6570188133140377" height="0.9960106382978723" x="0" y="0" />
+ <window name="ChatWindow" width="0.3393632416787265" height="0.5305851063829787" x="0.658465991316932" y="0" />
+ <window name="UsersWindow" hidden="true" />
+ <window name="PresentationWindow" width="0.34008683068017365" height="0.4601063829787234" x="0.658465991316932" y="0.535904255319149" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
</layout>
<layout name="bbb.layout.name.presentfocus">
- <window name="PresentationWindow" minimized="false" maximized="false" hidden="false" width="0.6563706563706564" height="0.9951219512195122" minWidth="-1" x="0" y="0" order="2"/>
- <window name="CaptionWindow" minimized="false" maximized="false" hidden="true" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
- <window name="UsersWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="2"/>
- <window name="VideoDock" minimized="false" maximized="false" hidden="false" width="0.33976833976833976" height="0.4585365853658537" minWidth="-1" x="0.6579150579150579" y="0.5349593495934959" order="4"/>
- <window name="SharedNotesWindow" minimized="true" maximized="false" hidden="false" width="0.21621621621621623" height="0.3073170731707317" minWidth="-1" x="0" y="0.6861788617886179" order="1"/>
- <window name="ChatWindow" minimized="false" maximized="false" hidden="false" width="0.338996138996139" height="0.5300813008130081" minWidth="-1" x="0.6579150579150579" y="0" order="0"/>
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" minimized="true" />
+ <window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
+ <window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
+ <window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
</layout>
- <layout name="bbb.layout.name.closedcaption">
- <window name="VideoDock" minimized="false" maximized="false" hidden="false" width="0.2888030888030888" height="0.4113821138211382" minWidth="-1" x="0.7104247104247104" y="0.5804878048780487" order="2"/>
- <window name="UsersWindow" minimized="false" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="3"/>
- <window name="PresentationWindow" minimized="false" maximized="false" hidden="false" width="0.4888030888030888" height="0.6780487804878049" minWidth="-1" x="0.21853281853281853" y="0" order="1"/>
- <window name="CaptionWindow" minimized="false" maximized="false" hidden="false" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
+ <layout name="bbb.layout.name.lectureassistant">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
+ <window name="UsersWindow" width="0.22152777777777777" height="0.9958677685950413" x="0" y="0" minWidth="280" />
+ <window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
+ <window name="VideoDock" width="0.30972222222222223" height="0.4357198347107438" x="0.6902777777777778" y="0.558870523415978" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
+ </layout>
+ <layout name="bbb.layout.name.lecture">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" />
+ <window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
+ <window name="PresentationWindow" width="0.7027777777777777" height="0.9986702127659575" x="0" y="0" />
+ <window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
+ </layout>
+ <layout name="bbb.layout.name.lecture" role="presenter">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" hidden="true" />
+ <window name="UsersWindow" hidden="true" />
+ <window name="PresentationWindow" maximized="true" />
+ <window name="VideoDock" hidden="true" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
+ </layout>
+ <layout name="bbb.layout.name.lecture" role="moderator">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
+ <window name="UsersWindow" width="0.22152777777777777" height="0.9944903581267218" x="0" y="0" minWidth="280" />
+ <window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
+ <window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
+ <window name="CaptionWindow" hidden="true" width="0.513" height="0.308" x="0.180" y="0.692" />
+ </layout>
+ <layout name="bbb.layout.name.sharednotes">
<window name="SharedNotesWindow" minimized="false" maximized="false" hidden="false" width="0.21621621621621623" height="0.3073170731707317" minWidth="-1" x="0" y="0.6861788617886179" order="4"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
<window name="ChatWindow" minimized="false" maximized="false" hidden="false" width="0.2888030888030888" height="0.5756097560975609" minWidth="-1" x="0.7104247104247104" y="0" order="0"/>
+ <window name="UsersWindow" minimized="false" maximized="false" hidden="false" width="0.21621621621621623" height="0.6780487804878049" minWidth="-1" x="0" y="0" order="3"/>
+ <window name="PresentationWindow" minimized="false" maximized="false" hidden="false" width="0.4888030888030888" height="0.9934959349593496" minWidth="-1" x="0.21853281853281853" y="0" order="1"/>
+ <window name="VideoDock" minimized="false" maximized="false" hidden="false" width="0.2888030888030888" height="0.4113821138211382" minWidth="-1" x="0.7104247104247104" y="0.5804878048780487" order="2"/>
+ <window name="CaptionWindow" minimized="false" maximized="false" hidden="true" width="0.4888030888030888" height="0.3073170731707317" minWidth="-1" x="0.21853281853281853" y="0.6861788617886179" order="1"/>
+ </layout>
+<!--
+ <layout name="Users">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" width="0.1772793053545586" height="0.6795212765957446" x="0" y="0" />
+ <window name="PresentationWindow" width="0.5137481910274964" height="0.9946808510638298" x="0.18017366136034732" y="0" />
+ <window name="VideoDock" width="0.1772793053545586" height="0.30851063829787234" x="0" y="0.6875" />
+ <window name="ChatWindow" width="0.3031837916063676" height="0.9960106382978723" x="0.6968162083936325" y="0" />
+ </layout>
+ <layout name="S2SPresentation">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" width="0.8" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
+ </layout>
+ <layout name="S2SVideoChat">
+ <window name="SharedNotesWindow" hidden="true" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="VideoDock" width="1" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
+ </layout>
+ <layout name="Notes">
+ <window name="SharedNotesWindow" hidden="false" width="0.7" height="0.4" x="0" y="0.6" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="false" width="0.7" height="0.6" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" width="0.3" height="1" x="0.7" y="0" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
+ </layout>
+ <layout name="Broadcast">
+ <window name="SharedNotesWindow" hidden="false" width="0.7" height="1" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="BroadcastWindow" hidden="false" width="0.7" height="0.9" x="0" y="0" draggable="false" resizable="false"/>
+ <window name="UsersWindow" hidden="true" draggable="false" resizable="false"/>
+ <window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
+ <window name="ChatWindow" width="0.3" height="1" x="0.7" y="0" draggable="false" resizable="false"/>
+ <window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
</layout>
+-->
</layouts>
diff --git a/bigbluebutton-client/resources/prod/lib/bbb_blinker.js b/bigbluebutton-client/resources/prod/lib/bbb_blinker.js
index ec3e3221e9197af2b9595667581761cc2a8525aa..1eb2bc24632649fca521c878144bfd91a287b40e 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_blinker.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_blinker.js
@@ -1,5 +1,5 @@
function setTitle(title){
- document.title= title;
+ document.title= "BigBlueButton - " + title;
}
function clientReady(message){
diff --git a/bigbluebutton-client/resources/prod/logo.png b/bigbluebutton-client/resources/prod/logo.png
index ced2cc1c9ecee0cf720c7060833cf2f3962e593f..17492e90b6a2a4be5b0bad3239fd062b99ee6357 100644
Binary files a/bigbluebutton-client/resources/prod/logo.png and b/bigbluebutton-client/resources/prod/logo.png differ
diff --git a/bigbluebutton-client/src/BigBlueButton.mxml b/bigbluebutton-client/src/BigBlueButton.mxml
index fc78140f56b7f5a1045fcbd9898e703680a1cfbf..37f0a82bfdbc611e42dd361536427c38549829db 100755
--- a/bigbluebutton-client/src/BigBlueButton.mxml
+++ b/bigbluebutton-client/src/BigBlueButton.mxml
@@ -21,7 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns:views="*"
- pageTitle="Mconf-Live"
+ pageTitle="BigBlueButton"
layout="absolute"
preinitialize="LogUtil.initLogging(true)"
preloader="org.bigbluebutton.main.model.BigBlueButtonPreloader">
diff --git a/bigbluebutton-client/src/assets/images/elipse.png b/bigbluebutton-client/src/assets/images/elipse.png
new file mode 100755
index 0000000000000000000000000000000000000000..3252b6aa957f272a4c0ae8ea14213464681cba7d
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/elipse.png differ
diff --git a/bigbluebutton-client/src/assets/images/fit-to-screen.png b/bigbluebutton-client/src/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000000000000000000000000000000000..0f83d20bedc8a35bced16f37b0e6cd2f6277d81f
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/src/assets/images/fit-to-width.png b/bigbluebutton-client/src/assets/images/fit-to-width.png
new file mode 100755
index 0000000000000000000000000000000000000000..12b052798435720aca6d0c94e43073e4eac5a1d4
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/src/assets/images/left_arrow.png b/bigbluebutton-client/src/assets/images/left_arrow.png
new file mode 100755
index 0000000000000000000000000000000000000000..e6abeb60d45d8a2a2b0f85b741f1af14683a4c4c
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/left_arrow.png differ
diff --git a/bigbluebutton-client/src/assets/images/right_arrow.png b/bigbluebutton-client/src/assets/images/right_arrow.png
new file mode 100755
index 0000000000000000000000000000000000000000..6eab9f047a5ecd05d65ac1dae3f226b80009347d
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/right_arrow.png differ
diff --git a/bigbluebutton-client/src/assets/images/upload.png b/bigbluebutton-client/src/assets/images/upload.png
new file mode 100755
index 0000000000000000000000000000000000000000..724a094ae6974c1fd6e451ed492a06955e538ed2
Binary files /dev/null and b/bigbluebutton-client/src/assets/images/upload.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/Cursor.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/Cursor.png
new file mode 100755
index 0000000000000000000000000000000000000000..6e29c43729b8711191d7120348e15bbcfa236dd0
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/Cursor.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/administrator.gif b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/administrator.gif
new file mode 100755
index 0000000000000000000000000000000000000000..608d2d165cc57f36680e07fab2e93bfa807b1448
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/administrator.gif differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/annotation.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/annotation.png
new file mode 100755
index 0000000000000000000000000000000000000000..fb7cb8e9e749505cb926978acd0a4c5e3a531064
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/annotation.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/application_put.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/application_put.png
new file mode 100644
index 0000000000000000000000000000000000000000..c30cf59894473550b70d2ab97e2244af64c2ecd0
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/application_put.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_in.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_in.png
new file mode 100755
index 0000000000000000000000000000000000000000..745c65134db478a64016d63a7104e585452f2b9f
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_in.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_left.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ee138d14b6276fabb20d8f4a0001c284915667
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_left.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_out.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e9bc42bec16e3077a9680e7af0f90395bfeb60c
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_out.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_right.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f455031232ff01b4eadc4a995091b8c7d80d5c4c
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_right.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_undo.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0f8038cff94cd994c8356cdb543b3aa849bb288
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/arrow_undo.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/avatar.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e9f8151f4083aece663009ae40d9271104dbb41
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/avatar.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/bandwidth.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/bandwidth.png
new file mode 100755
index 0000000000000000000000000000000000000000..adb979ce5aa24832549312d1291605e4dfcc4cae
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/bandwidth.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/blank-circle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/blank-circle.png
new file mode 100755
index 0000000000000000000000000000000000000000..f3b2a1360a0a4dcfe3824294e268cad6918ea240
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/blank-circle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/chat.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/chat.png
new file mode 100755
index 0000000000000000000000000000000000000000..15ce4659becbb786d104c863aec789ce78c487be
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/chat.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/circle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e7ffa98614ec3ad0f62671581cbd0bcf6e74c7
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/circle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png
new file mode 100755
index 0000000000000000000000000000000000000000..2c68797e1e5ec4ecde6df2e3ffc0ad1cc4c91302
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_close.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9065faaf077a4032e50c4455f2e0e10a349c2af
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_on.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab036b1766e4284d2603518848309a1ad3a5f842
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/deskshare_on.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/disk.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/disk.png
new file mode 100644
index 0000000000000000000000000000000000000000..99d532e8b1750115952f97302a92d713c0486f97
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/disk.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_away.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_away.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2042f1d8b21f16533efdb858119daaa0a716942
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_away.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_confused.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_confused.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7774ba6c620bc836c1c45ed1067c027fd0c099b
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_confused.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_happy.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_happy.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1e579d3ae58090650ccfab6b99c9b76535d7d0b
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_happy.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_neutral.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_neutral.png
new file mode 100644
index 0000000000000000000000000000000000000000..90337ef36e9df667485ec99670da54670e844c35
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_neutral.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_raiseHand.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_raiseHand.png
new file mode 100755
index 0000000000000000000000000000000000000000..4c5c4836d1a4a55a34ed332a7b2b05800febe97a
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_raiseHand.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_sad.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_sad.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8d820ccab4945d2e74f22a62c30406c91bc0a14
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/emoji_sad.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-page.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-page.png
new file mode 100755
index 0000000000000000000000000000000000000000..47277b6aacc1f97b155fe640dfe56a191fb5476d
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-page.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png
new file mode 100755
index 0000000000000000000000000000000000000000..fe28c01d240b2ba38bc005ec4fc8af97f3248d62
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-screen.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png
new file mode 100755
index 0000000000000000000000000000000000000000..f991166ed66ce39733208574c3a1bc7931d812be
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/fit-to-width.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/folder.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/folder.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/forward_blue.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/forward_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a2f9d4e4a81857f509d85bbe46936c99709cd6f
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/forward_blue.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/green-circle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/green-circle.png
new file mode 100755
index 0000000000000000000000000000000000000000..08f8b8c25a23734b28abe4b90f809d770d592600
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/green-circle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand_icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..9613b05b115c820fa93ef5ce38ac181407a3d465
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/hand_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png
new file mode 100755
index 0000000000000000000000000000000000000000..3117136c1fda27fb27a057d835deb05a0a888e23
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/left_arrow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock.png
new file mode 100755
index 0000000000000000000000000000000000000000..08f0bf613f5e25dababa85e2a9e645f27ef9aec4
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock_close.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock_close.png
new file mode 100755
index 0000000000000000000000000000000000000000..2ebc4f6f9663e32cad77d67ef93ab8843dfea3c0
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/lock_close.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier.png
new file mode 100644
index 0000000000000000000000000000000000000000..415b81f589a7ac65ab9e29a9d22b362c8ca0a262
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier_reset.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier_reset.png
new file mode 100755
index 0000000000000000000000000000000000000000..7f9d1f10fe789afffe142dfc6b3375565c649d91
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/magnifier_reset.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_muted.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_muted.png
new file mode 100755
index 0000000000000000000000000000000000000000..34e813655006205fa661dbda05b852a91663cddc
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_muted.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_unmuted.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_unmuted.png
new file mode 100755
index 0000000000000000000000000000000000000000..d5b65fc7efc1702fcb6fcf34bb7d51c59ae16235
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/mic_unmuted.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator.png
new file mode 100644
index 0000000000000000000000000000000000000000..36213a78668b1dca782629208ea25c0680a5216f
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/moderator.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_link.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_link.png
new file mode 100644
index 0000000000000000000000000000000000000000..319e27b1925e4f135f1f82873478452403516db9
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_link.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_white_get.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_white_get.png
new file mode 100755
index 0000000000000000000000000000000000000000..5e3c3db49266205ada109139fb5c13a4c2bd6ade
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/page_white_get.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant-mute.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant-mute.png
new file mode 100644
index 0000000000000000000000000000000000000000..57b6320479d61cab97575cbef09157da017fb3b6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant-mute.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant.gif b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant.gif
new file mode 100755
index 0000000000000000000000000000000000000000..d307b20068a20cd09497a6366201a93ff1487778
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/participant.gif differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pointer_delete_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pointer_delete_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..58843f630372ea8ffc69424b0ec1fa58e287b5f3
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pointer_delete_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/poll_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/poll_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1747b00c1767ecb5ef1bf822eded15c8a67b25c5
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/poll_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1974cda745278a404b9e29fa91e0503a84accb1
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_new.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d40bb75b3df779443e7f96c808f193d82bee63
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/presenter_new.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/red-circle.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/red-circle.png
new file mode 100755
index 0000000000000000000000000000000000000000..1c500ba34e6e023796bf329bb335390d9649c3d6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/red-circle.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png
new file mode 100755
index 0000000000000000000000000000000000000000..f00775a7eab38053a23d662ed228e66cb25f4b56
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/righ-arrow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/scribble_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/scribble_icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..60c8b028e28b9b3daf788df737f6a56b2608add4
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/scribble_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/shape_handles.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/shape_handles.png
new file mode 100755
index 0000000000000000000000000000000000000000..ce27fe3a0345e03e919b54ca3b6a8498743b2ee9
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/shape_handles.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/sign-out.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/sign-out.png
new file mode 100755
index 0000000000000000000000000000000000000000..5f99debfcad533d31a79852b2422cf9bd4130cd8
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/sign-out.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/statistics.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/statistics.png
new file mode 100755
index 0000000000000000000000000000000000000000..d4779d9d69e71375594045eeb070e9793fb897a6
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/statistics.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca80815db2747df0f97b6c54531dcb450e8a404
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/unlock.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/unlock.png
new file mode 100755
index 0000000000000000000000000000000000000000..d09050420eb92a7060454f1053d8a72352413178
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/unlock.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png
new file mode 100755
index 0000000000000000000000000000000000000000..030cc3e82aab53ff29cbc0dc4fbe30ee067177be
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/upload.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_go.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_go.png
new file mode 100644
index 0000000000000000000000000000000000000000..0468cf08f3760dc13e44aed69f4f15cedc93b503
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_go.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_gray.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fd539e9cb04111e950ac9b0cce82676f12f67d4
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_gray.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_green.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..30383c2de517fd22945a87b0528d2821ec4d49ce
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_green.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_orange.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..b818127df6d064b71838c377063c2c61517ffa01
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_orange.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_red.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6f66e8b300750826b214e38e7cf3365fa637878
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/user_red.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/vdoc_bg.jpg b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/vdoc_bg.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..0dfda438df84be7d57567944ff3a89f1f540900a
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/vdoc_bg.jpg differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam.png
new file mode 100755
index 0000000000000000000000000000000000000000..af71c30610862c76f07e948d8c28433c7d338f9a
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png
new file mode 100755
index 0000000000000000000000000000000000000000..5265a7305e18196d51edcf9db18789c935bb9e9e
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_close.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_kickuser.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_kickuser.png
new file mode 100755
index 0000000000000000000000000000000000000000..561edc8d9b00d9c97c9acd82b4bf121bc3a77426
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_kickuser.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_make_presenter.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_make_presenter.png
new file mode 100755
index 0000000000000000000000000000000000000000..e7cfff5e97381b5a88d0b96b35508e52e850960e
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_make_presenter.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_new.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae305c167a690281fa8f741e2d096605f5b94f99
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_new.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_on.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c491aa4b5b75f6e3aeed6f3b75f04f74eff9143
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_on.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_private_chat.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_private_chat.png
new file mode 100755
index 0000000000000000000000000000000000000000..9fdff988a3cfa2f6ef81f0a2d0de135dd199371e
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_private_chat.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_unmute.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_unmute.png
new file mode 100755
index 0000000000000000000000000000000000000000..32a685732f0073772bb782662fe37e30a83d5220
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/webcam_unmute.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/whiteboard_icon.png b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/whiteboard_icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..aee99fc0c74ce104ee94ef5116badb9dc6e2eb38
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/common/assets/images/whiteboard_icon.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
index 83a3ab08928d2f59c51d293d20090baafd2476bc..944a592637d7de4e02c461923243bcf877df88fa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
@@ -20,7 +20,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
-<mx:ProgressBar xmlns:mate="http://mate.asfusion.com/" xmlns:mx="http://www.adobe.com/2006/mxml" labelPlacement="bottom" minimum="0" maximum="100" mode="manual" barColor="black" >
+<mx:ProgressBar xmlns:mate="http://mate.asfusion.com/" xmlns:mx="http://www.adobe.com/2006/mxml" labelPlacement="bottom" minimum="0" maximum="100" mode="manual" >
<mate:Listener type="{ModuleLoadEvent.MODULE_LOADING_STARTED}" method="moduleLoadingStarted" />
<mate:Listener type="{ModuleLoadEvent.MODULE_LOAD_PROGRESS}" method="moduleLoadProgress" />
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
index 4adeebd00159c229a31695b194ce0c5617699213..78faf63d4a1173b1b896bb74ab11db74c3ab2a03 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
@@ -230,8 +230,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
} else {
if (UserManager.getInstance().getConference().amIModerator()) {
- if (MeetingModel.getInstance().meeting.isMetadata("mconf-live-wont-record-message")) {
- this.toolTip = MeetingModel.getInstance().meeting.metadata["mconf-live-wont-record-message"];
+ if (MeetingModel.getInstance().meeting.isMetadata("wont-record-message")) {
+ this.toolTip = MeetingModel.getInstance().meeting.metadata["wont-record-message"];
} else {
this.toolTip = ResourceUtil.getInstance().getString('bbb.mainToolbar.recordBtn.toolTip.wontRecord');
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic-2.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic-2.png
new file mode 100755
index 0000000000000000000000000000000000000000..cd664085f71681dbf632285794848847a80aa353
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic-2.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic.png
new file mode 100755
index 0000000000000000000000000000000000000000..30e999e61ea2ac47a1493349b022c27d6fc30a10
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-change-mic.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-permission.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-permission.png
new file mode 100755
index 0000000000000000000000000000000000000000..4a05fa0f01592400ecd96cc6756985214d940b06
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-permission.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-switch-done.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-switch-done.png
new file mode 100755
index 0000000000000000000000000000000000000000..b750a983459be7faf4e2363b104680201dfb64ae
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-mic-switch-done.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-reload-page.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-reload-page.png
new file mode 100755
index 0000000000000000000000000000000000000000..8057c9369280bd3859509312d02638dc8a9a02c2
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-reload-page.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-show-mics.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-show-mics.png
new file mode 100755
index 0000000000000000000000000000000000000000..75024779a60ca57ccef3b335e3f1b58d86f27b1d
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-show-mics.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-switch-mic.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-switch-mic.png
new file mode 100755
index 0000000000000000000000000000000000000000..0a544b233cc99e0f27cfb04cdd9cf904d4ae1554
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome-switch-mic.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome_allow.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome_allow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5bccc25aefea3ef7dcd80436aff7d4599806fb2
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/chrome_allow.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-mic-permission.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-mic-permission.png
new file mode 100755
index 0000000000000000000000000000000000000000..fc76db6bbf29582c680f31fa6b0c2c36dd1462ed
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-mic-permission.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-share-mic.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-share-mic.png
new file mode 100755
index 0000000000000000000000000000000000000000..caea95541b37d6a4e57a506b6cb65518d29f033d
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-share-mic.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-show-mic.png b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-show-mic.png
new file mode 100755
index 0000000000000000000000000000000000000000..2a048b28d011d72f9ebcc1163caa6faa9e093f09
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/main/views/assets/ff-show-mic.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/images/phone_sound.png b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/images/phone_sound.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fdf1c58c0a0498c7a0d35a42c6fb08c9e053b88
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/assets/images/phone_sound.png differ
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/assets/resizeCursorVH.gif b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/assets/resizeCursorVH.gif
new file mode 100755
index 0000000000000000000000000000000000000000..7da81d6f379062077edbb7a1b241bd479363a312
Binary files /dev/null and b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/assets/resizeCursorVH.gif differ
diff --git a/bigbluebutton-config/web/default.pdf b/bigbluebutton-config/web/default.pdf
old mode 100755
new mode 100644
index 88d153dd5861cd3a0f17401efcd6cd7991513931..8bd18ac603171b590e0280ec26bd4328c9225b42
Binary files a/bigbluebutton-config/web/default.pdf and b/bigbluebutton-config/web/default.pdf differ
diff --git a/bigbluebutton-config/web/favicon.ico b/bigbluebutton-config/web/favicon.ico
index 41c8cb123a1ebe2b686b808fb4f75e752b3b6b42..2a399b83be1833fa8a206a7f33d35f8bb745031e 100644
Binary files a/bigbluebutton-config/web/favicon.ico and b/bigbluebutton-config/web/favicon.ico differ
diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html
index e90bf452ed14a18fafb59fca4f4d1651448d90eb..0cb6b40f63d7f50cb3d554522205af4ea5db64b0 100644
--- a/bigbluebutton-config/web/index.html
+++ b/bigbluebutton-config/web/index.html
@@ -1,12 +1,272 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script type="text/javascript">
-<!--
-window.location = "/demo/demo_mconf.jsp"
-//-->
-</script>
-</head>
-<body>
-</body>
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+ <title>BigBlueButton - Open Source Web Conferencing</title>
+ <meta name="description" content="BigBlueButton enables universities and colleges to deliver a high-quality learning experience to remote students.">
+ <meta name="keywords" content="BigBlueButton, Open Source Web Conferencing, Distance Education, Courses Online, Web Conferencing, Open Source, Desktop Sharing, Video Conferencing, Video Collaboration, Presentation Sharing, Audio Sharing, Voice Collaboration, Public Chat, Webcam Sharing, Annotation, Whiteboard, Integrated Voice Over IP, Collaboration Software, Online Collaboration, Collaborative Learning, Virtual Classroom">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <link rel="icon" href="images/favicon.png">
+
+ <link rel="stylesheet" href="css/bijou.min.css">
+ <link rel="stylesheet" href="css/style.css">
+ <link rel="stylesheet" href="css/font-awesome.min.css">
+ <link rel="stylesheet" href="css/bbb-bootstrap.css">
+
+ <script src="js/jquery.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ <script src="js/bigbluebutton.js"></script>
+ </head>
+ <body>
+ <div class='main'>
+
+ <!-- Github Fork Ribbon -->
+ <a href="https://github.com/bigbluebutton/bigbluebutton">
+ <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub">
+ </a>
+
+ <!-- Messages -->
+ <div id='messages' class='hidden'>
+ </div>
+
+ <!-- Header -->
+ <div class='navbar'>
+ <div class='container'>
+ <div class="logo">
+ <img src="images/bbb-logo.png" alt="BigBlueButton Demo"/>
+ </div>
+ </div>
+ </div>
+
+ <!-- Body -->
+ <div class='container'>
+
+ <!-- Welcome Message & Login Into Demo -->
+ <div class='row'>
+ <div class='span five'>
+ <h2>Welcome</h2>
+ <p> <a href="http://bigbluebutton.org/" target="_blank">BigBlueButton</a> is an open source web conferencing system for on-line learning. </p>
+ <p> We believe that every student with a web browser should have access to a high-quality on-line learning experience </p>
+ <p> We intend to make that possible with BigBlueButton.</p>
+
+ <h4>For Developers</h4>
+ <p> The BigBlueButton project is <a href="http://bigbluebutton.org/support">supported</a> by a community of developers that care about good design and a streamlined user experience. </p>
+ <p>See <a href="/demo/demo1.jsp" target="_blank">API examples </a> for how to integrate BigBlueButton with your project.</p>
+ </div>
+ <div class="span one"></div>
+ <div class='span six'>
+ <div class='join-metting pull-right'>
+ <h4>Try BigBlueButton</h4>
+ <p>Join a demo session on this server.</p>
+
+ <form name="form1" method="GET" onsubmit="return checkform(this);" action="/demo/demo1.jsp">
+ <input type="text" id="username" required="" name="username" placeholder="Enter Your Name" size="29" class="field input-default" autofocus>
+ <input type="submit" value="Join" class="submit_btn button success large"><br>
+ <input type="hidden" name="action" value="create">
+ </form>
+
+ <a class="watch" href="#video" class="pull-right">New to BigBlueButton? Watch these videos.</a>
+
+ </div>
+
+ </div>
+ </div>
+
+ <hr class="featurette-divider">
+
+ <!-- BigBlueButton Features -->
+ <div class="bbb-features">
+ <div class='row'>
+ <div class='featurette-heading'>
+ <h2>Features</h2>
+ </div>
+
+ <div class='span four first'>
+ <i class="fa fa-play-circle-o"></i>
+
+ <div class="bbb-features-content">
+ <h3>Record and Playback</h3>
+ <p>BigBlueButton can record your sessions for later playback by students.</p>
+ </div>
+ </div>
+
+ <div class='span four'>
+ <i class="fa fa-pencil-square-o"></i>
+
+ <div class="bbb-features-content">
+ <h3>Whiteboard</h3>
+ <p>The whiteboard controls let you annotate key parts of your presentation.</p>
+ </div>
+ </div>
+
+ <div class='span four last'>
+ <i class="fa fa-desktop"></i>
+
+ <div class="bbb-features-content">
+ <h3><a href="https://youtu.be/xTFuEvmEqB0">Desktop Sharing</a></h3>
+ <p>You can broadcast your desktop for all users to see (requires lastest version of Java for presenter only).</p>
+ </div>
+ </div>
+ </div>
+
+
+ <div class='row'>
+ <div class='span four first'>
+ <i class="fa fa-microphone"></i>
+
+ <div class="bbb-features-content">
+ <h3><a href="https://youtu.be/4Y__UsUrRx0">WebRTC Audio</a></h3>
+ <p>Users of Chrome and FireFox browsers will benefit from high-quality, low-latency WebRTC audio. (Users of other browsers will seamlessly use Flash-based audio.)</p>
+ </div>
+ </div>
+
+ <div class='span four'>
+ <i class="fa fa-bar-chart-o"></i>
+
+ <div class="bbb-features-content">
+ <h3><a href="https://youtu.be/J9mbw00P9W0">Presentation</a></h3>
+ <p>You can upload any PDF presentation or MS office document. BigBlueButton keeps everyone in sync with your current slide, zoom, pan, annotations, and mouse pointer.</p>
+ </div>
+ </div>
+
+ <div class='span four last'>
+ <i class="fa fa-video-camera"></i>
+
+ <div class="bbb-features-content">
+ <h3>Web Cam</h3>
+ <p>Multiple users can share their webcam at the same time. There is no built-in limit on the number of simultaneously active webcams.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class='row'>
+ <div class='span four first'>
+ <i class="fa fa-smile-o"></i>
+
+ <div class="bbb-features-content">
+ <h3>Emoji</h3>
+ <p>Students can raise hand and use emoji icons for feedback.</p>
+ </div>
+ </div>
+
+ <div class='span four'>
+ <i class="fa fa-check-square-o"></i>
+
+ <div class="bbb-features-content">
+ <h3>Polling</h3>
+ <p>You can poll students anytime to increase engagement.</p>
+ </div>
+ </div>
+
+ <div class='span four last'>
+ <i class="fa fa-comments-o"></i>
+
+ <div class="bbb-features-content">
+ <h3>Chat</h3>
+ <p>You can interact with students through public and private chat.</p>
+ </div>
+ </div>
+ </div>
+
+ <div class='row'>
+ <div class='span four first'>
+ <i class="fa fa-cc"></i>
+
+ <div class="bbb-features-content">
+ <h3><a href="https://youtu.be/vDpurrMgal0">Live Captioning</a></h3>
+ <p>You can enter live captions for students. These captions will later appear as subtitles in recordings.</p>
+ </div>
+ </div>
+
+ <div class='span four'>
+ <i class="fa fa-users"></i>
+
+ <div class="bbb-features-content">
+ <h3><a href="https://youtu.be/q5N-lcocJss">Breakout Rooms</a></h3>
+ <p>You can group and place students into breakout rooms (full BigBlueButton sessions) for give number of minutes for increased collaboration.</p>
+ </div>
+ </div>
+
+ <div class='span four last'>
+ <i class="fa fa-blind"></i>
+
+ <div class="bbb-features-content">
+ <h3>Screen Reader</h3>
+ <p>Students with visual disabilities can use JAWS screen reader to interact with BigBlueButton.</p>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <hr class="featurette-divider">
+
+ <!-- BigBlueButton Videos -->
+ <div id="video" class="bbb-videos">
+ <div class='row'>
+ <div class='featurette-heading'>
+ <h2>Getting Started Quickly</h2>
+ </div>
+
+ <div class='span four first video-item'>
+ <a href="https://www.youtube.com/watch?v=4Y__UsUrRx0&feature=youtu.be" target="_blank">
+ <div class="video-btn"><i class="fa fa-play-circle-o"></i></div>
+ <img src="images/bbb-setup-audio.jpg" alt="Setting Up Audio"/>
+ </a>
+ <h3><a href="https://www.youtube.com/watch?v=4Y__UsUrRx0&feature=youtu.be" title="Setup Audio" target="_blank">Setting Up Audio</a></h3>
+ </div>
+
+ <div class='span four video-item'>
+ <a href="https://www.youtube.com/watch?v=oh0bEk3YSwI" target="_blank">
+ <div class="video-btn"><i class="fa fa-play-circle-o"></i></div>
+ <img src="images/bbb-viewer-overview.jpg" alt="BigBlueButton Viewer Overview Video"/>
+ </a>
+ <h3><a href="https://www.youtube.com/watch?v=oh0bEk3YSwI;feature=youtu.be" title="Student Overview" target="_blank">Viewer Overview</a></h3>
+ </div>
+
+ <div class='span four last video-item'>
+ <a href="https://www.youtube.com/watch?v=J9mbw00P9W0&feature=youtu.be" target="_blank">
+ <div class="video-btn"><i class="fa fa-play-circle-o"></i></div>
+ <img src="images/bbb-presenter-overview.jpg" alt="Moderator/Presenter Overview Video"/>
+ </a>
+ <h3><a href="https://www.youtube.com/watch?v=J9mbw00P9W0&feature=youtu.be" title="Moderator/Presenter Overview" target="_blank">Moderator/Presenter Overview</a></h3>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <!-- Footer -->
+ <footer>
+ <div class='container'>
+
+ <div class="row">
+ <div class="span six first">
+ <p>BigBlueButton and the BigBlueButton logo are trademarks of <a href="http://bigbluebutton.org/">BigBlueButton Inc.</a></p>
+ </div>
+ <div class="span six last">
+ <ul>
+ <li>
+ Follow Us:
+ </li>
+ <li><a class="twitter" href="http://www.twitter.com/bigbluebutton" title="BigBlueButton Twitter Page" target="_blank"><i class="fa fa-twitter"></i></a></li>
+ <li><a class="facebook" href="http://www.facebook.com/bigbluebutton" title="BigBlueButton Facebook Page" target="_blank"><i class="fa fa-facebook"></i></a></li>
+ <li><a class="youtube" href="http://www.youtube.com/bigbluebuttonshare" title="BigBlueButton YouTube Page" target="_blank"><i class="fa fa-youtube"></i> </a></li>
+ <li><a class="google" href="http://google.com/+bigbluebutton" title="BigBlueButton Google Plus" target="_blank"><i class="fa fa-google-plus"></i></a></li>
+ </ul>
+ </div>
+ </div>
+
+
+ <div class="row">
+ <div class="span twelve center">
+ <p>Copyright © 2016 BigBlueButton Inc.<br>
+ <small>Version <a href="http://docs.bigbluebutton.org/">1.1-beta</a></small>
+ </p>
+ </div>
+ </div>
+ </div>
+ </footer>
+ </body>
</html>
diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 301596b9695657fa2582ea708edba9258194334e..56eb9a4bd868e5382982f338ab80ac9a23740f14 100644
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -100,8 +100,8 @@ defaultDialAccessNumber=613-555-1234
# Default welcome message to display when the participant joins the web
# conference. This is only used for the old scheduling which will be
# removed in the future. Use the API to create a conference.
-defaultWelcomeMessage=<br>Welcome to <b>%%CONFNAME%%</b>!<br><br>To join the audio bridge click the headset icon (upper-left hand corner). Use a headset to avoid causing background noise for others.<br>
-defaultWelcomeMessageFooter=
+defaultWelcomeMessage=<br>Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href="event:http://www.bigbluebutton.org/content/videos"><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the headset icon (upper-left hand corner). Use a headset to avoid causing background noise for others.<br>
+defaultWelcomeMessageFooter=This server is running <a href="http://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>.
# Default maximum number of users a meeting can have.
# Current default is 0 (meeting doesn't have a user limit).
@@ -150,7 +150,7 @@ bigbluebutton.web.logoutURL=default
# The url of the BigBlueButton client. User's will be redirected here when
# successfully joining the meeting.
-defaultClientUrl=${bigbluebutton.web.serverURL}/client/MconfLive.html
+defaultClientUrl=${bigbluebutton.web.serverURL}/client/BigBlueButton.html
#defaultClientUrl=http://192.168.0.235/3rd-party.html
# The default avatar image to display if nothing is passed on the JOIN API (avatarURL)
diff --git a/deskshare/applet/build.gradle b/deskshare/applet/build.gradle
index 149b1e346a763c4c3b3a4a95a6050147d427e7dd..2f5b4608be7859da3a18d8a6c869cae033de88a5 100755
--- a/deskshare/applet/build.gradle
+++ b/deskshare/applet/build.gradle
@@ -32,7 +32,7 @@ jar.doFirst {
jar {
manifest.mainAttributes("Permissions": "all-permissions")
manifest.mainAttributes("Codebase": "*")
- manifest.mainAttributes("Application-Name": "Mconf Deskshare Applet")
+ manifest.mainAttributes("Application-Name": "BigBlueButton Deskshare Applet")
manifest.mainAttributes("Application-Library-Allowable-Codebase": "*")
manifest.mainAttributes("Caller-Allowable-Codebase": "*")
manifest.mainAttributes("Trusted-Only": "true")
diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh
index 4e8fe016bdc1a97b65dc435190a6070d7cf90b99..064af82a413411d5a2f62c7bd1308029cb686dac 100755
--- a/record-and-playback/deploy.sh
+++ b/record-and-playback/deploy.sh
@@ -38,16 +38,7 @@ function deploy_format() {
done
}
-RECORDING_SERVER=true
-if $RECORDING_SERVER ; then
- deploy_format "presentation"
- deploy_format "presentation_export"
- deploy_format "mconf_decrypter"
- sudo mv /usr/local/bigbluebutton/core/scripts/mconf-recording-decrypter.initd /etc/init.d/mconf-recording-decrypter
- sudo mv /usr/local/bigbluebutton/core/scripts/mconf-recording-decrypter.monit /etc/monit/conf.d/mconf-recording-decrypter
-else
- deploy_format "mconf_encrypted"
-fi
+deploy_format "presentation"
sudo mkdir -p /var/bigbluebutton/playback/
sudo mkdir -p /var/bigbluebutton/recording/raw/
diff --git a/record-and-playback/presentation/playback/presentation/0.81/logo.png b/record-and-playback/presentation/playback/presentation/0.81/logo.png
index ce4ab709dbe496ea387b0ff14164adad7a60a947..8f181420c325b665b8a49972f137e1471c305410 100755
Binary files a/record-and-playback/presentation/playback/presentation/0.81/logo.png and b/record-and-playback/presentation/playback/presentation/0.81/logo.png differ
diff --git a/record-and-playback/presentation/playback/presentation/0.81/playback.html b/record-and-playback/presentation/playback/presentation/0.81/playback.html
index ef51674823d038740d06463bde36881c589027b6..e9824c538b1603b35bbb914769a1d02f4b12676e 100755
--- a/record-and-playback/presentation/playback/presentation/0.81/playback.html
+++ b/record-and-playback/presentation/playback/presentation/0.81/playback.html
@@ -18,7 +18,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
<html>
<head>
- <title>Recording Playback</title>
+ <title>BigBlueButton Playback</title>
<link rel="stylesheet" href="css/bbb.playback.css">
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.min.js"></script>
@@ -46,7 +46,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</style>
</head>
<body>
- <h1 class="visually-hidden">Recording Playback</h1>
+ <h1 class="visually-hidden">BigBlueButton Playback</h1>
<div id="playbackArea" class="clearfix" role="main">
<h2 class="visually-hidden">Slide Thumbnails</h2>
<div id="thumbnails" role="region" aria-label="Slide thumbnails"></div>
@@ -90,7 +90,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</div>
-->
<div id="footer">
- <p>Recorded with <a target="_blank" href="http://mconf.org/">Mconf</a>. </p>
+ <p>Recorded with <a target="_blank" href="http://bigbluebutton.org/">BigBlueButton</a>. </p>
<p>Use <a target="_blank" href="http://mozilla.org/firefox">Mozilla Firefox</a> or
<a target="_blank" href="http://google.com/chrome/">Google Chrome</a> to play this recording.
</p>
diff --git a/record-and-playback/presentation/playback/presentation/0.9.0/logo.png b/record-and-playback/presentation/playback/presentation/0.9.0/logo.png
index 395446fcb9f6df10a87b1d16c396ab47a6379ce9..4e4e97c4cd72da35001ebd90e34b7be06eb7db3c 100644
Binary files a/record-and-playback/presentation/playback/presentation/0.9.0/logo.png and b/record-and-playback/presentation/playback/presentation/0.9.0/logo.png differ
diff --git a/record-and-playback/presentation/playback/presentation/0.9.0/playback.html b/record-and-playback/presentation/playback/presentation/0.9.0/playback.html
index 520300a478899f970ea12ebaba3353a66e2b6b91..fa3d63f6130c7f85d4138b8c7dc718045d7f8f0e 100755
--- a/record-and-playback/presentation/playback/presentation/0.9.0/playback.html
+++ b/record-and-playback/presentation/playback/presentation/0.9.0/playback.html
@@ -21,7 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Recording Playback</title>
+ <title>BigBlueButton Playback</title>
<link rel="stylesheet" type="text/css" href="acornmediaplayer/acornmediaplayer.base.css" />
<link rel="stylesheet" type="text/css" href="acornmediaplayer/themes/access/acorn.access.css" />
@@ -44,7 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<a class="left-off-canvas-toggle menu-icon" href="#">
<i class="sidebar-icon fi-list"></i>
</a>
- <h1 id="recording-title">Recording Playback</h1>
+ <h1 id="recording-title">BigBlueButton Playback</h1>
</div>
<aside class="left-off-canvas-menu">
@@ -66,7 +66,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</div>
<div id="copyright">
- Recorded with <a target="_blank" href="http://mconf.org/">Mconf</a>.
+ Recorded with <a target="_blank" href="http://bigbluebutton.org/">BigBlueButton</a>.
Use <a target="_blank" href="http://mozilla.org/firefox">Mozilla Firefox</a> or
<a target="_blank" href="http://google.com/chrome/">Google Chrome</a> to play this recording.
</div>