From f1012ad480151a7fe98891f33f7646b9647d5f9a Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 9 May 2014 18:45:10 +0200 Subject: [PATCH] Various cleanups on the index page --- lib/Vroom/I18N/en.pm | 2 +- lib/Vroom/I18N/fr.pm | 2 +- public/css/vroom.css | 4 +-- public/js/vroom.js | 22 ++++++++++---- templates/default/index.html.ep | 51 ++++++++++++++++++-------------- templates/default/public_toolbar.html.ep | 4 ++- 6 files changed, 52 insertions(+), 33 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 2ef09df..6fd3600 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -86,7 +86,7 @@ our %Lexicon = ( "important data is sent directly. Only if you are behind a strict firewall, " . "streams will be relayed by our servers, as a last resort, but even in this case, " . "we will just relay encrypted blobs.", - "WORKS_EVERYWHERE" => "Works everywhere", + "WORKS_EVERYWHERE" => "Universal", "MODERN_BROWSERS" => "VROOM works with modern browsers (Chrome, Mozilla Firefox or Opera), " . "you don't have to install plugins, codecs, client software, then " . "send the tech documentation to all other parties. Just click, " . diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index 9651529..8883e8e 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -93,7 +93,7 @@ our %Lexicon = ( "(comme un point de rendez-vous virtuel). Seulement si certains d'entre vous se trouvent " . "derrière des pare feu stricts, les flux seront relayés à travers nos serveurs, en dernier " . "recours, mais même dans ce cas, nous ne relayons que des flux chiffrés, inintelligibles", - "WORKS_EVERYWHERE" => "Fonctionne partout", + "WORKS_EVERYWHERE" => "Universel", "MODERN_BROWSERS" => "VROOM fonctionne avec les navigateurs modernes (Google Chrome, Mozilla Firefox, Opera), " . "vous n'avez aucun plugin à installer, ni codec, ni client logiciel, ni à " . "envoyer la doc technique aux autres participants. Vous n'avez qu'à cliquer, et discuter", diff --git a/public/css/vroom.css b/public/css/vroom.css index 1cde076..308d865 100644 --- a/public/css/vroom.css +++ b/public/css/vroom.css @@ -66,7 +66,7 @@ padding-bottom: 2px; } #createRoomContainer { - max-width: 500px; + max-width: 700px; margin: auto; } #feedbackFormContainer { @@ -137,7 +137,7 @@ width: 149px; height: 149px; } -.thumbnail { +.panelIndex { text-align: justify; text-justify:inter-word; } diff --git a/public/js/vroom.js b/public/js/vroom.js index aee717e..9910d3c 100644 --- a/public/js/vroom.js +++ b/public/js/vroom.js @@ -9,8 +9,6 @@ Copyright 2014 Firewall Services $.notify.defaults( { globalPosition: "bottom left" } ); // Enable tooltip on required elements $('.help').tooltip({container: 'body'}); -// set the height of the thumbnails so they are always equals -$(".thumbnail").height(Math.max.apply(null, $(".thumbnail").map(function() { return $(this).height(); }))); // Strings we need translated var locale = { @@ -53,6 +51,22 @@ function inviteUrlPopup(){ return false; } +// set the height of the thumbnails so they are always equals +function setPanelHeight() { + $(".panel").height(Math.max.apply(null, $(".panel").map(function() { return $(this).height(); }))); +} + +setTimeout(function(){ + setPanelHeight(); +}, 50); + +// Resize a few element on window resize +window.onresize = function (){ + $('#webRTCVideo').css('max-height', maxHeight()); + $('#mainVideo>video').css('max-height', maxHeight()); + setPanelHeight(); +}; + function initVroom(room) { var peers = { @@ -714,10 +728,6 @@ function initVroom(room) { }, 60000); // Preview heigh is limited to the windows heigh, minus the navbar, minus 25px - window.onresize = function (){ - $('#webRTCVideo').css('max-height', maxHeight()); - $('#mainVideo>video').css('max-height', maxHeight()); - }; $('#webRTCVideo').css('max-height', maxHeight()); }; diff --git a/templates/default/index.html.ep b/templates/default/index.html.ep index 31a2cf5..a09d2ab 100644 --- a/templates/default/index.html.ep +++ b/templates/default/index.html.ep @@ -3,13 +3,26 @@ %= include 'public_toolbar'
-
-
+

+
+ <%=l 'CREATE_ROOM' %> +
+

+
-
<%=l 'CREATE_ROOM' %>
-
+
+ + + <% + my $url = $self->url_for('/')->to_abs; + $url =~ s/^https?:\/\///; + $url .= ($url =~ m/\/$/)? '':'/'; + %> + <%= $url %> + + @@ -21,41 +34,35 @@


-
-
-
+
+
+
Secure +

<%=l 'SECURE' %>

-
-
-

<%=l 'SECURE' %>

<%=l "P2P_COMMUNICATION" %>

-
-
-
+
+
+
Universal +

<%=l 'WORKS_EVERYWHERE' %>

-
-
-

<%=l 'WORKS_EVERYWHERE' %>

<%=l "MODERN_BROWSERS" %>

-
-
-
+
+
+
Peer to peer +

<%=l 'MULTI_USER' %>

-
-
-

<%=l 'MULTI_USER' %>

<%=l "THE_LIMIT_IS_YOUR_PIPE" %>

diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep index b1e909f..4442069 100644 --- a/templates/default/public_toolbar.html.ep +++ b/templates/default/public_toolbar.html.ep @@ -6,7 +6,9 @@