Merge branch 'profile-settings-width' into 'master'
Added limited width to profile settings Closes #20918 See merge request !12386
This commit is contained in:
commit
fb093e8b2e
15 changed files with 56 additions and 40 deletions
|
@ -1,3 +1,4 @@
|
|||
- page_title "Edit", @application.name, "Applications"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
%h3.page-title Edit application
|
||||
= render 'form', application: @application
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
- page_title "Applications"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
|
@ -10,7 +11,7 @@
|
|||
and applications that you've authorized to use your account.
|
||||
- else
|
||||
Manage applications that you've authorized to use your account.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
- if user_oauth_applications?
|
||||
%h5.prepend-top-0
|
||||
Add new application
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
- page_title @application.name, "Applications"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
|
||||
%h3.page-title
|
||||
Application: #{@application.name}
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
- page_title "Account"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
- if current_user.ldap_user?
|
||||
|
@ -6,13 +7,13 @@
|
|||
Some options are unavailable for LDAP accounts
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Private Tokens
|
||||
%p
|
||||
Keep these tokens secret, anyone with access to them can interact with
|
||||
GitLab as if they were you.
|
||||
.col-lg-9.private-tokens-reset
|
||||
.col-lg-8.private-tokens-reset
|
||||
= render partial: 'reset_token', locals: { label: 'Private token', button_label: 'Reset private token', help_text: 'Your private token is used to access the API and Atom feeds without username/password authentication.' }
|
||||
|
||||
= render partial: 'reset_token', locals: { label: 'RSS token', button_label: 'Reset RSS token', help_text: 'Your RSS token is used to create urls for personalized RSS feeds.' }
|
||||
|
@ -22,12 +23,12 @@
|
|||
|
||||
%hr
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Two-Factor Authentication
|
||||
%p
|
||||
Increase your account's security by enabling Two-Factor Authentication (2FA).
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%p
|
||||
Status: #{current_user.two_factor_enabled? ? 'Enabled' : 'Disabled'}
|
||||
- if current_user.two_factor_enabled?
|
||||
|
@ -43,12 +44,12 @@
|
|||
%hr
|
||||
- if button_based_providers.any?
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Social sign-in
|
||||
%p
|
||||
Activate signin with one of the following services
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%label.label-light
|
||||
Connected Accounts
|
||||
%p Click on icon to activate signin with one of the following services
|
||||
|
@ -69,12 +70,12 @@
|
|||
%hr
|
||||
- if current_user.can_change_username?
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0.warning-title
|
||||
Change username
|
||||
%p
|
||||
Changing your username will change path to all personal projects!
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
= form_for @user, url: update_username_profile_path, method: :put, html: {class: "update-username"} do |f|
|
||||
.form-group
|
||||
= f.label :username, "Path", class: "label-light"
|
||||
|
@ -93,10 +94,10 @@
|
|||
|
||||
- if signup_enabled?
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0.danger-title
|
||||
Remove account
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
- if @user.can_be_removed? && can?(current_user, :destroy_user, @user)
|
||||
%p
|
||||
Deleting an account has the following effects:
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
- page_title "Authentication log"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h3.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
This is a security log of important events involving your account.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
= render 'event_table', events: @events
|
||||
|
|
|
@ -1,14 +1,15 @@
|
|||
- page_title 'Chat'
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
You can see your Chat accounts.
|
||||
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%h5 Active chat names (#{@chat_names.size})
|
||||
|
||||
- if @chat_names.present?
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
- page_title "Emails"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
Control emails linked to your account
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%h4.prepend-top-0
|
||||
Add email address
|
||||
= form_for 'email', url: profile_emails_path do |f|
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
- page_title "SSH Keys"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
SSH keys allow you to establish a secure connection between your computer and GitLab.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%h5.prepend-top-0
|
||||
Add an SSH key
|
||||
%p.profile-settings-content
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
- page_title @key.title, "SSH Keys"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
= render "key_details"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
- page_title "Notifications"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
%div
|
||||
|
@ -10,14 +11,14 @@
|
|||
|
||||
= hidden_field_tag :notification_type, 'global'
|
||||
.row
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4
|
||||
= page_title
|
||||
%p
|
||||
You can specify notification level per group or per project.
|
||||
%p
|
||||
By default, all projects and groups will use the global notifications setting.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%h5
|
||||
Global notification settings
|
||||
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
- page_title "Password"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
After a successful password update, you will be redirected to the login page where you can log in with your new password.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
%h5.prepend-top-0
|
||||
Change your password
|
||||
- unless @user.password_automatically_set?
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
- page_title "Personal Access Tokens"
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
= page_title
|
||||
%p
|
||||
|
@ -11,7 +12,7 @@
|
|||
You can also use personal access tokens to authenticate against Git over HTTP.
|
||||
They are the only accepted password when you have Two-Factor Authentication (2FA) enabled.
|
||||
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
|
||||
- if flash[:personal_access_token]
|
||||
.created-personal-access-token-container
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
- page_title 'Preferences'
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Syntax highlighting theme
|
||||
%p
|
||||
This setting allows you to customize the appearance of the syntax.
|
||||
= succeed '.' do
|
||||
= link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'syntax-highlighting-theme'), target: '_blank'
|
||||
.col-lg-9.syntax-theme
|
||||
.col-lg-8.syntax-theme
|
||||
- Gitlab::ColorSchemes.each do |scheme|
|
||||
= label_tag do
|
||||
.preview= image_tag "#{scheme.css_class}-scheme-preview.png"
|
||||
|
@ -36,14 +37,14 @@
|
|||
New
|
||||
.col-sm-12
|
||||
%hr
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Behavior
|
||||
%p
|
||||
This setting allows you to customize the behavior of the system layout and default views.
|
||||
= succeed '.' do
|
||||
= link_to 'Learn more', help_page_path('user/profile/preferences', anchor: 'behavior'), target: '_blank'
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
.form-group
|
||||
= f.label :layout, class: 'label-light' do
|
||||
Layout width
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
= bootstrap_form_for @user, url: profile_path, method: :put, html: { multipart: true, class: 'edit-user prepend-top-default' }, authenticity_token: true do |f|
|
||||
= form_errors(@user)
|
||||
|
||||
.row
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Public Avatar
|
||||
%p
|
||||
|
@ -16,7 +17,7 @@
|
|||
You can upload an avatar here
|
||||
- if gravatar_enabled?
|
||||
or change it at #{link_to Gitlab.config.gravatar.host, 'http://' + Gitlab.config.gravatar.host}
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
.clearfix.avatar-image.append-bottom-default
|
||||
= link_to avatar_icon(@user, 400), target: '_blank', rel: 'noopener noreferrer' do
|
||||
= image_tag avatar_icon(@user, 160), alt: '', class: 'avatar s160'
|
||||
|
@ -34,14 +35,14 @@
|
|||
= link_to 'Remove avatar', profile_avatar_path, data: { confirm: 'Avatar will be removed. Are you sure?' }, method: :delete, class: 'btn btn-gray'
|
||||
%hr
|
||||
.row
|
||||
.col-lg-3.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
%h4.prepend-top-0
|
||||
Main settings
|
||||
%p
|
||||
This information will appear on your profile.
|
||||
- if current_user.ldap_user?
|
||||
Some options are unavailable for LDAP accounts
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
.row
|
||||
= f.text_field :name, required: true, wrapper: { class: 'col-md-9' },
|
||||
help: 'Enter your name, so people you know can recognize you.'
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
- page_title 'Two-Factor Authentication', 'Account'
|
||||
- header_title "Two-Factor Authentication", profile_two_factor_auth_path
|
||||
- @content_class = "limit-container-width" unless fluid_layout
|
||||
= render 'profiles/head'
|
||||
|
||||
- if inject_u2f_api?
|
||||
|
@ -7,12 +8,12 @@
|
|||
= page_specific_javascript_bundle_tag('u2f')
|
||||
|
||||
.row.prepend-top-default
|
||||
.col-lg-3
|
||||
.col-lg-4
|
||||
%h4.prepend-top-0
|
||||
Register Two-Factor Authentication App
|
||||
%p
|
||||
Use an app on your mobile device to enable two-factor authentication (2FA).
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
- if current_user.two_factor_otp_enabled?
|
||||
= icon "check inverse", base: "circle", class: "text-success", text: "You've already enabled two-factor authentication using mobile authenticator applications. You can disable it from your account settings page."
|
||||
- else
|
||||
|
@ -20,9 +21,9 @@
|
|||
Download the Google Authenticator application from App Store or Google Play Store and scan this code.
|
||||
More information is available in the #{link_to('documentation', help_page_path('profile/two_factor_authentication'))}.
|
||||
.row.append-bottom-10
|
||||
.col-md-3
|
||||
.col-md-4
|
||||
= raw @qr_code
|
||||
.col-md-9
|
||||
.col-md-8
|
||||
.account-well
|
||||
%p.prepend-top-0.append-bottom-0
|
||||
Can't scan the code?
|
||||
|
@ -50,7 +51,7 @@
|
|||
|
||||
.row.prepend-top-default
|
||||
|
||||
.col-lg-3
|
||||
.col-lg-4
|
||||
%h4.prepend-top-0
|
||||
Register Universal Two-Factor (U2F) Device
|
||||
%p
|
||||
|
@ -59,7 +60,7 @@
|
|||
As U2F devices are only supported by a few browsers, we require that you set up a
|
||||
two-factor authentication app before a U2F device. That way you'll always be able to
|
||||
log in - even when you're using an unsupported browser.
|
||||
.col-lg-9
|
||||
.col-lg-8
|
||||
- if @u2f_registration.errors.present?
|
||||
= form_errors(@u2f_registration)
|
||||
= render "u2f/register"
|
||||
|
|
Loading…
Reference in a new issue