From f0a278cad5f69d1bc08fb7a190f30fc54e770631 Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Wed, 24 Sep 2014 16:44:52 +0200
Subject: [PATCH] Adds some interface config properties.

---
 app.js                      | 25 +++++++++++++++++++++++--
 bottom_toolbar.js           |  1 -
 css/main.css                |  1 +
 css/videolayout_default.css | 14 +++++++++++++-
 index.html                  | 11 ++++++-----
 interface_config.js         |  7 ++++++-
 6 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/app.js b/app.js
index 4fd910f6bf..443266debb 100644
--- a/app.js
+++ b/app.js
@@ -1126,12 +1126,33 @@ 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"))
+        (!window.localStorage.welcomePageDisabled
+                || window.localStorage.welcomePageDisabled == "false"))
     {
         $("#videoconference_page").hide();
-        $("#domain_name").text(window.location.protocol + "//" + window.location.host + "/");
+        $("#domain_name").text(
+                window.location.protocol + "//" + window.location.host + "/");
         $("span[name='appName']").text(brand.appName);
+
         function enter_room()
         {
             var val = $("#enter_room_field").val();
diff --git a/bottom_toolbar.js b/bottom_toolbar.js
index 8ba87acc0e..7aaa4476ef 100644
--- a/bottom_toolbar.js
+++ b/bottom_toolbar.js
@@ -26,7 +26,6 @@ var BottomToolbar = (function (my) {
         filmstrip.toggleClass("hidden");
     };
 
-
     $(document).bind("remotevideo.resized", function (event, width, height) {
         var bottom = (height - $('#bottomToolbar').outerHeight())/2 + 18;
 
diff --git a/css/main.css b/css/main.css
index 464c001a3f..8a0661d82b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -274,6 +274,7 @@ form {
     left: 5;
     overflow: visible;
     z-index: 100;
+    color: rgba(255,255,255,.50);
 }
 
 #bottomToolbar {
diff --git a/css/videolayout_default.css b/css/videolayout_default.css
index 1a8ebe256c..8d9c77f202 100644
--- a/css/videolayout_default.css
+++ b/css/videolayout_default.css
@@ -325,17 +325,29 @@
 }
 
 #leftwatermark {
+    display: none;
     left: 15;
     background-image:url(../images/watermark.png);
     background-position: center left;
 }
 
 #rightwatermark {
+    display: none;
     right: 15;
-    background-image:url(../images/rightwatermark.png);
     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/index.html b/index.html
index 05bbe24172..53e518c91d 100644
--- a/index.html
+++ b/index.html
@@ -26,13 +26,13 @@
     <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
-    <script src="interface_config.js?v=1"></script>
+    <script src="interface_config.js?v=2"></script>
     <script src="brand.js?v=1"></script>
     <script src="muc.js?v=14"></script><!-- simple MUC library -->
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
     <script src="data_channels.js?v=3"></script><!-- data channels -->
-    <script src="app.js?v=11"></script><!-- application logic -->
+    <script src="app.js?v=12"></script><!-- application logic -->
     <script src="commands.js?v=1"></script><!-- application logic -->
     <script src="chat.js?v=10"></script><!-- chat logic -->
     <script src="contact_list.js?v=2"></script><!-- contact list logic -->
@@ -51,7 +51,7 @@
     <script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
     <script src="audio_levels.js?v=2"></script><!-- audio levels plugin -->
     <script src="media_stream.js?v=1"></script><!-- media stream -->
-    <script src="bottom_toolbar.js?v=2"></script><!-- media stream -->
+    <script src="bottom_toolbar.js?v=3"></script><!-- media stream -->
     <script src="roomname_generator.js?v=1"></script><!-- generator for random room names -->
     <script src="keyboard_shortcut.js?v=2"></script>
     <script src="tracking.js?v=1"></script><!-- tracking -->
@@ -241,8 +241,9 @@
             <div id="largeVideoContainer" class="videocontainer">
                 <div id="presentation"></div>
                 <div id="etherpad"></div>
-                <a href="http://jitsi.org" target="_new"><div class="watermark" id="leftwatermark"></div></a>
-                <!-- a href="http://jitsi.org" target="_new"><div class="watermark" id="rightwatermark"></div></a -->
+                <a target="_new"><div class="watermark" id="leftwatermark"></div></a>
+                <a target="_new"><div class="watermark" id="rightwatermark"></div></a>
+                <a id="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
                 <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
             </div>
             <div id="remoteVideos">
diff --git a/interface_config.js b/interface_config.js
index ca9fc3def8..60077c3c4c 100644
--- a/interface_config.js
+++ b/interface_config.js
@@ -5,5 +5,10 @@ var interfaceConfig = {
     INITIAL_TOOLBAR_TIMEOUT: 20000,
     TOOLBAR_TIMEOUT: 4000,
     DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
-    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker"
+    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker",
+    SHOW_JITSI_WATERMARK: true,
+    JITSI_WATERMARK_LINK: "http://jitsi.org",
+    SHOW_BRAND_WATERMARK: false,
+    BRAND_WATERMARK_LINK: "",
+    SHOW_POWERED_BY: false
 };