From 2dace775e6b38f5bc8c8b93ad368c6381ab9b874 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 20 Feb 2015 17:57:26 +0100 Subject: [PATCH] Tooltip on configuration menu --- lib/Vroom/I18N/en.pm | 11 ++++++++++- lib/Vroom/I18N/fr.pm | 11 ++++++++++- public/js/vroom.js | 10 +++++++++- templates/default/configure_modal.html.ep | 26 +++++++++++++++++++++++++- 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm index 015047c..ff83756 100644 --- a/lib/Vroom/I18N/en.pm +++ b/lib/Vroom/I18N/en.pm @@ -126,7 +126,7 @@ our %Lexicon = ( "ADD_NOTIFICATION" => "Add a notification", "ADD_THIS_ADDRESS" => "Add this address", "REMOVE_THIS_ADDRESS" => "Remove this address", - "NOTIFICATION_ON_JOIN" => "Email addresses to notify when someone joins this room", + "NOTIFICATION_ON_JOIN" => "Notification when someone joins this room", "s_WILL_BE_NOTIFIED" => "%s will receive a notification each time someone joins this room", "s_WONT_BE_NOTIFIED_ANYMORE" => "%s won't be notified anymore", "ROOM_CONFIG_UPDATED" => "Room configuration has been updated", @@ -157,6 +157,15 @@ our %Lexicon = ( "JOIN_PASSWORD" => "Password to join the room", "OWNER_PASSWORD" => "Password to manage the room", "PERSISTENT" => "Persistent", + "TOOLTIP_LOCK_ROOM" => "Once this option is enabled, no one else can join the room. " . + "Only enable it after every participant is here. This way, nobody will be able to disturb " . + "your meeting", + "TOOLTIP_ASK_FOR_NAME" => "Everyone will be be asked for their name before they can join the room", + "TOOLTIP_PASSWORD_PROTECT" => "This password will be needed to join the room", + "TOOLTIP_RESERVE_THIS_ROOM" => "If this password is set, you'll be able to access the configuration menus ", + "next time you connect", + "TOOLTIP_PERSISTENT" => "The room will be persistent (kept forever)", + "TOOLTIP_NOTIFICATION_ON_JOIN" => "One or more email addresse(s) which will be notified when someone joins the room", "ROOM_NOW_PERSISTENT" => "This room is now persistent", "ROOM_NO_MORE_PERSISTENT" => "This rooms isn't persistent anymore", "EMAIL_INVITE" => "Email invitation", diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm index 1100c2e..cc75abb 100644 --- a/lib/Vroom/I18N/fr.pm +++ b/lib/Vroom/I18N/fr.pm @@ -132,7 +132,7 @@ our %Lexicon = ( "ADD_NOTIFICATION" => "Ajouter une notification", "ADD_THIS_ADDRESS" => "Ajouter cette adresse", "REMOVE_THIS_ADDRESS" => "Supprimer cette adresse", - "NOTIFICATION_ON_JOIN" => "Email à notifier lorsque quelqu'un rejoint ce salon", + "NOTIFICATION_ON_JOIN" => "Notification lorsque quelqu'un rejoint ce salon", "s_WILL_BE_NOTIFIED" => "%s recevra une notification à chaque fois qu'une personne rejoint ce salon", "s_WONT_BE_NOTIFIED_ANYMORE" => "%s ne recevra plus les notifications pour ce salon", "ROOM_CONFIG_UPDATED" => "La configuration du salon a été mise à jour", @@ -163,6 +163,15 @@ our %Lexicon = ( "JOIN_PASSWORD" => "Mot de passe d'accès au salon", "OWNER_PASSWORD" => "Mot de passe de gestionnaire", "PERSISTENT" => "Persistant", + "TOOLTIP_LOCK_ROOM" => "Une fois cette option activée, plus personne ne peut rejoindre le salon. " . + "À n'activer qu'une fois que tout les participants vous ont rejoint, pour éviter " . + "que d'autres personnes viennent troubler la réunion", + "TOOLTIP_ASK_FOR_NAME" => "Les participants devront saisir leur nom avant de pouvoir rejoindre le salon", + "TOOLTIP_PASSWORD_PROTECT" => "Ce mot de passe sera nécessaire pour rejoindre le salon", + "TOOLTIP_RESERVE_THIS_ROOM" => "Ce mot de passe vous permettra de récuperer l'accès aux " . + "menus de gestion la prochaine fois que vous vous connecterez", + "TOOLTIP_PERSISTENT" => "Rend le salon persistant (sera conservé indéfiniement)", + "TOOLTIP_NOTIFICATION_ON_JOIN" => "Une ou plusieurs adresses email qui recevront une notification dès que quulqu'un rejoint ce salon", "ROOM_NOW_PERSISTENT" => "Ce salon est maintenant persistant", "ROOM_NO_MORE_PERSISTENT" => "Ce salon n'est plus persistant", "EMAIL_INVITE" => "Invitation par email", diff --git a/public/js/vroom.js b/public/js/vroom.js index 4461585..109e3d0 100644 --- a/public/js/vroom.js +++ b/public/js/vroom.js @@ -8,7 +8,15 @@ Daniel Berteaud // Default notifications $.notify.defaults( { globalPosition: 'bottom left' } ); // Enable tooltip on required elements -$('.help').tooltip({container: 'body', trigger: 'hover'}); +$('.help').tooltip({ + container: 'body', + trigger: 'hover' +}); +$('.popup').popover({ + container: 'body', + placement: 'right', + trigger: 'focus' +}); $('.modal').on('show.bs.modal', function(){ $('.help').tooltip('hide'); }); diff --git a/templates/default/configure_modal.html.ep b/templates/default/configure_modal.html.ep index 1a40d77..80fb6ed 100644 --- a/templates/default/configure_modal.html.ep +++ b/templates/default/configure_modal.html.ep @@ -14,6 +14,10 @@
@@ -22,6 +26,10 @@
@@ -30,6 +38,10 @@
@@ -52,6 +64,10 @@
@@ -75,6 +91,10 @@
@@ -84,9 +104,13 @@