From cc8000e4cda97749b82e60a21c9d2f5eb9701800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 11 Dec 2015 08:25:13 +0100 Subject: [PATCH] Login from anywhere in the top bar --- app/locales/taiga/locale-en.json | 2 +- app/modules/navigation-bar/navigation-bar.jade | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index db29558c..a8faaa78 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -276,7 +276,7 @@ "LINK_FORGOT_PASSWORD": "Forgot it?", "TITLE_LINK_FORGOT_PASSWORD": "Did you forgot your password?", "ACTION_ENTER": "Enter", - "ACTION_SIGN_IN": "Sign in", + "ACTION_SIGN_IN": "Login", "PLACEHOLDER_AUTH_PASSWORD": "Password (case sensitive)" }, "LOGIN_FORM": { diff --git a/app/modules/navigation-bar/navigation-bar.jade b/app/modules/navigation-bar/navigation-bar.jade index f8202abf..54aa167e 100644 --- a/app/modules/navigation-bar/navigation-bar.jade +++ b/app/modules/navigation-bar/navigation-bar.jade @@ -7,17 +7,24 @@ nav.navbar(ng-if="vm.isEnabledHeader") include ../../svg/logo.svg - //a( - // href="#", - // title="{{'PROJECT.NAVIGATION.DISCOVER_TITLE' | translate}}", - // translate="PROJECT.NAVIGATION.DISCOVER") - a( href="https://taiga.io/support/", target="_blank", title="{{'PROJECT.NAVIGATION.HELP_TITLE' | translate}}", translate="PROJECT.NAVIGATION.HELP") + div.nav-right(ng-if="!vm.isAuthenticated") + a.login( + tg-nav="login", + href="#", + title="{{ 'LOGIN_COMMON.ACTION_SIGN_IN' | translate }}" + ) {{ 'LOGIN_COMMON.ACTION_SIGN_IN' | translate }} + a.register( + tg-nav="register", + href="#", + title="{{ 'REGISTER_FORM.ACTION_SIGN_UP' | translate }}" + ) {{ 'REGISTER_FORM.ACTION_SIGN_UP' | translate }} + div.nav-right(ng-if="vm.isAuthenticated") a(tg-nav="home", ng-class="{active: vm.active}",