jfinn
/
jitsi_corner9
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Clears some welcome_page and videolayout styles.

master
yanas 10 år sedan
förälder
8c64d3192b
incheckning
79bf672ca7
5 ändrade filer med 105 tillägg och 97 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 57
    22
      app.js
  2. 35
    0
      css/main.css
  3. 0
    35
      css/videolayout_default.css
  4. 0
    27
      css/welcome_page.css
  5. 13
    13
      index.html

+ 57
- 22
app.js Visa fil

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 
-
1147 
     if(config.enableWelcomePage && window.location.pathname == "/" &&
 1129 
     if(config.enableWelcomePage && window.location.pathname == "/" &&
1148 
         (!window.localStorage.welcomePageDisabled
 1130 
         (!window.localStorage.welcomePageDisabled
1149 
                 || window.localStorage.welcomePageDisabled == "false"))
 1131 
                 || window.localStorage.welcomePageDisabled == "false"))
1153 
                 window.location.protocol + "//" + window.location.host + "/");
 1135 
                 window.location.protocol + "//" + window.location.host + "/");
1154 
         $("span[name='appName']").text(brand.appName);
 1136 
         $("span[name='appName']").text(brand.appName);
1155
1137
1138 
+        if (interfaceConfig.SHOW_JITSI_WATERMARK) {
1139 
+            var leftWatermarkDiv
1140 
+                = $("#welcome_page_header div[class='watermark leftwatermark']");
1141 
+
1142 
+            leftWatermarkDiv.css({display: 'block'});
1143 
+            leftWatermarkDiv.parent().get(0).href
1144 
+                = interfaceConfig.JITSI_WATERMARK_LINK;
1145 
+        }
1146 
+
1147 
+        if (interfaceConfig.SHOW_BRAND_WATERMARK) {
1148 
+            var rightWatermarkDiv
1149 
+                = $("#welcome_page_header div[class='watermark rightwatermark']");
1150 
+
1151 
+            rightWatermarkDiv.css({display: 'block'});
1152 
+            rightWatermarkDiv.parent().get(0).href
1153 
+                = interfaceConfig.BRAND_WATERMARK_LINK;
1154 
+            rightWatermarkDiv.get(0).style.backgroundImage
1155 
+                = "url(../images/rightwatermark.png)";
1156 
+        }
1157 
+
1158 
+        if (interfaceConfig.SHOW_POWERED_BY) {
1159 
+            $("#welcome_page_header>a[class='poweredby']")
1160 
+                .css({display: 'block'});
1161 
+        }
1162 
+
1156 
         function enter_room()
 1163 
         function enter_room()
1157 
         {
 1164 
         {
1158 
             var val = $("#enter_room_field").val();
 1165 
             var val = $("#enter_room_field").val();
1187 
                 }, 70);
 1194 
                 }, 70);
1188 
         }
 1195 
         }
1189
1196
1190 
-
1191 
         function update_roomname()
 1197 
         function update_roomname()
1192 
         {
 1198 
         {
1193 
             var word = RoomNameGenerator.generateRoomWithoutSeparator();
 1199 
             var word = RoomNameGenerator.generateRoomWithoutSeparator();
1200 
         update_roomname();
 1206 
         update_roomname();
1201
1207
1202 
         $("#disable_welcome").click(function () {
 1208 
         $("#disable_welcome").click(function () {
1203 
-            window.localStorage.welcomePageDisabled = $("#disable_welcome").is(":checked");
1209 
+            window.localStorage.welcomePageDisabled
1210 
+                = $("#disable_welcome").is(":checked");
1204 
         });
 1211 
         });
1205
1212
1206 
         return;
 1213 
         return;
1207 
     }
 1214 
     }
1208
1215
1216 
+    if (interfaceConfig.SHOW_JITSI_WATERMARK) {
1217 
+        var leftWatermarkDiv
1218 
+            = $("#largeVideoContainer div[class='watermark leftwatermark']");
1219 
+
1220 
+        leftWatermarkDiv.css({display: 'block'});
1221 
+        leftWatermarkDiv.parent().get(0).href
1222 
+            = interfaceConfig.JITSI_WATERMARK_LINK;
1223 
+    }
1224 
+
1225 
+    if (interfaceConfig.SHOW_BRAND_WATERMARK) {
1226 
+        var rightWatermarkDiv
1227 
+            = $("#largeVideoContainer div[class='watermark rightwatermark']");
1228 
+
1229 
+        rightWatermarkDiv.css({display: 'block'});
1230 
+        rightWatermarkDiv.parent().get(0).href
1231 
+            = interfaceConfig.BRAND_WATERMARK_LINK;
1232 
+        rightWatermarkDiv.get(0).style.backgroundImage
1233 
+            = "url(../images/rightwatermark.png)";
1234 
+    }
1235 
+
1236 
+    if (interfaceConfig.SHOW_POWERED_BY) {
1237 
+        $("#largeVideoContainer>a[class='poweredby']").css({display: 'block'});
1238 
+    }
1239 
+
1209 
     $("#welcome_page").hide();
 1240 
     $("#welcome_page").hide();
