kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add no-tabs class and externalize strings

Browse source 
- Add .no-tabs to login-box
- Externalize strings in common signup box
- Leverage render_if_exists
- Update PO file
This commit is contained in:
Martin Wortschack 2019-05-27 13:20:27 +00:00 committed by James Lopez
parent ae1d81661d
commit 9c95200219
4 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/pages/login.scss
View file

@ -42,8 +42,8 @@
.login-box,
.omniauth-container {
box-shadow: 0 0 0 1px $border-color;
border-bottom-right-radius: $border-radius-small;
border-bottom-left-radius: $border-radius-small;
border-bottom-right-radius: $border-radius;
border-bottom-left-radius: $border-radius;
padding: 15px;
.login-heading h3 {
@ -88,7 +88,7 @@
}
.omniauth-container {
border-radius: $border-radius-small;
border-radius: $border-radius;
font-size: 13px;
p {

18
app/views/devise/shared/_signup_box.html.haml
View file

@ -4,24 +4,24 @@
.devise-errors
= render "devise/shared/error_messages", resource: resource
.name.form-group
= f.label :name, 'Full name', class: 'label-bold'
= f.label :name, _('Full name'), class: 'label-bold'
= f.text_field :name, class: "form-control top qa-new-user-name js-block-emoji", required: true, title: _("This field is required.")
.username.form-group
= f.label :username, class: 'label-bold'
= f.text_field :username, class: "form-control middle qa-new-user-username js-block-emoji", pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, required: true, title: _("Please create a username with only alphanumeric characters.")
%p.validation-error.hide Username is already taken.
%p.validation-success.hide Username is available.
%p.validation-pending.hide Checking username availability...
%p.validation-error.hide= _('Username is already taken.')
%p.validation-success.hide= _('Username is available.')
%p.validation-pending.hide= _('Checking username availability...')
.form-group
= f.label :email, class: 'label-bold'
= f.email_field :email, class: "form-control middle qa-new-user-email", required: true, title: "Please provide a valid email address."
= f.email_field :email, class: "form-control middle qa-new-user-email", required: true, title: _("Please provide a valid email address.")
.form-group
= f.label :email_confirmation, class: 'label-bold'
= f.email_field :email_confirmation, class: "form-control middle qa-new-user-email-confirmation", required: true, title: "Please retype the email address."
= f.email_field :email_confirmation, class: "form-control middle qa-new-user-email-confirmation", required: true, title: _("Please retype the email address.")
.form-group.append-bottom-20#password-strength
= f.label :password, class: 'label-bold'
= f.password_field :password, class: "form-control bottom qa-new-user-password", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters."
%p.gl-field-hint.text-secondary Minimum length is #{@minimum_password_length} characters
= f.password_field :password, class: "form-control bottom qa-new-user-password", required: true, pattern: ".{#{@minimum_password_length},}", title: _("Minimum length is %{minimum_password_length} characters.") % { minimum_password_length: @minimum_password_length }
%p.gl-field-hint.text-secondary= _('Minimum length is %{minimum_password_length} characters') % { minimum_password_length: @minimum_password_length }
- if Gitlab::CurrentSettings.current_application_settings.enforce_terms?
.form-group
= check_box_tag :terms_opt_in, '1', false, required: true, class: 'qa-new-user-accept-terms'
@ -34,4 +34,4 @@
- if Gitlab::Recaptcha.enabled?
= recaptcha_tags
.submit-container
= f.submit "Register", class: "btn-register btn qa-new-user-register-button"
= f.submit _("Register"), class: "btn-register btn qa-new-user-register-button"

2
lib/gitlab/auth/o_auth/auth_hash.rb
View file

@ -55,7 +55,7 @@ module Gitlab
private
def info
auth_hash.info
auth_hash['info']
end
def get_info(key)

27
locale/gitlab.pot
View file

@ -1812,6 +1812,9 @@ msgstr ""
msgid "Checking branch availability..."
msgstr ""
msgid "Checking username availability..."
msgstr ""
msgid "Cherry-pick this commit"
msgstr ""
@ -4533,6 +4536,9 @@ msgstr ""
msgid "From the Kubernetes cluster details view, install Runner from the applications list"
msgstr ""
msgid "Full name"
msgstr ""
msgid "GPG Key ID:"
msgstr ""
@ -6102,6 +6108,12 @@ msgstr ""
msgid "Milestones|This action cannot be reversed."
msgstr ""
msgid "Minimum length is %{minimum_password_length} characters"
msgstr ""
msgid "Minimum length is %{minimum_password_length} characters."
msgstr ""
msgid "Mirror a repository"
msgstr ""
@ -7072,6 +7084,12 @@ msgstr ""
msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
msgstr ""
msgid "Please provide a valid email address."
msgstr ""
msgid "Please retype the email address."
msgstr ""
msgid "Please select a file"
msgstr ""
@ -7983,6 +8001,9 @@ msgstr ""
msgid "Regex pattern"
msgstr ""
msgid "Register"
msgstr ""
msgid "Register / Sign In"
msgstr ""
@ -10768,6 +10789,12 @@ msgstr ""
msgid "UserProfile|Your projects can be available publicly, internally, or privately, at your choice."
msgstr ""
msgid "Username is already taken."
msgstr ""
msgid "Username is available."
msgstr ""
msgid "Users"
msgstr ""