Cleaner jade

10 files changed, 53 insertions, 32 deletions

diff --git a/src/404.jade b/src/404.jade
index 65e0aed..172c126 100644
--- a/src/404.jade
+++ b/src/404.jade
@@ -3,7 +3,7 @@ extends ./include/layout-main.jade
 block menu
   -var selected = ''
 
-block content
-  .jumbotron
-    h1 404
-    p.lead Congrats. You did it: you broke my website.
\ No newline at end of file
+block header
+  -var header_jumbotron = true
+  -var header_title = '404'
+  -var header_subtitle = 'Congrats. You did it: you broke my website.'
\ No newline at end of file
diff --git a/src/about.jade b/src/about.jade
index 2c424d4..0ae837d 100644
--- a/src/about.jade
+++ b/src/about.jade
@@ -3,6 +3,10 @@ extends ./include/layout-main.jade
 block menu
   -var selected = '/about'
 
+block header
+  -var header_jumbotron = false
+  -var header_title = 'About'
+
 block content
   .row
     .col-lg-6
diff --git a/src/css/profile.less b/src/css/profile.less
index c0b6295..85d708c 100644
--- a/src/css/profile.less
+++ b/src/css/profile.less
@@ -1,5 +1,3 @@
-#banner {
-    #banner-email {
-        font-size: 80%;
-    }
+#banner-email {
+    font-size: 80%;
 }
\ No newline at end of file
diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade
index c17a841..abbb466 100644
--- a/src/include/layout-main.jade
+++ b/src/include/layout-main.jade
@@ -27,12 +27,34 @@ html(lang="en")
         form.form-inline#login-form(action='#',method='post')
           .form-group
             input.form-control#login-email(type='email',placeholder='Email')
+          |  
           .form-group
             input.form-control#login-password(type='password',placeholder='Password')
+          |  
           .form-group
             button.btn.btn-default.pull-right#login-submit(role='submit') Login
         br(style='clear:both;')
 
+      -var header_jumbotron = false
+      block header
+
+      -if (header_jumbotron)
+        .jumbotron
+          h1= header_title
+          -if (header_subtitle)
+            p.lead= header_subtitle
+          p.row
+            block header_content
+      -else
+        .row
+          .col-lg-12
+            .bs-component
+              h1= header_title
+              -if (header_subtitle)
+                p.lead= header_subtitle
+              p.row
+                block header_content
+
       block content
 
       footer.footer: :markdown
diff --git a/src/index.jade b/src/index.jade
index 6b6a175..a9e7ef5 100644
--- a/src/index.jade
+++ b/src/index.jade
@@ -3,13 +3,15 @@ extends ./include/layout-main.jade
 block menu
   -var selected = '/'
 
-block content
-  .jumbotron
-    h1 Welcome
-    p.lead Botleagues: write Java bots for different games, join competitions and win prizes!
-    p.row
-      a.btn.btn-lg.btn-success.pull-right(href='/register', role='button') Register now
+block header
+  -var header_jumbotron = true
+  -var header_title = 'Welcome'
+  -var header_subtitle = 'Botleagues: write Java bots for different games, join competitions and win prizes!'
+
+block header_content
+  a.btn.btn-lg.btn-success.pull-right(href='/register', role='button') Register now
 
+block content
   .row
     .col-lg-4
       h4 Subheading
diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js
index 13305fa..ff99225 100644
--- a/src/js/BotleaguesCallback.js
+++ b/src/js/BotleaguesCallback.js
@@ -34,7 +34,7 @@ BotleaguesCallback.register = function(data) {
 BotleaguesCallback.login = function(data) {
     if (data.user_token) {
         BotleaguesFrontend.success({
-            message: "Login successful!"
+            message: "Login successful! Refreshing the page..."
         });
         
         $.cookie(Botleagues.cookie_login_user_id, data.user_token.userId);
@@ -42,7 +42,7 @@ BotleaguesCallback.login = function(data) {
         $.cookie(Botleagues.cookie_login_valid_till,
             (new Date()).getTime() + Date.parse(data.user_token.valid_till) - Date.parse(data.user_token.updated_at));
 
-        window.location = '/profile';
+        window.setTimeout(function(){ window.location = '/profile'; }, 1000);
     } else {
         BotleaguesFrontend.error({
             message: data.error ? data.error : "Could not login."
diff --git a/src/js/profile.js b/src/js/profile.js
index 7b36432..f27e562 100644
--- a/src/js/profile.js
+++ b/src/js/profile.js
@@ -3,9 +3,9 @@ $(document).ready(function(){
 });
 
 function setupGreeter() {
-    $('#greeter').append(' ' + $.cookie(Botleagues.cookie_login_email));
+    $('.jumbotron .lead').append(' ' + $.cookie(Botleagues.cookie_login_email));
     
-    $('#banner').append(
+    $('.header h3').append(
         $('<span>')
             .attr('id', 'banner-email')
             .addClass('text-muted')
diff --git a/src/logout.jade b/src/logout.jade
index f94e608..d19e44a 100644
--- a/src/logout.jade
+++ b/src/logout.jade
@@ -4,7 +4,7 @@ block menu
   -var selected = '/logout'
 
 block content
-  p Login you out...
+  p Logging you out...
 
 block js
   script(type='text/javascript')
diff --git a/src/profile.jade b/src/profile.jade
index 9f68f60..5b97b30 100644
--- a/src/profile.jade
+++ b/src/profile.jade
@@ -3,10 +3,10 @@ extends ./include/layout-main.jade
 block menu
   -var selected = '/profile'
 
-block content
-  .jumbotron
-    h1 Welcome back
-    p.lead#greeter You're logged in as
+block header
+  -var header_jumbotron = true
+  -var header_title = 'Welcome back'
+  -var header_subtitle = "You're logged in as"
 
 block js
   script(src='/assets/js/profile.js', type='text/javascript')
\ No newline at end of file
diff --git a/src/register.jade b/src/register.jade
index b373d1c..ca8cc83 100644
--- a/src/register.jade
+++ b/src/register.jade
@@ -3,6 +3,9 @@ extends ./include/layout-main.jade
 block menu
   -var selected = '/register'
 
+block header
+  -var header_title = 'Register'
+
 block content
   .row
     .col-lg-6
@@ -22,12 +25,4 @@ block content
             input#accepts-toc(type='checkbox',name="accepts-toc")
             | I accept the terms and conditions
           button.btn.btn-lg.btn-success.pull-right(type='submit') Register
-          br(style='clear:both;')
-
-    .col-lg-6
-      h4 Subheading
-      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
-      h4 Subheading
-      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
-      h4 Subheading
-      p Maecenas sed diam eget risus varius blandit sit amet non magna.
\ No newline at end of file
+          br(style='clear:both;')
\ No newline at end of file