From f8257889b32114e66bdeb2810b4a947476f35f48 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 18 Mar 2015 11:06:46 +0100
Subject: [PATCH] Mark active page as such in the toolbar

---
 public/js/vroom.js                       |  3 +++
 templates/default/js_common.html.ep      |  1 +
 templates/default/public_toolbar.html.ep | 10 +++++-----
 vroom.pl                                 | 24 +++++++++++++++++++++---
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/public/js/vroom.js b/public/js/vroom.js
index d59a4cb..5405a2d 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -32,6 +32,9 @@ var itemPerPage = 20;
 // Will store the global webrtc object
 var webrtc = undefined;
 
+// Mark current page link as active
+$('#lnk_' + page).addClass('active');
+
 // Localize the strings we need
 $.ajax({
   url: rootUrl + 'localize/' + currentLang,
diff --git a/templates/default/js_common.html.ep b/templates/default/js_common.html.ep
index 95eeadc..9df354d 100644
--- a/templates/default/js_common.html.ep
+++ b/templates/default/js_common.html.ep
@@ -4,6 +4,7 @@
       var rootUrl = '<%= $url %>';
       var currentLang = '<%= $self->languages %>';
       var api_key = '<%= ($self->session('key')) ? $self->session('key') : '' %>';
+      var page = '<%= stash('page') ? stash('page') : "" %>';
       var roomName;
     </script>
     <%
diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep
index 049b10e..159e5f7 100644
--- a/templates/default/public_toolbar.html.ep
+++ b/templates/default/public_toolbar.html.ep
@@ -11,20 +11,20 @@
       </div>
       <div class="collapse navbar-collapse" id="toolbar">
         <ul class="nav navbar-nav navbar-right">
-          <li>
+          <li id='lnk_index'>
             <a href="<%= $self->url_for('/') %>"><%=l 'HOME' %></a>
           </li>
-          <li>
+          <li id='lnk_help'>
             <a href="<%= $self->url_for('/help') %>"><%=l 'HELP' %></a>
           </li>
-          <li>
+          <li id='lnk_about'>
             <a href="<%= $self->url_for('/about') %>"><%=l 'ABOUT' %></a>
           </li>
-          <li>
+          <li id='lnk_feedback'>
             <a href="<%= $self->url_for('/feedback') %>"><%=l 'FEEDBACK' %></a>
           </li>
           <% if ($config->{'interface.demo'}){ %>
-          <li>
+          <li id='lnk_documentation'>
             <a href="<%= $self->url_for('/documentation') %>"><%=l 'DOCUMENTATION' %></a>
           </li>
           <% } %>
diff --git a/vroom.pl b/vroom.pl
index b203b3d..fc386bb 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -1173,6 +1173,7 @@ Mojo::IOLoop->recurring( 3 => sub {
 get '/' => sub {
   my $self = shift;
   $self->stash(
+    page     => 'index',
     etherpad => ($ec) ? 'true' : 'false'
   );
 } => 'index';
@@ -1181,20 +1182,37 @@ get '/' => sub {
 get '/about' => sub {
   my $self = shift;
   $self->stash(
+    page       => 'about',
     components => COMPONENTS,
     musics     => MOH
   );
 } => 'about';
 
 # Documentation
-get '/documentation' => 'documentation';
+get '/documentation' => sub {
+  my $self = shift;
+  $self->stash(
+    page => 'documentation'
+  );
+} => 'documentation';
 
 # Route for the help page
-get '/help' => 'help';
+get '/help' => sub {
+  my $self = shift;
+  $self->stash(
+    page => 'help'
+  );
+} => 'help';
 
 # Routes for feedback. One get to display the form
 # and one post to get data from it
-get '/feedback' => 'feedback';
+get '/feedback' => sub {
+  my $self = shift;
+  $self->stash(
+    page => 'feedback'
+  );
+} => 'feedback';
+
 post '/feedback' => sub {
   my $self = shift;
   my $email = $self->param('email') || '';