5 files changed, 16 insertions, 48 deletions

diff --git a/src/include/layout-loggedin.jade b/src/include/layout-loggedin.jade
deleted file mode 100644
index fca8c17..0000000
--- a/src/include/layout-loggedin.jade
+++ /dev/null
@@ -1,32 +0,0 @@
-doctype html
-html(lang="en")
-  head
-    include ./head.jade
-    
-  body
-    .container
-
-      block menu
-        -var selected = '/profile'; //default
-
-      -var menu = { 'Home': '/', 'Leagues': '/leagues', 'My Bots': '/profile/bots', 'Profile': '/profile' };
-
-      .header.clearfix
-        nav: ul.nav.nav-pills.pull-right#nav
-          each val, key in menu
-            if selected === val
-              li.active(role='presentation'): a(href=val,title=key)= key
-            else
-              li(role='presentation'): a(href=val,title=key)= key
-        h3#banner Botleagues
-
-      #messages
-
-      block content
-
-      footer.footer: :markdown
-        © [ViviSoft](http://vivisoft.nl/) 2015
-
-    include ./foot.jade
-
-    block js
\ No newline at end of file
diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade
index 4b521a9..c17a841 100644
--- a/src/include/layout-main.jade
+++ b/src/include/layout-main.jade
@@ -38,6 +38,8 @@ html(lang="en")
       footer.footer: :markdown
         © [ViviSoft](http://vivisoft.nl/) 2015
 
+    script(type='text/javascript')!= 'var selected_page = "' + selected + '";'
+
     include ./foot.jade
 
     block js
\ No newline at end of file
diff --git a/src/js/main.js b/src/js/main.js
index 1f869c4..5d17e02 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -9,22 +9,19 @@ $(document).ready(function(){
 
 function setupLoginMenu() {
     $('#nav .login-link').remove();
-    
-    if ($('#nav').find('[href="/profile"]').length == 0) {
-        $('<li>').append(
+
+    var extra_links = {'Leagues': '/leagues', 'My Bots': '/profile/bots', 'Profile': '/profile', 'Logout': '/logout'};
+
+    for (var text in extra_links) {
+        var li = $('<li>').append(
             $('<a>')
                 .attr('role', 'presentation')
-                .attr('title', 'User profile')
-                .attr('href', '/profile')
-                .text('Profile'))
-            .appendTo($('#nav'));
+                .attr('title', text)
+                .attr('href', extra_links[text])
+                .text(text));
+        if (extra_links[text] == selected_page) { // selected_page is added in layout-main.jade
+            li.addClass('active');
+        }
+        li.appendTo($('#nav'));
     }
-    
-    $('<li>').append(
-        $('<a>')
-            .attr('role', 'presentation')
-            .attr('title', 'Logout')
-            .attr('href', '/logout')
-            .text('Logout'))
-        .appendTo($('#nav'));
 }
\ No newline at end of file
diff --git a/src/js/profile.js b/src/js/profile.js
index 48600db..7b36432 100644
--- a/src/js/profile.js
+++ b/src/js/profile.js
@@ -4,6 +4,7 @@ $(document).ready(function(){
 
 function setupGreeter() {
     $('#greeter').append(' ' + $.cookie(Botleagues.cookie_login_email));
+    
     $('#banner').append(
         $('<span>')
             .attr('id', 'banner-email')
diff --git a/src/profile.jade b/src/profile.jade
index 568434c..9f68f60 100644
--- a/src/profile.jade
+++ b/src/profile.jade
@@ -1,4 +1,4 @@
-extends ./include/layout-loggedin.jade
+extends ./include/layout-main.jade
 
 block menu
   -var selected = '/profile'