From fd1f38ebc5f4e6668f5ee7ea24c1deed022573c3 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 12 Mar 2015 13:10:31 +0100 Subject: [PATCH] Add a new "demo" mode And when enabled, display a new "Who's behind VROOM" part in the about page --- conf/settings.ini.dist | 4 ++++ lib/Vroom/I18N/en.pm | 5 +++++ lib/Vroom/I18N/fr.pm | 5 +++++ templates/default/about.html.ep | 14 ++++++++++++++ vroom.pl | 1 + 5 files changed, 29 insertions(+) diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist index d9ad5f6..f74cbe7 100644 --- a/conf/settings.ini.dist +++ b/conf/settings.ini.dist @@ -40,6 +40,10 @@ ;template = 'default' ; ID of the chrome extension which will be proposed when sharing screen on Chrome ;chrome_extension_id = 'ecicdpoejfllflombfanbhfpgcimjddn' +; demo can be 0 or 1 (anything else is considered 1). When set to 1, it'll display a few +; pages which would be hidden otherwise (documentation on how to install it for example) +; Default to 0 +;demo = 0 [cookie] ; Secret passphrase used to sign cookies. You must set this diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 9ef4c29..769d408 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -331,6 +331,11 @@ our %Lexicon = ( " But even in those cases, the server only relays ciphered packets, and has no access to the data " . " so confidentiality is not compromised (only latency will be affected)". "", + "WHO_IS_BEHIND_VROOM" => "Who's behind VROOM ?", + "ABOUT_WHO_IS_BEHIND_VROOM" => "VROOM started as a simple personal project, developped by a single person " . + "(Daniel Berteaud) on my spare time. This project wouldn't be that far without my employer " . + "Firewall Services " . + "who hosts the demo instance", "THANKS" => "Thanks", "ABOUT_THANKS" => "VROOM uses the following components, so, thanks to their respective authors :-)", "ABOUT_MUSICS" => "Also thanks to the authors of songs used", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index ad4de3c..56e82e7 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -360,6 +360,11 @@ our %Lexicon = ( " chiffrées parfaitement inintelligibles, la confidentialité des communications " . " n'est donc pas compromise (la latence sera par contre affectée)". "", + "WHO_IS_BEHIND_VROOM" => "Qui développe VROOM ?", + "ABOUT_WHO_IS_BEHIND_VROOM" => "VROOM a démarré comme un simple projet personnel, développé par une seule personne " . + "(Daniel Berteaud) sur mon temps libre. Ce projet n'en serait pas " . + "là sans l'aide de mon enreprise, Firewall Services " . + "qui assure entre autre l'hébergement de l'instance de référence", "THANKS" => "Remerciements", "ABOUT_THANKS" => "VROOM utilise les composants suivants, merci donc aux auteurs respectifs :-)", "ABOUT_MUSICS" => "Merci également aux auteurs des morceaux de musique utilisés", diff --git a/templates/default/about.html.ep b/templates/default/about.html.ep index 1748260..c08a072 100644 --- a/templates/default/about.html.ep +++ b/templates/default/about.html.ep @@ -38,6 +38,20 @@

+ <% if ($config->{'interface.demo'}){ %> +
+
+

+ <%=l 'WHO_IS_BEHIND_VROOM' %> +

+
+
+

+ <%==l 'ABOUT_WHO_IS_BEHIND_VROOM' %> +

+
+
+ <% } %>

diff --git a/vroom.pl b/vroom.pl index b341b91..2a23d72 100755 --- a/vroom.pl +++ b/vroom.pl @@ -45,6 +45,7 @@ $config->{'email.sendmail'} ||= '/sbin/sendmail'; $config->{'interface.powered_by'} ||= 'Firewall Services'; $config->{'interface.template'} ||= 'default'; $config->{'interface.chrome_extension_id'} ||= 'ecicdpoejfllflombfanbhfpgcimjddn'; +$config->{'interface.chrome_extension_id'} ||= 0; $config->{'cookie.secret'} ||= 'secret'; $config->{'cookie.name'} ||= 'vroom'; $config->{'rooms.inactivity_timeout'} ||= 60;