From 274059d10f58b9be9071626d4b633adb9ea71d22 Mon Sep 17 00:00:00 2001 From: benji Date: Fri, 11 Sep 2015 17:08:46 +0200 Subject: [PATCH] btn - Zeus link - deploy --- app/views/layouts/application.html.haml | 3 +++ app/views/transactions/_new.html.haml | 2 +- config/deploy/staging.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 897b33c..1dd2d96 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -14,6 +14,9 @@ - if current_user %li.pure-menu-item = link_to current_user.name.capitalize, current_user, class: "pure-menu-link" + - if current_user.penning + %li.pure-menu-item + =link_to "Zeus", User.zeus, class: "pure-menu-link" - else = link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user .pure-u-1 diff --git a/app/views/transactions/_new.html.haml b/app/views/transactions/_new.html.haml index 37a7d02..1ae6c04 100644 --- a/app/views/transactions/_new.html.haml +++ b/app/views/transactions/_new.html.haml @@ -15,4 +15,4 @@ = f.number_field :euros, value: amount(@transaction.amount), placeholder: "Bedrag", step: 0.01, min: (0.01 unless current_user.penning), class: "form-control", size: 20, required: true - = f.submit "Send it!", class: "pure-button pure-button-primary" + = f.submit "Send it!", class: "pure-button pure-button-primary btn" diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index d54ff64..cd6e844 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1,4 +1,4 @@ -server 'king.ugent.be', user: 'tap', roles: %w{web app db}, ssh_options: { +server 'king.ugent.be', user: 'tab', roles: %w{web app db}, ssh_options: { forward_agent: true, auth_methods: ['publickey'], port: 2222