1210 
     Chat.init();
 1241 
     Chat.init();
1211
1242
1265 
             async: false,
 1296 
             async: false,
1266 
             cache: false,
 1297 
             cache: false,
1267 
             contentType: 'application/xml',
 1298 
             contentType: 'application/xml',
1268 
-            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>",
1299 
+            data: "<body rid='" + (connection.rid || connection._proto.rid)
1300 
+                + "' xmlns='http://jabber.org/protocol/httpbind' sid='"
1301 
+                + (connection.sid || connection._proto.sid)
1302 
+                + "' type='terminate'><presence xmlns='jabber:client' type='unavailable'/></body>",
1269 
             success: function (data) {
 1303 
             success: function (data) {
1270 
                 console.log('signed out');
 1304 
                 console.log('signed out');
1271 
                 console.log(data);
 1305 
                 console.log(data);
1281 
 function disposeConference(onUnload) {
 1315 
 function disposeConference(onUnload) {
1282 
     var handler = getConferenceHandler();
 1316 
     var handler = getConferenceHandler();
1283 
     if (handler && handler.peerconnection) {
 1317 
     if (handler && handler.peerconnection) {
1284 
-        // FIXME: probably removing streams is not required and close() should be enough
1318 
+        // FIXME: probably removing streams is not required and close() should
1319 
+        // be enough
1285 
         if (connection.jingle.localAudio) {
 1320 
         if (connection.jingle.localAudio) {
1286 
             handler.peerconnection.removeStream(connection.jingle.localAudio);
 1321 
             handler.peerconnection.removeStream(connection.jingle.localAudio);
1287 
         }
 1322 
         }

+ 35
- 0
css/main.css Visa fil

324 
 {
 324 
 {
325 
     text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df;
 325 
     text-shadow: 0px 0px 30px #06a5df, 0px 0px 10px #06a5df, 0px 0px 5px #06a5df,0px 0px 3px #06a5df;
326 
 }
 326 
 }
327 
+
328 
+.watermark {
329 
+    display: block;
330 
+    position: absolute;
331 
+    top: 15;
332 
+    width: 186px;
333 
+    height: 74px;
334 
+    background-size: contain;
335 
+    background-repeat: no-repeat;
336 
+    z-index: 2;
337 
+}
338 
+
339 
+.leftwatermark {
340 
+    display: none;
341 
+    left: 15;
342 
+    background-image:url(../images/watermark.png);
343 
+    background-position: center left;
344 
+}
345 
+
346 
+.rightwatermark {
347 
+    display: none;
348 
+    right: 15;
349 
+    background-position: center right;
350 
+}
351 
+
352 
+.poweredby {
353 
+    display: none;
354 
+    position: absolute;
355 
+    left: 25;
356 
+    bottom: 7;
357 
+    font-size: 11pt;
358 
+    color: rgba(255,255,255,.50);
359 
+    text-decoration: none;
360 
+    z-index: 100;
361 
+}

+ 0
- 35
css/videolayout_default.css Visa fil

313 
     display: none;
 313 
     display: none;
314 
 }
 314 
 }
315
315
316 
-.watermark {
317 
-    display: block;
318 
-    position: absolute;
319 
-    top: 15;
320 
-    width: 20%;
321 
-    height: 10%;
322 
-    background-size: contain;
323 
-    background-repeat: no-repeat;
324 
-    z-index: 2;
325 
-}
326 
-
327 
-#leftwatermark {
328 
-    display: none;
329 
-    left: 15;
330 
-    background-image:url(../images/watermark.png);
331 
-    background-position: center left;
332 
-}
333 
-
334 
-#rightwatermark {
335 
-    display: none;
336 
-    right: 15;
337 
-    background-position: center right;
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 
-
351 
 .audiolevel {
 316 
 .audiolevel {
352 
     display: inline-block;
 317 
     display: inline-block;
353 
     position: absolute;
 318 
     position: absolute;

+ 0
- 27
css/welcome_page.css Visa fil

123 
     margin-top: 290px;
 123 
     margin-top: 290px;
124 
 }
 124 
 }
125
125
126 
-#jitsi_logo
127 
-{
128 
-    background-image:url(../images/watermark.png);
129 
-    background-repeat: no-repeat;
130 
-    background-size: contain;
131 
-    background-position: center left;
132 
-    width: 186px;
133 
-    height: 74px;
134 
-    position: absolute;
135 
-    top: 15px;
136 
-    left: 30px;
137 
-}
138 
-
139 
-#brand_logo
140 
-{
141 
-    background-image:url(../images/rightwatermark.png);
142 
-    background-repeat: no-repeat;
143 
-    background-size: contain;
144 
-    background-position: center left;
145 
-    width: 215px;
146 
-    height: 55px;
147 
-    position: absolute;
148 
-    top: 15px;
149 
-    right: 30px;
150 
-
151 
-}
152 
-
153 
 #brand_header
 126 
 #brand_header
154 
 {
 127 
 {
155 
     background-image:url(../images/welcome_page/header-big.png);
 128 
     background-image:url(../images/welcome_page/header-big.png);

+ 13
- 13
index.html Visa fil

34 
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
 34 
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
35 
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
 35 
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
36 
     <script src="data_channels.js?v=3"></script><!-- data channels -->
 36 
     <script src="data_channels.js?v=3"></script><!-- data channels -->
37 
-    <script src="app.js?v=12"></script><!-- application logic -->
37 
+    <script src="app.js?v=13"></script><!-- application logic -->
38 
     <script src="commands.js?v=1"></script><!-- application logic -->
 38 
     <script src="commands.js?v=1"></script><!-- application logic -->
39 
     <script src="chat.js?v=10"></script><!-- chat logic -->
 39 
     <script src="chat.js?v=10"></script><!-- chat logic -->
40 
     <script src="contact_list.js?v=2"></script><!-- contact list logic -->
 40 
     <script src="contact_list.js?v=2"></script><!-- contact list logic -->
60 
     <script src="message_handler.js?v=1"></script>
 60 
     <script src="message_handler.js?v=1"></script>
61 
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
 61 
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
62 
     <link rel="stylesheet" href="css/font.css?v=4"/>
 62 
     <link rel="stylesheet" href="css/font.css?v=4"/>
63 
-    <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=24"/>
64 
-    <link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=11" id="videolayout_default"/>
63 
+    <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=25"/>
64 
+    <link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=12" id="videolayout_default"/>
65 
     <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
 65 
     <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
66 
     <link rel="stylesheet" href="css/modaldialog.css?v=3">
 66 
     <link rel="stylesheet" href="css/modaldialog.css?v=3">
67 
     <link rel="stylesheet" href="css/popup_menu.css?v=3">
 67 
     <link rel="stylesheet" href="css/popup_menu.css?v=3">
68 
     <link rel="stylesheet" href="css/popover.css?v=2">
 68 
     <link rel="stylesheet" href="css/popover.css?v=2">
69 
     <link rel="stylesheet" href="css/contact_list.css?v=1">
 69 
     <link rel="stylesheet" href="css/contact_list.css?v=1">
70 
-    <link rel="stylesheet" href="css/welcome_page.css?v=1">
70 
+    <link rel="stylesheet" href="css/welcome_page.css?v=2">
71 
     <!--
 71 
     <!--
72 
         Link used for inline installation of chrome desktop streaming extension,
 72 
         Link used for inline installation of chrome desktop streaming extension,
73 
         is updated automatically from the code with the value defined in config.js -->
 73 
         is updated automatically from the code with the value defined in config.js -->
79 
   <body>
 79 
   <body>
80 
     <div id="welcome_page">
 80 
     <div id="welcome_page">
81 
         <div id="welcome_page_header">
 81 
         <div id="welcome_page_header">
82 
-            <a href="http://jitsi.org" target="_new">
83 
-                <div id="jitsi_logo"></div>
82 
+            <a target="_new">
83 
+                <div class="watermark leftwatermark"></div>
84 
             </a>
 84 
             </a>
85 
-
86 
-            <!--<a href="http://jitsi.org" target="_new">
87 
-                <div id="brand_logo"></div>
88 
-            </a>-->
85 
+            <a target="_new">
86 
+                <div class="watermark rightwatermark"></div>
87 
+            </a>
88 
+            <a class="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
89
89
90 
             <div id="enter_room_container">
 90 
             <div id="enter_room_container">
91 
                     <div id="enter_room_form" >
 91 
                     <div id="enter_room_form" >
243 
             <div id="largeVideoContainer" class="videocontainer">
 243 
             <div id="largeVideoContainer" class="videocontainer">
244 
                 <div id="presentation"></div>
 244 
                 <div id="presentation"></div>
245 
                 <div id="etherpad"></div>
 245 
                 <div id="etherpad"></div>
246 
-                <a target="_new"><div class="watermark" id="leftwatermark"></div></a>
247 
-                <a target="_new"><div class="watermark" id="rightwatermark"></div></a>
248 
-                <a id="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
246 
+                <a target="_new"><div class="watermark leftwatermark" id=""></div></a>
247 
+                <a target="_new"><div class="watermark rightwatermark" id=""></div></a>
248 
+                <a class="poweredby" href="http://jitsi.org" target="_new" >powered by jitsi.org</a>
249 
                 <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
 249 
                 <video id="largeVideo" autoplay oncontextmenu="return false;"></video>
250 
             </div>
 250 
             </div>
251 
             <div id="remoteVideos">
 251 
             <div id="remoteVideos">

Write Förhandsgranska
Laddar…
Avbryt
Spara