taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1245 from taigaio/multiple-login 

Multiple login
stable
Jesús Espino 2017-03-09 13:39:00 +01:00 committed by GitHub
parent 9fd57f52ad 2ae4bb9538
commit b51f6ede7c
11 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/locales/taiga/locale-en.json
View File

@ -290,7 +290,8 @@
"TITLE_LINK_FORGOT_PASSWORD": "Did you forget your password?", "TITLE_LINK_FORGOT_PASSWORD": "Did you forget your password?",
"ACTION_ENTER": "Enter", "ACTION_ENTER": "Enter",
"ACTION_SIGN_IN": "Login", "ACTION_SIGN_IN": "Login",
"PLACEHOLDER_AUTH_PASSWORD": "Password (case sensitive)" "PLACEHOLDER_AUTH_PASSWORD": "Password (case sensitive)",
"ALT_LOGIN": "Or login with"
}, },
"LOGIN_FORM": { "LOGIN_FORM": {
"ERROR_AUTH_INCORRECT": "According to our Oompa Loompas, your username/email or password are incorrect.", "ERROR_AUTH_INCORRECT": "According to our Oompa Loompas, your username/email or password are incorrect.",

11
app/partials/includes/modules/invitation-login-form.jade
View File

@ -30,10 +30,15 @@ form.login-form
) )
fieldset fieldset
a.button-login.button-blackish.submit-button( button.button-green.submit-button(
type="submit" type="submit"
title="{{'LOGIN_COMMON.ACTION_ENTER' | translate}}"
translate="LOGIN_COMMON.ACTION_ENTER" translate="LOGIN_COMMON.ACTION_ENTER"
) )
fieldset(ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}", ng-include="plugin.template") .contrib-plugins-wrapper(ng-if="contribPlugins.length")
label(translate="LOGIN_COMMON.ALT_LOGIN")
fieldset(
ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}"
ng-include="plugin.template"
)

2
app/partials/includes/modules/invitation-register-form.jade
View File

@ -44,7 +44,7 @@ form.register-form
) )
fieldset fieldset
a.button-register.button-blackish.submit-button( button.button-register.button-green.submit-button(
type="submit" type="submit"
title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}" title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}"
translate="REGISTER_FORM.ACTION_SIGN_UP" translate="REGISTER_FORM.ACTION_SIGN_UP"

11
app/partials/includes/modules/login-form.jade
View File

@ -38,9 +38,12 @@
translate="LOGIN_COMMON.ACTION_SIGN_IN" translate="LOGIN_COMMON.ACTION_SIGN_IN"
) )
fieldset( .contrib-plugins-wrapper(ng-if="contribPlugins.length")
ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" label(translate="LOGIN_COMMON.ALT_LOGIN")
ng-include="plugin.template"
) fieldset(
ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}"
ng-include="plugin.template"
)
tg-public-register-message tg-public-register-message

11
app/partials/includes/modules/register-form.jade
View File

@ -52,10 +52,13 @@ div.register-form-container(tg-register)
translate="REGISTER_FORM.ACTION_SIGN_UP" translate="REGISTER_FORM.ACTION_SIGN_UP"
) )
fieldset( .contrib-plugins-wrapper(ng-if="contribPlugins.length")
ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" label(translate="LOGIN_COMMON.ALT_LOGIN")
ng-include="plugin.template"
) fieldset(
ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}"
ng-include="plugin.template"
)
//- Only displays terms notice when terms plugin is loaded. //- Only displays terms notice when terms plugin is loaded.
tg-terms-of-service-and-privacy-policy-notice tg-terms-of-service-and-privacy-policy-notice

2
app/styles/components/buttons.scss
View File

@ -8,7 +8,7 @@
color: $white; color: $white;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
padding: .4rem 2rem; padding: .6rem 2rem;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
transition: all .2s linear; transition: all .2s linear;

1
app/styles/core/base.scss
View File

@ -47,6 +47,7 @@ body {
.wrapper { .wrapper {
display: flex; display: flex;
height: 100%;
min-height: $main-height; min-height: $main-height;
} }

2
app/styles/layout/auth.scss
View File

@ -23,7 +23,7 @@
} }
.logo { .logo {
@include font-size(xxlarge); @include font-size(xxlarge);
@include font-type(text); @include font-type(light);
color: $white; color: $white;
margin-bottom: 1rem; margin-bottom: 1rem;
text-align: center; text-align: center;

7
app/styles/layout/invitation.scss
View File

@ -5,6 +5,7 @@
background-size: cover; background-size: cover;
display: flex; display: flex;
flex: 1; flex: 1;
height: 100vh;
justify-content: center; justify-content: center;
z-index: 999; z-index: 999;
.invitation-container { .invitation-container {
@ -107,4 +108,10 @@
border-right: 0; border-right: 0;
} }
} }
.contrib-plugins-wrapper {
label {
color: $whitish;
}
}
} }

1
app/styles/modules/auth/login-form.scss
View File

@ -10,6 +10,7 @@
} }
} }
} }
.forgot-pass { .forgot-pass {
@include font-size(small); @include font-size(small);
color: $gray; color: $gray;

8
app/styles/modules/common/contrib-plugins.scss Normal file
View File

@ -0,0 +1,8 @@
.contrib-plugins-wrapper {
margin: 1rem 0 2rem;
label {
@include font-size(small);
display: block;
margin-bottom: .5rem;
}
}