From 79bf672ca7a3a8dcd3469316182fe3ca5aac8f38 Mon Sep 17 00:00:00 2001 From: yanas Date: Thu, 25 Sep 2014 12:48:37 +0200 Subject: [PATCH] Clears some welcome_page and videolayout styles. --- app.js | 79 ++++++++++++++++++++++++++----------- css/main.css | 35 ++++++++++++++++ css/videolayout_default.css | 35 ---------------- css/welcome_page.css | 27 ------------- index.html | 26 ++++++------ 5 files changed, 105 insertions(+), 97 deletions(-) diff --git a/app.js b/app.js index 443266deb..8ec96f66a 100644 --- a/app.js +++ b/app.js @@ -1126,24 +1126,6 @@ function getCameraVideoSize(videoWidth, $(document).ready(function () { document.title = brand.appName; - if (interfaceConfig.SHOW_JITSI_WATERMARK) { - $("#leftwatermark").css({display: 'block'}); - $("#leftwatermark").parent().get(0).href - = interfaceConfig.JITSI_WATERMARK_LINK; - } - - if (interfaceConfig.SHOW_BRAND_WATERMARK) { - $("#rightwatermark").css({display: 'block'}); - $("#rightwatermark").parent().get(0).href - = interfaceConfig.BRAND_WATERMARK_LINK; - $("#rightwatermark").get(0).style.backgroundImage - = "url(../images/rightwatermark.png)"; - } - - if (interfaceConfig.SHOW_POWERED_BY) { - $("#poweredby").css({display: 'block'}); - } - if(config.enableWelcomePage && window.location.pathname == "/" && (!window.localStorage.welcomePageDisabled || window.localStorage.welcomePageDisabled == "false")) @@ -1153,6 +1135,31 @@ $(document).ready(function () { window.location.protocol + "//" + window.location.host + "/"); $("span[name='appName']").text(brand.appName); + if (interfaceConfig.SHOW_JITSI_WATERMARK) { + var leftWatermarkDiv + = $("#welcome_page_header div[class='watermark leftwatermark']"); + + leftWatermarkDiv.css({display: 'block'}); + leftWatermarkDiv.parent().get(0).href + = interfaceConfig.JITSI_WATERMARK_LINK; + } + + if (interfaceConfig.SHOW_BRAND_WATERMARK) { + var rightWatermarkDiv + = $("#welcome_page_header div[class='watermark rightwatermark']"); + + rightWatermarkDiv.css({display: 'block'}); + rightWatermarkDiv.parent().get(0).href + = interfaceConfig.BRAND_WATERMARK_LINK; + rightWatermarkDiv.get(0).style.backgroundImage + = "url(../images/rightwatermark.png)"; + } + + if (interfaceConfig.SHOW_POWERED_BY) { + $("#welcome_page_header>a[class='poweredby']") + .css({display: 'block'}); + } + function enter_room() { var val = $("#enter_room_field").val(); @@ -1187,7 +1194,6 @@ $(document).ready(function () { }, 70); } - function update_roomname() { var word = RoomNameGenerator.generateRoomWithoutSeparator(); @@ -1200,12 +1206,37 @@ $(document).ready(function () { update_roomname(); $("#disable_welcome").click(function () { - window.localStorage.welcomePageDisabled = $("#disable_welcome").is(":checked"); + window.localStorage.welcomePageDisabled + = $("#disable_welcome").is(":checked"); }); return; } + if (interfaceConfig.SHOW_JITSI_WATERMARK) { + var leftWatermarkDiv + = $("#largeVideoContainer div[class='watermark leftwatermark']"); + + leftWatermarkDiv.css({display: 'block'}); + leftWatermarkDiv.parent().get(0).href + = interfaceConfig.JITSI_WATERMARK_LINK; + } + + if (interfaceConfig.SHOW_BRAND_WATERMARK) { + var rightWatermarkDiv + = $("#largeVideoContainer div[class='watermark rightwatermark']"); + + rightWatermarkDiv.css({display: 'block'}); + rightWatermarkDiv.parent().get(0).href + = interfaceConfig.BRAND_WATERMARK_LINK; + rightWatermarkDiv.get(0).style.backgroundImage + = "url(../images/rightwatermark.png)"; + } + + if (interfaceConfig.SHOW_POWERED_BY) { + $("#largeVideoContainer>a[class='poweredby']").css({display: 'block'}); + } + $("#welcome_page").hide(); Chat.init(); @@ -1265,7 +1296,10 @@ $(window).bind('beforeunload', function () { async: false, cache: false, contentType: 'application/xml', - data: "", + data: "", success: function (data) { console.log('signed out'); console.log(data); @@ -1281,7 +1315,8 @@ $(window).bind('beforeunload', function () { function disposeConference(onUnload) { var handler = getConferenceHandler(); if (handler && handler.peerconnection) { - // FIXME: probably removing streams is not required and close() should be enough + // FIXME: probably removing streams is not required and close() should + // be enough if (connection.jingle.localAudio) { handler.peerconnection.removeStream(connection.jingle.localAudio); } diff --git a/css/main.css b/css/main.css index 8a0661d82..c7995eac9 100644 --- a/css/main.css +++ b/css/main.css @@ -324,3 +324,38 @@ form { { text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df; } + +.watermark { + display: block; + position: absolute; + top: 15; + width: 186px; + height: 74px; + background-size: contain; + background-repeat: no-repeat; + z-index: 2; +} + +.leftwatermark { + display: none; + left: 15; + background-image:url(../images/watermark.png); + background-position: center left; +} + +.rightwatermark { + display: none; + right: 15; + background-position: center right; +} + +.poweredby { + display: none; + position: absolute; + left: 25; + bottom: 7; + font-size: 11pt; + color: rgba(255,255,255,.50); + text-decoration: none; + z-index: 100; +} diff --git a/css/videolayout_default.css b/css/videolayout_default.css index 8d9c77f20..2f6015578 100644 --- a/css/videolayout_default.css +++ b/css/videolayout_default.css @@ -313,41 +313,6 @@ display: none; } -.watermark { - display: block; - position: absolute; - top: 15; - width: 20%; - height: 10%; - background-size: contain; - background-repeat: no-repeat; - z-index: 2; -} - -#leftwatermark { - display: none; - left: 15; - background-image:url(../images/watermark.png); - background-position: center left; -} - -#rightwatermark { - display: none; - right: 15; - background-position: center right; -} - -#poweredby { - display: none; - position: absolute; - left: 25; - bottom: 7; - font-size: 11pt; - color: rgba(255,255,255,.50); - text-decoration: none; - z-index: 100; -} - .audiolevel { display: inline-block; position: absolute; diff --git a/css/welcome_page.css b/css/welcome_page.css index 9a98c6cac..3fd38b3d5 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -123,33 +123,6 @@ margin-top: 290px; } -#jitsi_logo -{ - background-image:url(../images/watermark.png); - background-repeat: no-repeat; - background-size: contain; - background-position: center left; - width: 186px; - height: 74px; - position: absolute; - top: 15px; - left: 30px; -} - -#brand_logo -{ - background-image:url(../images/rightwatermark.png); - background-repeat: no-repeat; - background-size: contain; - background-position: center left; - width: 215px; - height: 55px; - position: absolute; - top: 15px; - right: 30px; - -} - #brand_header { background-image:url(../images/welcome_page/header-big.png); diff --git a/index.html b/index.html index 2ba2aab2e..51371c65d 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,7 @@ - + @@ -60,14 +60,14 @@ - - + + - + @@ -79,13 +79,13 @@
- - + +
- - + +
+ + powered by jitsi.org
@@ -243,9 +243,9 @@