haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clears some welcome_page and videolayout styles.

This commit is contained in:
yanas 2014-09-25 12:48:37 +02:00
parent 8c64d3192b
commit 79bf672ca7
5 changed files with 105 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app.js
View File

@ -1126,24 +1126,6 @@ function getCameraVideoSize(videoWidth,
$(document).ready(function () { $(document).ready(function () {
document.title = brand.appName; 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 == "/" && if(config.enableWelcomePage && window.location.pathname == "/" &&
(!window.localStorage.welcomePageDisabled (!window.localStorage.welcomePageDisabled
|| window.localStorage.welcomePageDisabled == "false")) || window.localStorage.welcomePageDisabled == "false"))
@ -1153,6 +1135,31 @@ $(document).ready(function () {
window.location.protocol + "//" + window.location.host + "/"); window.location.protocol + "//" + window.location.host + "/");
$("span[name='appName']").text(brand.appName); $("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() function enter_room()
{ {
var val = $("#enter_room_field").val(); var val = $("#enter_room_field").val();
@ -1187,7 +1194,6 @@ $(document).ready(function () {
}, 70); }, 70);
} }
function update_roomname() function update_roomname()
{ {
var word = RoomNameGenerator.generateRoomWithoutSeparator(); var word = RoomNameGenerator.generateRoomWithoutSeparator();
@ -1200,12 +1206,37 @@ $(document).ready(function () {
update_roomname(); update_roomname();
$("#disable_welcome").click(function () { $("#disable_welcome").click(function () {
window.localStorage.welcomePageDisabled = $("#disable_welcome").is(":checked"); window.localStorage.welcomePageDisabled
= $("#disable_welcome").is(":checked");
}); });
return; 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(); $("#welcome_page").hide();
Chat.init(); Chat.init();
@ -1265,7 +1296,10 @@ $(window).bind('beforeunload', function () {
async: false, async: false,
cache: false, cache: false,
contentType: 'application/xml', contentType: 'application/xml',
data: "<body rid='" + (connection.rid || connection._proto.rid) + "' xmlns='http://jabber.org/protocol/httpbind' sid='" + (connection.sid || connection._proto.sid) + "' type='terminate'><presence xmlns='jabber:client' type='unavailable'/></body>", data: "<body rid='" + (connection.rid || connection._proto.rid)
+ "' xmlns='http://jabber.org/protocol/httpbind' sid='"
+ (connection.sid || connection._proto.sid)
+ "' type='terminate'><presence xmlns='jabber:client' type='unavailable'/></body>",
success: function (data) { success: function (data) {
console.log('signed out'); console.log('signed out');
console.log(data); console.log(data);
@ -1281,7 +1315,8 @@ $(window).bind('beforeunload', function () {
function disposeConference(onUnload) { function disposeConference(onUnload) {
var handler = getConferenceHandler(); var handler = getConferenceHandler();
if (handler && handler.peerconnection) { 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) { if (connection.jingle.localAudio) {
handler.peerconnection.removeStream(connection.jingle.localAudio); handler.peerconnection.removeStream(connection.jingle.localAudio);
} }

35
css/main.css
View File

@ -324,3 +324,38 @@ form {
{ {
text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df; 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;
}

35
css/videolayout_default.css
View File

@ -313,41 +313,6 @@
display: none; 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 { .audiolevel {
display: inline-block; display: inline-block;
position: absolute; position: absolute;

27
css/welcome_page.css
View File

@ -123,33 +123,6 @@
margin-top: 290px; 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 #brand_header
{ {
background-image:url(../images/welcome_page/header-big.png); background-image:url(../images/welcome_page/header-big.png);

26
index.html
View File

@ -34,7 +34,7 @@
<script src="estos_log.js?v=2"></script><!-- simple stanza logger --> <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
<script src="desktopsharing.js?v=3"></script><!-- desktop sharing --> <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
<script src="data_channels.js?v=3"></script><!-- data channels --> <script src="data_channels.js?v=3"></script><!-- data channels -->
<script src="app.js?v=12"></script><!-- application logic --> <script src="app.js?v=13"></script><!-- application logic -->
<script src="commands.js?v=1"></script><!-- application logic --> <script src="commands.js?v=1"></script><!-- application logic -->
<script src="chat.js?v=10"></script><!-- chat logic --> <script src="chat.js?v=10"></script><!-- chat logic -->
<script src="contact_list.js?v=2"></script><!-- contact list logic --> <script src="contact_list.js?v=2"></script><!-- contact list logic -->
@ -60,14 +60,14 @@
<script src="message_handler.js?v=1"></script> <script src="message_handler.js?v=1"></script>
<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/font.css?v=4"/> <link rel="stylesheet" href="css/font.css?v=4"/>
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=24"/> <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=25"/>
<link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=11" id="videolayout_default"/> <link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=12" id="videolayout_default"/>
<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/popup_menu.css?v=3"> <link rel="stylesheet" href="css/popup_menu.css?v=3">
<link rel="stylesheet" href="css/popover.css?v=2"> <link rel="stylesheet" href="css/popover.css?v=2">
<link rel="stylesheet" href="css/contact_list.css?v=1"> <link rel="stylesheet" href="css/contact_list.css?v=1">
<link rel="stylesheet" href="css/welcome_page.css?v=1"> <link rel="stylesheet" href="css/welcome_page.css?v=2">
<!-- <!--
Link used for inline installation of chrome desktop streaming extension, Link used for inline installation of chrome desktop streaming extension,
is updated automatically from the code with the value defined in config.js --> is updated automatically from the code with the value defined in config.js -->
@ -79,13 +79,13 @@
<body> <body>
<div id="welcome_page"> <div id="welcome_page">
<div id="welcome_page_header"> <div id="welcome_page_header">
<a href="http://jitsi.org" target="_new"> <a target="_new">
<div id="jitsi_logo"></div> <div class="watermark leftwatermark"></div>
</a> </a>
<a target="_new">
<!--<a href="http://jitsi.org" target="_new"> <div class="watermark rightwatermark"></div>
<div id="brand_logo"></div> </a>
</a>--> <a class="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
<div id="enter_room_container"> <div id="enter_room_container">
<div id="enter_room_form" > <div id="enter_room_form" >
@ -243,9 +243,9 @@
<div id="largeVideoContainer" class="videocontainer"> <div id="largeVideoContainer" class="videocontainer">
<div id="presentation"></div> <div id="presentation"></div>
<div id="etherpad"></div> <div id="etherpad"></div>
<a target="_new"><div class="watermark" id="leftwatermark"></div></a> <a target="_new"><div class="watermark leftwatermark" id=""></div></a>
<a target="_new"><div class="watermark" id="rightwatermark"></div></a> <a target="_new"><div class="watermark rightwatermark" id=""></div></a>
<a id="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a> <a class="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
<video id="largeVideo" autoplay oncontextmenu="return false;"></video> <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
</div> </div>
<div id="remoteVideos"> <div id="remoteVideos">