From 2d8707626b04e5593bce9b2f4e0c1a791ccbc4d0 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 11:43:43 +0300 Subject: [PATCH 1/7] Fixes issues with the welcome page. --- app.js | 7 ++++--- index.html | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index fa1e0c10d..0cb30f9dd 100644 --- a/app.js +++ b/app.js @@ -1036,7 +1036,7 @@ $(document).ready(function () { { var val = $("#enter_room_field").val(); if(!val) - val = $("#enter_room_field").attr("placeholder"); + val = $("#enter_room_field").attr("room_name"); window.location.pathname = "/" + val; }); @@ -1057,9 +1057,10 @@ $(document).ready(function () { function update_roomname() { - + var word = RoomNameGenerator.generateRoomWithoutSeparator(); + $("#enter_room_field").attr("room_name", word); $("#enter_room_field").attr("placeholder", ""); - animate(RoomNameGenerator.generateRoomWithoutSeparator()); + animate(word); setTimeout(update_roomname, 10000); } diff --git a/index.html b/index.html index 3a5f2ff5e..ddee6a8a4 100644 --- a/index.html +++ b/index.html @@ -106,7 +106,7 @@
Open source
- is licensed under the <GPL/LGPL/WHATEVER>. You can download, use, modify, and share the software without any restrictions. + is licensed under MIT. You are free to download, use, modify, and share them as per these licenses.
From bcf4caaf0087a4968f8c5031b8694d8037003acc Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 12:25:50 +0300 Subject: [PATCH 2/7] Replaces the auto generated address string with string from the room name generator. --- app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 0cb30f9dd..741cefc58 100644 --- a/app.js +++ b/app.js @@ -190,7 +190,8 @@ function doJoin() { if (path.length > 1) { roomnode = path.substr(1).toLowerCase(); } else { - roomnode = Math.random().toString(36).substr(2, 20); + roomnode = RoomNameGenerator.generateRoomWithoutSeparator(3); + window.history.pushState('VideoChat', 'Room: ' + roomnode, window.location.pathname + roomnode); } From bb22acf80a352570d9fa0550e09cedc96e7282b5 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 13:28:08 +0300 Subject: [PATCH 3/7] Changes the layout and image for the checkbox of the welcome page. --- css/welcome_page.css | 34 ++++++++---------- .../welcome_page/disable-welcome-selected.png | Bin 4341 -> 3845 bytes images/welcome_page/disable-welcome.png | Bin 3844 -> 3559 bytes index.html | 4 +-- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/css/welcome_page.css b/css/welcome_page.css index 55f1e38dc..ced9165a6 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -3,46 +3,42 @@ display:none; } +.disable_welcome_position +{ + margin: -139px auto 0px auto; + padding-left: 39px; + padding-top: 7px; + width: 269px; + height: 31px; + display:block; +} + #disable_welcome + label { background-image: url(../images/welcome_page/disable-welcome.png); - display:inline-block; - position:absolute; - height: 54px; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; background-repeat: no-repeat; - padding-left: 62px; - padding-top: 19px; font-weight: 500; font-family: Helvetica; font-size: 16px; color: #acacac; z-index: 2; - float: left; - margin-left: 5px; } #disable_welcome:checked + label { background-image: url(../images/welcome_page/disable-welcome-selected.png); - display:inline-block; - position:absolute; - height: 54px; cursor: pointer; -webkit-user-select: none; -moz-user-select: none; background-repeat: no-repeat; - padding-left: 62px; - padding-top: 19px; font-weight: 500; font-family: Helvetica; font-size: 16px; color: #acacac; z-index: 2; - float: left; - margin-left: 5px; } #enter_room_form { @@ -86,8 +82,8 @@ width: 73px; height: 45px; background-color: #16a8fe; - moz-border-radius: 15px; - -webkit-border-radius: 15px; + moz-border-radius: 10px; + -webkit-border-radius: 10px; color: #ffffff; font-weight: 600; border: none; @@ -103,7 +99,7 @@ #enter_room_container { margin: 70px auto 0px auto; - width:531px; + width:437px; } #enter_room{ @@ -159,15 +155,13 @@ #header_text { - left: 200px; - top: 150px; width: 885px; height: 100px; color: #ffffff; font-family: Helvetica; font-size: 24px; text-align: center; - margin: -139px auto 0px auto; + margin: 0px auto 0px auto; } #features diff --git a/images/welcome_page/disable-welcome-selected.png b/images/welcome_page/disable-welcome-selected.png index 23c0a4b9d0d9267a021936c10d783f374eefe8aa..8f64eba9428fdae3b619859e6d45f78d5fbc98ed 100644 GIT binary patch delta 714 zcmV;*0yX{hA%z|xiBL{Q4GJ0x0000DNk~Le0000X0000V2nGNE0BMw@vaumb41WTI zNklYH-o#0gL>}>r zsGIr_?14w%PPktDAi)x>!qMbR^nczbjLih%$GC7Gp7tFIiWkW{jF}J0Uo(*!cuM`C z8cV`5I)gH@Efv%Vn1SEKs*l1YI%z1^1s+mUs;Sj955ujn6H2ENM{~&uf_G4mfdPc4 zYqbJ?Fw{@lCs0O&lUw+aJHy=~4M>FiQxqd6NI4`ES_KA8K^gEmJu-2~segWSagpIC zm%K~wME0RzsA6}qVaS~32Kh6PC)3qPY&wcE(ZQ4HgY*?@Nw!20CJv+c3Z8;{;ceIw z_OWW%DaZUDCD8)h?-IUoal2-%1+%xCSexD~+yf1-34dhzn>92mLq|fxY`95q5886>CDy|A2Ii^v!L|nI6NQ?P zuzzyB@sFT{Gy=P!;W@!M_}v=Xm7yjcl1O`uHaNo-f*H8W8YmybLAa)!H`Ii5#^7c6 zOO+J<{&Cta!Jl?9wDd_r?wO#|MOZKNfVQj9j}+A~tks0FPQvr>Gk^R7N8ok%2j)WP z60J`@N5g^o#=P}BBav6D>3!PDHNV@_9y{1>SDNz7Y{}h5fl`ON7sXj zH^FgIw+R)zx#n@m^DmW&ZOy-;M$IDb`={P^K# zksU8Yo^=_zzC&&P;ct*kV-pA<<)%p6bB&1PXKFU5YU1Jyhrx3D4Z&b<>i^XLYD7GBQpEaz4{Doz9{aei2 z_eDnC!MgLF$o>|Q?!I-6H-9kaNn?esulc;Y#b49&TVx}a;Wt0!-+Sd)k-Mt_UX-oF z;>HjwEJ?sh4?xm9=@dEq#^5qCiHB5xw_Pl#lU(f3b7nfxkbVJ))bZT}({qW13<5}? zIU{u}Go47tpnycGHCEpVhYSN)F+pV4EE7!6CCZXv0M`NV%2JV{lz)z8rghJNS>uuW zhKct~y9h@+Zd$qb+&MG5vG(ZVt2iv+H2{vx&5vF;3IzEPez3KVMVjd&%gKY!BImI+ zJ-bL`3w?SaBuYT46XAKrS^z=p#}ks3x6;WtB#f za}8X!ocx1WR9`^2DW;bV22j6_O8cHCRR3I^E_P^Q4BKry;M39NM4*?0xs&0w}~|2 z6L%S?E3how4u7wja_1{0qK+ejq~f%g%O~!rnewh*u+cT|$_Xm?Zy=3BA)RnD+APk2 z4lKR2r13q74lA3b6^EA`(m}{3y)gY=&)JuD(fC*5^rhYop}RY+4iHu$bIH-5?{pInFMrL4>te(JA5@(E;>!Pk`{h+P zDDaAT93ZU58Hg+-m4aWS9?|Z&6pZ0M#{gKz`|xp9vKNUHDr0$k68e*;Puz}YZ$iyc zgz{_?tA1OdE#WTfM|JWbiG)X&XJGlB@;v$q1Uflk38WU7(wr37>>i_@%07*qoM6N<$f{d~$(EtDd diff --git a/images/welcome_page/disable-welcome.png b/images/welcome_page/disable-welcome.png index dc30fb69b69ac7396c052023e87cfb1cc560c87f..a96a753f51837fb31ece1226b1a262f96f459914 100644 GIT binary patch delta 425 zcmV;a0apHm9_Je&iBL{Q4GJ0x0000DNk~Le0000X0000V2nGNE0BMw@vaumb41WP; zNkl7Uvju47m2MU@T0VL>1Z;^rqx(IR+6rtsP zE8kiox@esgJJR>e+SdH<*|oh>h7gL_%1Lp`cnJF780>>}?VAKMP=Rr{EZ*aUrA0t~ z!i9Tq5#Nv~o|1Qjm=EQzMJxq8GJo#sWJ@-O=UPJcmV~N+1^f_eJO(pvQYqIm9#T`P zsns-(z%Dod;^~#eOE@EV12PF1K>S>f5*!e8McM}-A+qxw4pL{kODRAkAU4IzBsFb{o0-?A^{)IE@Jw#) Tfs6Pw00000NkvXXu0mjfG@iKx delta 713 zcmV;)0yh2U8-yMqiBL{Q4GJ0x0000DNk~Le0000v0000s2nGNE0DVp|P_ZFO41WTH zNkl6ulFp8}b2GK~1Ve2-sK{3x7e{72W+0`2iYC5zs<{X%qYpSxL0h zU!a8|S_tCWh(WOuzev z339|Yg2YTgh&vN6u&`*`EqZ+Sf>jFes_J zC;L-DN&6b<5C$c6_hf%6D1T{RBOSt^r0$;VPX#6IYotRMl+@jm{i&d&eT{SogOa*? zvOg7+w6Bp4VNgV)dl#MNpjYuLi^Uzq1*ANChqaP{cM&b>8Yb zXgjMV20~iTzGns+?k1X--aHX$jk2frzrTPVdGi!3@QVGzKv;!=@P;Je!YMh0W#s;$ z-x-20AUMkZ#>X{@F%(~ujpyq(;3uC(6xp+faPk@Ht38|KW}spkIg&iVqe~Ag-&6Y0 v`;fF$wj!;?1px8mvL1q@(VidCoYDRoEJcYS5O!
- -
+ +
From 199fb025b9c66984ff07ebe019c65ca2f2a81455 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 13:59:28 +0300 Subject: [PATCH 4/7] Adds reload button to the input in the welcome page. --- app.js | 15 ++++++-- css/font.css | 4 +++ css/welcome_page.css | 16 +++++++-- fonts/jitsi.eot | Bin 9508 -> 10040 bytes fonts/jitsi.svg | 1 + fonts/jitsi.ttf | Bin 9352 -> 9884 bytes fonts/jitsi.woff | Bin 6100 -> 6396 bytes fonts/selection.json | 82 ++++++++++++++++++++++++++++++------------- index.html | 4 ++- 9 files changed, 92 insertions(+), 30 deletions(-) diff --git a/app.js b/app.js index 741cefc58..ba309dba0 100644 --- a/app.js +++ b/app.js @@ -1048,21 +1048,30 @@ $(document).ready(function () { } }); + var updateTimeout; + var animateTimeout; + $("#reload_roomname").click(function () { + clearTimeout(updateTimeout); + clearTimeout(animateTimeout); + update_roomname(); + }); + function animate(word) { var currentVal = $("#enter_room_field").attr("placeholder"); $("#enter_room_field").attr("placeholder", currentVal + word.substr(0, 1)); - setTimeout(function() { + animateTimeout = setTimeout(function() { animate(word.substring(1, word.length)) - }, 150); + }, 70); } + function update_roomname() { var word = RoomNameGenerator.generateRoomWithoutSeparator(); $("#enter_room_field").attr("room_name", word); $("#enter_room_field").attr("placeholder", ""); animate(word); - setTimeout(update_roomname, 10000); + updateTimeout = setTimeout(update_roomname, 10000); } update_roomname(); diff --git a/css/font.css b/css/font.css index c03b02c0b..e9fe8c2c7 100755 --- a/css/font.css +++ b/css/font.css @@ -99,3 +99,7 @@ .icon-hangup:before { content: "\e617"; } + +.icon-reload:before { + content: "\e618"; +} diff --git a/css/welcome_page.css b/css/welcome_page.css index ced9165a6..75a8a55ad 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -64,7 +64,7 @@ #enter_room_field { font-size: 16px; - padding: 15px 5px 10px 10px; + padding: 15px 0px 10px 10px; border: none; -webkit-appearance: none; width: 228px; @@ -99,7 +99,7 @@ #enter_room_container { margin: 70px auto 0px auto; - width:437px; + width:468px; } #enter_room{ @@ -210,4 +210,16 @@ padding-top: 30px; line-height: 22px; font-weight: 200; +} + +#reload_roomname +{ + width: 30px; + height: 19px; + color: #acacac; + margin-top: 22px; + z-index: 3; + float: left; + cursor: pointer; + text-align: center; } \ No newline at end of file diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot index 9aafd530f5b6161d15c3e9bda33e2ca629fe701c..fe5029e8a73ed003b391ee13605947451555fd1e 100755 GIT binary patch delta 784 zcmXw%&ui0Q7{{OI{gpOplQhZNxpm!4vQ{?T)@?Rrjv=TZ9t6S7gNQ40IApa2d)Ptf zpCB{nL3R)kym*^}pa-ww5J69#rYAwKUcBg&YzxoBoA2{H-{+IS`~1?I%c@xe*r{%- zhWNPhbbtG7r|<~?-chcuwOiex<-N}K`*J@Fem(-gE`a}XW4(2Y4gY!w5SD4Ku|Wm# zguNntm2|k#?rlX1zR~Lz>E32%t#xf_^%?2kq!-(*tu9QU1~7ht^w`~2d;RU^^k32! zi80sh-0K0S4pi?aec&v80N?wG>BSG3qd8eKwK zGB*Fq{6Zmg+?wO~X3k)bla6OuQDFOy6S`j2agSR( zm*e>n%O15$rv|*xat4Lea+uKiiVMPV&WJ}iLB#|o4K2Z$DXy8xOCj~FK3pg+R4S2+ zNW+{`2;ymZP36fUh2mV0T?yKtvLqOvX-!O?AJ9!nKPZ)D=tEkaORBFFXF0CMy*&h?HX30fuu!5e6{1AOP0a7v4>4@edeuBk1`Y pEZ;dg<2^sZkyr#>!Ri2UFIaF2E2(n?CFD{AiwooK?w8;S{s&KyX@md( delta 252 zcmdntx5SH0MU{b}LuDeH8B3)v_t%LI`GRK|7#Q{daYAx#Vu4iXnY@VyWaY>aR5a@nq)SgQq5xo00$pG6aWAK diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg index 2e319a98a..6f504253b 100755 --- a/fonts/jitsi.svg +++ b/fonts/jitsi.svg @@ -31,4 +31,5 @@ + \ No newline at end of file diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf index dbba4b0984d287efbf96317502e5be5011f228a1..4dc1cbaf847a5586b075b2b9d4b317ec7d7243fb 100755 GIT binary patch delta 806 zcmYk4&1(};6vf|tUo)9WW+sy~t^G*rOiZQKCTVM?*3yj?6%-d*U5O2~Hb~P3+C>E+ zF5QVOx)4`x+_&Tdbw!R-@g&_`ty1{?5j5(-i{?t> zCLj2*!&oVvuQySUPxwpdE6}B8Yim2w>y6gRo3+Ys=yQNfwKq1ma8NwuyANNVrM?|HO?`U{^lqfX8THS?NC=5EW)g{c%6ZV~&Jn$8?f&PE{5643X(LDtWh!fN0QF=g`LDwyMy~pzTl9M~6 zl(xAbWofR2G`Zl!x#V0Sgs=>0o2FwJnU1Lqtqn`59QVAL&<(QLlAjy({lH1v{BhjL zyKWSEf$x`c`Ldro?22?+WQJUC*y}yslP|e`pHxPg5}c603BkbwPNEj$lx@T~C!x)l z86}mKvIeq+&TO$5<%lpXu%raf$QU{Ui;`Lh3BQ)uLZ=|Os5ZvN7kVs5;SZH|ZL8m? z35EL7`1qNE&r8={SLsQW^+=q6EXc7$Iy8OmeqzS=>+0 t^EceNU(CiO!SgX(ynT>&t3gCVyUn02d5y8%&%vyjy_z_O_WHwh`UesgXDI*x delta 269 zcmbQ^+u>Qyz{tSBz|GLWz|3IaAFOZ0q4ei0P-G7fCnV=47D$Dj$zxz(lmYU6(i4jd zfV2RRp8=#f(sL@)3d1?dfqbC2!kmoM#1tm6M@jxRl!}rmg0EcW(Rd z&g@)*)=MdYR4;)pLAY2ENjG92dMSG7sS7>JO8U^5sQ>W&KmW&n4hPQp=-#Td-SpJg zdzza)2syS;4kF=58ZYdHM%tdGmFJGLWeBllRgb=X_cXbWAXMZeBbP1kzO4^lKi5m# z28ma1l3%)yNQCUx%zlfkX*%ii-v|=h^n$!>2d$=4fK;ujxXAe`f3X0yNG9Yk&L#H z#5xPmZi>pz-H~5lckVqGyibocZP-kRVes^O*Nyn!>-mB$gHDH)X@ zm$6QrqzgYSSJ0~kT5=Cqt4Df++~8ydj#RCh0PcOHA7) z`*ySVXH&9oWqfP}FaWa(&t{euM-t(Cl8G~iQtXtVlcj7EE2$bTGjX^^k(|HcZ=w$-;K>hm4G^j&c~a z>}irG*rU#`^R4eL<=3vGT$(%wLg~_$tN*K!W@{*yfs1-`=t@gABIH^gD{7_w0J#Y1 A-T(jq delta 369 zcmexkctu~N+~3X3KP1GTfkFHV0~Z4ji1$o>C?PRXhpS$MnSnusdG(sAIR9XMBOv<+ zP&xsGIh6jKP0md$U|&$yNd*Ig7)T$`42A*| - + @@ -79,7 +79,9 @@
+
+
From 44f22e5d16742259bb5366c661cbe6c41bed53d6 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Wed, 27 Aug 2014 16:12:13 +0300 Subject: [PATCH 5/7] Fixes the position of the input in the welcome page. --- css/welcome_page.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/welcome_page.css b/css/welcome_page.css index 75a8a55ad..9b3b9f81e 100644 --- a/css/welcome_page.css +++ b/css/welcome_page.css @@ -99,7 +99,7 @@ #enter_room_container { margin: 70px auto 0px auto; - width:468px; + display: table; } #enter_room{ @@ -150,7 +150,7 @@ background-image:url(../images/welcome_page/header-big.png); width: 583px; height: 274px; - margin: -55px auto 0px auto; + margin: -110px auto 0px auto; } #header_text From 53582abdaad26b42ebc584603ed918c16df3ff96 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Thu, 28 Aug 2014 10:29:07 +0300 Subject: [PATCH 6/7] Does not override nginx config on update. --- debian/jitsi-meet.postinst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/jitsi-meet.postinst b/debian/jitsi-meet.postinst index eab06e568..0befa07e1 100644 --- a/debian/jitsi-meet.postinst +++ b/debian/jitsi-meet.postinst @@ -23,15 +23,14 @@ case "$1" in # nginx conf . /etc/default/jitsi-videobridge - cp /usr/share/doc/jitsi-meet/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf - if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ]; then - ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf - fi - sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf - # FIXME do we need the default? - if [ ! -f /etc/nginx/sites-enabled/default ]; then - ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default + if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ]; then + cp /usr/share/doc/jitsi-meet/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf + if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ]; then + ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf + fi + sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/nginx/sites-available/$JVB_HOSTNAME.conf fi + if grep "# server_names_hash_bucket_size 64" /etc/nginx/nginx.conf > /dev/null; then sed -i "s/#\ server_names_hash_bucket_size\ 64/\ server_names_hash_bucket_size\ 64/" /etc/nginx/nginx.conf fi From c7a5f5cb9bfc24cab79b59f28e295eca7fb7c9f9 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Thu, 28 Aug 2014 11:43:23 +0300 Subject: [PATCH 7/7] Fixes the adblock issue. --- index.html | 4 ++-- local_stats.js => local_sts.js | 0 rtp_stats.js => rtp_sts.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename local_stats.js => local_sts.js (100%) rename rtp_stats.js => rtp_sts.js (100%) diff --git a/index.html b/index.html index 87cddd8cd..9c3fe7075 100644 --- a/index.html +++ b/index.html @@ -40,8 +40,8 @@ - - + + diff --git a/local_stats.js b/local_sts.js similarity index 100% rename from local_stats.js rename to local_sts.js diff --git a/rtp_stats.js b/rtp_sts.js similarity index 100% rename from rtp_stats.js rename to rtp_sts.js