Makes it possible to display notification message above the toolbar.

This commit is contained in:
paweldomas 2015-03-12 17:51:31 +01:00
parent 9d50084b98
commit 90d979b69d
5 changed files with 17703 additions and 17672 deletions

View File

@ -33,5 +33,8 @@ var config = {
enableSimulcast: false, enableSimulcast: false,
enableFirefoxSupport: true, //firefox support is still experimental and enableFirefoxSupport: true, //firefox support is still experimental and
// will work when simulcast is *disabled* and rtcpMux & bundle are *enabled*. // will work when simulcast is *disabled* and rtcpMux & bundle are *enabled*.
logStats: false // Enable logging of PeerConnection stats via the focus logStats: false, // Enable logging of PeerConnection stats via the focus
/*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
'During that time service will not be available. ' +
'Apologise for inconvenience.'*/
}; };

11
css/notice.css Normal file
View File

@ -0,0 +1,11 @@
#notice {
position: relative;
z-index: 3;
margin-top: 6px;
}
#noticeText {
background-color: #000000;
color: white;
padding: 3px;
border-radius: 5px;
}

View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=34"></script> <script src="libs/app.bundle.js?v=35"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">
@ -28,6 +28,7 @@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="css/jquery-impromptu.css?v=4"> <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
<link rel="stylesheet" href="css/modaldialog.css?v=3"> <link rel="stylesheet" href="css/modaldialog.css?v=3">
<link rel="stylesheet" href="css/notice.css?v=1">
<link rel="stylesheet" href="css/popup_menu.css?v=4"> <link rel="stylesheet" href="css/popup_menu.css?v=4">
<link rel="stylesheet" href="css/login_menu.css?v=1"> <link rel="stylesheet" href="css/login_menu.css?v=1">
<link rel="stylesheet" href="css/popover.css?v=2"> <link rel="stylesheet" href="css/popover.css?v=2">
@ -120,6 +121,9 @@
<div id="videoconference_page"> <div id="videoconference_page">
<div style="position: relative;" id="header_container"> <div style="position: relative;" id="header_container">
<div id="header"> <div id="header">
<div id="notice" class="notice" style="display: none">
<span id="noticeText" class="noticeText"></span>
</div>
<span id="toolbar"> <span id="toolbar">
<span id="authentication" class="authentication" style="display: none"> <span id="authentication" class="authentication" style="display: none">
<a class="button" id="toolbar_button_authentication" > <a class="button" id="toolbar_button_authentication" >

File diff suppressed because it is too large Load Diff

View File

@ -337,6 +337,12 @@ UI.start = function (init) {
$("#welcome_page").hide(); $("#welcome_page").hide();
// Display notice message at the top of the toolbar
if (config.noticeMessage) {
$('#noticeText').text(config.noticeMessage);
$('#notice').css({display: 'block'});
}
document.getElementById('largeVideo').volume = 0; document.getElementById('largeVideo').volume = 0;
if (!$('#settings').is(':visible')) { if (!$('#settings').is(':visible')) {