ソースを参照

Adds some interface config properties.

master
yanas 10年前
コミット
f0a278cad5
6個のファイルの変更49行の追加10行の削除
  1. 23
    2
      app.js
  2. 0
    1
      bottom_toolbar.js
  3. 1
    0
      css/main.css
  4. 13
    1
      css/videolayout_default.css
  5. 6
    5
      index.html
  6. 6
    1
      interface_config.js

+ 23
- 2
app.js ファイルの表示

1126
 $(document).ready(function () {
1126
 $(document).ready(function () {
1127
     document.title = brand.appName;
1127
     document.title = brand.appName;
1128
 
1128
 
1129
+    if (interfaceConfig.SHOW_JITSI_WATERMARK) {
1130
+        $("#leftwatermark").css({display: 'block'});
1131
+        $("#leftwatermark").parent().get(0).href
1132
+            = interfaceConfig.JITSI_WATERMARK_LINK;
1133
+    }
1134
+
1135
+    if (interfaceConfig.SHOW_BRAND_WATERMARK) {
1136
+        $("#rightwatermark").css({display: 'block'});
1137
+        $("#rightwatermark").parent().get(0).href
1138
+            = interfaceConfig.BRAND_WATERMARK_LINK;
1139
+        $("#rightwatermark").get(0).style.backgroundImage
1140
+            = "url(../images/rightwatermark.png)";
1141
+    }
1142
+
1143
+    if (interfaceConfig.SHOW_POWERED_BY) {
1144
+        $("#poweredby").css({display: 'block'});
1145
+    }
1146
+
1129
     if(config.enableWelcomePage && window.location.pathname == "/" &&
1147
     if(config.enableWelcomePage && window.location.pathname == "/" &&
1130
-        (!window.localStorage.welcomePageDisabled || window.localStorage.welcomePageDisabled == "false"))
1148
+        (!window.localStorage.welcomePageDisabled
1149
+                || window.localStorage.welcomePageDisabled == "false"))
1131
     {
1150
     {
1132
         $("#videoconference_page").hide();
1151
         $("#videoconference_page").hide();
1133
-        $("#domain_name").text(window.location.protocol + "//" + window.location.host + "/");
1152
+        $("#domain_name").text(
1153
+                window.location.protocol + "//" + window.location.host + "/");
1134
         $("span[name='appName']").text(brand.appName);
1154
         $("span[name='appName']").text(brand.appName);
1155
+
1135
         function enter_room()
1156
         function enter_room()
1136
         {
1157
         {
1137
             var val = $("#enter_room_field").val();
1158
             var val = $("#enter_room_field").val();

+ 0
- 1
bottom_toolbar.js ファイルの表示

26
         filmstrip.toggleClass("hidden");
26
         filmstrip.toggleClass("hidden");
27
     };
27
     };
28
 
28
 
29
-
30
     $(document).bind("remotevideo.resized", function (event, width, height) {
29
     $(document).bind("remotevideo.resized", function (event, width, height) {
31
         var bottom = (height - $('#bottomToolbar').outerHeight())/2 + 18;
30
         var bottom = (height - $('#bottomToolbar').outerHeight())/2 + 18;
32
 
31
 

+ 1
- 0
css/main.css ファイルの表示

274
     left: 5;
274
     left: 5;
275
     overflow: visible;
275
     overflow: visible;
276
     z-index: 100;
276
     z-index: 100;
277
+    color: rgba(255,255,255,.50);
277
 }
278
 }
278
 
279
 
279
 #bottomToolbar {
280
 #bottomToolbar {

+ 13
- 1
css/videolayout_default.css ファイルの表示

325
 }
325
 }
326
 
326
 
327
 #leftwatermark {
327
 #leftwatermark {
328
+    display: none;
328
     left: 15;
329
     left: 15;
329
     background-image:url(../images/watermark.png);
330
     background-image:url(../images/watermark.png);
330
     background-position: center left;
331
     background-position: center left;
331
 }
332
 }
332
 
333
 
333
 #rightwatermark {
334
 #rightwatermark {
335
+    display: none;
334
     right: 15;
336
     right: 15;
335
-    background-image:url(../images/rightwatermark.png);
336
     background-position: center right;
337
     background-position: center right;
337
 }
338
 }
338
 
339
 
340
+#poweredby {
341
+    display: none;
342
+    position: absolute;
343
+    left: 25;
344
+    bottom: 7;
345
+    font-size: 11pt;
346
+    color: rgba(255,255,255,.50);
347
+    text-decoration: none;
348
+    z-index: 100;
349
+}
350
+
339
 .audiolevel {
351
 .audiolevel {
340
     display: inline-block;
352
     display: inline-block;
341
     position: absolute;
353
     position: absolute;

+ 6
- 5
index.html ファイルの表示

26
     <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
26
     <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
27
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
27
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
28
     <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
28
     <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
29
-    <script src="interface_config.js?v=1"></script>
29
+    <script src="interface_config.js?v=2"></script>
30
     <script src="brand.js?v=1"></script>
30
     <script src="brand.js?v=1"></script>
31
     <script src="muc.js?v=14"></script><!-- simple MUC library -->
31
     <script src="muc.js?v=14"></script><!-- simple MUC library -->
32
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
32
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
33
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
33
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
34
     <script src="data_channels.js?v=3"></script><!-- data channels -->
34
     <script src="data_channels.js?v=3"></script><!-- data channels -->
35
-    <script src="app.js?v=11"></script><!-- application logic -->
35
+    <script src="app.js?v=12"></script><!-- application logic -->
36
     <script src="commands.js?v=1"></script><!-- application logic -->
36
     <script src="commands.js?v=1"></script><!-- application logic -->
37
     <script src="chat.js?v=10"></script><!-- chat logic -->
37
     <script src="chat.js?v=10"></script><!-- chat logic -->
38
     <script src="contact_list.js?v=2"></script><!-- contact list logic -->
38
     <script src="contact_list.js?v=2"></script><!-- contact list logic -->
51
     <script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
51
     <script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
52
     <script src="audio_levels.js?v=2"></script><!-- audio levels plugin -->
52
     <script src="audio_levels.js?v=2"></script><!-- audio levels plugin -->
53
     <script src="media_stream.js?v=1"></script><!-- media stream -->
53
     <script src="media_stream.js?v=1"></script><!-- media stream -->
54
-    <script src="bottom_toolbar.js?v=2"></script><!-- media stream -->
54
+    <script src="bottom_toolbar.js?v=3"></script><!-- media stream -->
55
     <script src="roomname_generator.js?v=1"></script><!-- generator for random room names -->
55
     <script src="roomname_generator.js?v=1"></script><!-- generator for random room names -->
56
     <script src="keyboard_shortcut.js?v=2"></script>
56
     <script src="keyboard_shortcut.js?v=2"></script>
57
     <script src="tracking.js?v=1"></script><!-- tracking -->
57
     <script src="tracking.js?v=1"></script><!-- tracking -->
241
             <div id="largeVideoContainer" class="videocontainer">
241
             <div id="largeVideoContainer" class="videocontainer">
242
                 <div id="presentation"></div>
242
                 <div id="presentation"></div>
243
                 <div id="etherpad"></div>
243
                 <div id="etherpad"></div>
244
-                <a href="http://jitsi.org" target="_new"><div class="watermark" id="leftwatermark"></div></a>
245
-                <!-- a href="http://jitsi.org" target="_new"><div class="watermark" id="rightwatermark"></div></a -->
244
+                <a target="_new"><div class="watermark" id="leftwatermark"></div></a>
245
+                <a target="_new"><div class="watermark" id="rightwatermark"></div></a>
246
+                <a id="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
246
                 <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
247
                 <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
247
             </div>
248
             </div>
248
             <div id="remoteVideos">
249
             <div id="remoteVideos">

+ 6
- 1
interface_config.js ファイルの表示

5
     INITIAL_TOOLBAR_TIMEOUT: 20000,
5
     INITIAL_TOOLBAR_TIMEOUT: 20000,
6
     TOOLBAR_TIMEOUT: 4000,
6
     TOOLBAR_TIMEOUT: 4000,
7
     DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
7
     DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
8
-    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker"
8
+    DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker",
9
+    SHOW_JITSI_WATERMARK: true,
10
+    JITSI_WATERMARK_LINK: "http://jitsi.org",
11
+    SHOW_BRAND_WATERMARK: false,
12
+    BRAND_WATERMARK_LINK: "",
13
+    SHOW_POWERED_BY: false
9
 };
14
 };

読み込み中…
キャンセル
保存