From c1418e3aee9aeed461c89920939f0713b6e80956 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 13 Jun 2014 13:31:43 +0200 Subject: [PATCH] Add a new slide on the index to talk about etherpad integration Only if etherpad is enabled --- lib/Vroom/I18N/en.pm | 2 ++ lib/Vroom/I18N/fr.pm | 2 ++ public/img/note.png | Bin 0 -> 1565 bytes public/vroom.pl | 7 ++++++- templates/default/index.html.ep | 16 ++++++++++++++++ 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 public/img/note.png diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index c2df39f..4c96e21 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -260,6 +260,8 @@ our %Lexicon = ( "TEXT_CHAT" => "Chat Included", "SECURED_TEXT_CHAT" => "Video and audio are not enough ? You can also use the included text chat, and fully secured: " . "your discussions are done directly between members and will never be sent on our servers.", + "COLLABORATIVE_NOTETAKING" => "Realtime notetaking", + "TAKE_NOTE_IN_REALTIME" => "Write your meating notes with others, all in real time with the included editor", "SUPPORTED_BROWSERS" => "Supported browsers", "HELP_BROWSERS_SUPPORTED" => "VROOM works with any modern, standard compliant browsers, which means any " . "recent Mozilla Firefox, Google Chrome or Opera.", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index 5806adc..336a9e1 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -286,6 +286,8 @@ our %Lexicon = ( "SECURED_TEXT_CHAT" => "La vidéo et le son ne vous suffisent pas ? Vous pouvez aussi utiliser le tchat intégré et " . "entièrement sécurisé: vos discussions se font directement entre les membres, et ne passent " . "à aucun moment par nos serveurs.", + "COLLABORATIVE_NOTETAKING" => "Prise de notes collaborative", + "TAKE_NOTE_IN_REALTIME" => "Prenez des notes tous ensembles, en temps réel grâce à l'éditeur collaboratif intégré", "SUPPORTED_BROWSERS" => "Navigateurs supportés", "HELP_BROWSERS_SUPPORTED" => "VROOM fonctionne avec tous les navigateurs modernes et respectueux des standards. " . "Les technologies employées (WebRTC) étant encore jeunes, seules les versions " . diff --git a/public/img/note.png b/public/img/note.png new file mode 100644 index 0000000000000000000000000000000000000000..9a467746cb73a5c29ce183cba9383820d7abbdf9 GIT binary patch literal 1565 zcmd6n`#aMM0LH&FHn}9XhQzTV92^>sq+Ir$Wi-e5Qm#`jxrB0D7i}J8uC+%w?zf0W zh!`vEBptU%8Zn`gYlNjl=5YRs^Ssadd4G6+eV;e^4H~}n7X09Q|#a~v3i+(cHs_gBlXu# z*`qLojr!%BnEs#s-(pUO)tK?k2BPCJv)B9cZyc}^RZHAMv|0=D(jzx2l0?8bH6rI= zY$_amwN5j|i#9-A;>@RoBd`}~DA0#RpF6<9YL$=B^1`K5l|~9ku{aPxP~He0<&C52!Qzo+pNF070UH%FhNj!o1PXhk2$wLuiuIm6aV-0*iWQE8SI* zK>@IQ+_VSN+yp}+crZ6(I^(SNWrAhxJ@$eVZZMs`?fbeCsr(#zu<%S%^W`EY5x&2% zx%R>PFugqcMXA#qBdzk;<6n)qtCIkFO+75?{x>|dt}$hCUvPHuYbZ6xFn+~e=*c3F zfe3QnZ#FR%#IveEk}cu2^DbOp=GZ-E<|5Ao@(}*4<7Nk{1e0%)Ex|VJme@(;xapa0 z1N0iMJNH=S_QWfO>mx+7zm~VUO{i8f^%G%vF3I2GEdTF83i1!`ix1!yV|5} zj;Hjfr(CCNAfM^5l*QI7f6QJu8Lr+WsqW`Bf#4U8HVH*R5x1GH@IE<4sMET^*faqP znQJ|w4Gl5unqbN~K|H zg5LMYY1wx-&p2r^neUSPOMKDGm>X;c7kw>ZmvL=Cd9J7wtVK#0WOYZw+>kJ`4eTlMC z5;;#Pf(&{AJ7H_Z;i_lVo4(vu)CTJiZu%m$l!$NFaFbuC*G^phP-Zm*`iQS&(u3hd zuDxW#d_L0Wg`0f6ghj=6jXnfb%&3%F`dKzgSTsb!;yCTt@#|(`_=t~p>X92U^sS7t zNSoM`msd&xl7L_m*Pj+@+qSGG{i8C4)+56(!a0~ZuKCJ35`KHIka<_a2yBsUwuWXM z1XEH-N^0pjCi8rec8?;J7Q5NHBRNsU$#Q?$AW|HEc4AP<$<=}T`_=XSgVa*Z_~3f* z-mNQ;cX9W~4*56^ezj2OCVQ+s`^%-wA-sbeFIVTv8=u>VX-{F}kM`2%?@~mkP-Kr~ zH6?C0tXMO}mouV>pL68m^*6mWk}~!KVIV|-)?=nv2fr<$7_no`_Ma9C_;UKL-~`OtH^1bt4$|*aU?D}? z#0zW^;*XKDob$BNs`Rej6G?MDqfeKK(xZSfAm}+|mzpLV(sfGsF&^ljQyUi6_5aaG z8LM+v7}u(@%7V>ds^t-^N#<=|KmZ5~s!@6&e?e-!fHHFU(6BhFN%d_Y)c5tZEj0PK z8rAR89!1LLHfaCZRNQ4vu8DXDaA3QmS8me26wk*&sv?nYBa+H4T%3Z+waS@go*Lvq zeQ%|{!eZ+Ey)u6Nh3H~J1d_(pDj(#eiETyK5g}ECv5Uj_HOVm82wdEe(8@H0&4pMF s5F?e|)-rjtMovZ_|Gz`sgLn3Z6r*e_8Q*EXZ};y38ypd=u_7n@3mMbER{#J2 literal 0 HcmV?d00001 diff --git a/public/vroom.pl b/public/vroom.pl index f45cad8..c06d830 100755 --- a/public/vroom.pl +++ b/public/vroom.pl @@ -610,7 +610,12 @@ helper check_invite_token => sub { }; # Route / to the index page -any '/' => 'index'; +any '/' => sub { + my $self = shift; + $self->stash( + etherpad => ($ec) ? 'true' : 'false' + ); +} => 'index'; # Route for the about page get '/about' => sub { diff --git a/templates/default/index.html.ep b/templates/default/index.html.ep index db2db06..09dddd4 100644 --- a/templates/default/index.html.ep +++ b/templates/default/index.html.ep @@ -68,6 +68,9 @@
  • + <% if ($etherpad eq 'true'){ %> +
  • + <% } %> + <% if ($etherpad eq 'true') { %> +
    + +

    + <%=l 'TAKE_NOTE_IN_REALTIME' %> +

    + +
    + <% } %>