Set of small UI fixes to project and profile pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
2e8fe0bdb2
commit
6a7f2b99c7
9 changed files with 26 additions and 34 deletions
|
@ -1,7 +1,7 @@
|
|||
- page_title "Applications"
|
||||
- header_title page_title, applications_profile_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
.alert.alert-help.prepend-top-default
|
||||
- if user_oauth_applications?
|
||||
Manage applications that can use GitLab as an OAuth provider,
|
||||
and applications that you've authorized to use your account.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- page_title "Audit Log"
|
||||
- header_title page_title, audit_log_profile_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
.alert.alert-help.prepend-top-default
|
||||
History of authentications
|
||||
|
||||
.prepend-top-default
|
||||
|
|
|
@ -1,24 +1,22 @@
|
|||
- page_title "Emails"
|
||||
- header_title page_title, profile_emails_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
Control emails linked to your account
|
||||
|
||||
%ul.prepend-top-default
|
||||
%li
|
||||
Your
|
||||
%b Primary Email
|
||||
will be used for avatar detection and web based operations, such as edits and merges.
|
||||
%li
|
||||
Your
|
||||
%b Notification Email
|
||||
will be used for account notifications.
|
||||
%li
|
||||
Your
|
||||
%b Public Email
|
||||
will be displayed on your public profile.
|
||||
%li
|
||||
All email addresses will be used to identify your commits.
|
||||
.alert.alert-help.prepend-top-default
|
||||
%ul
|
||||
%li
|
||||
Your
|
||||
%b Primary Email
|
||||
will be used for avatar detection and web based operations, such as edits and merges.
|
||||
%li
|
||||
Your
|
||||
%b Notification Email
|
||||
will be used for account notifications.
|
||||
%li
|
||||
Your
|
||||
%b Public Email
|
||||
will be displayed on your public profile.
|
||||
%li
|
||||
All email addresses will be used to identify your commits.
|
||||
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
- page_title "SSH Keys"
|
||||
- header_title page_title, profile_keys_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
.pull-right
|
||||
.top-area
|
||||
.nav-text
|
||||
Before you can add an SSH key you need to
|
||||
= link_to "generate it.", help_page_path("ssh", "README")
|
||||
.nav-controls
|
||||
= link_to new_profile_key_path, class: "btn btn-new" do
|
||||
= icon('plus')
|
||||
Add SSH Key
|
||||
.oneline
|
||||
Before you can add an SSH key you need to
|
||||
= link_to "generate it.", help_page_path("ssh", "README")
|
||||
|
||||
.prepend-top-default
|
||||
= render 'key_table'
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
- page_title "Notifications"
|
||||
- header_title page_title, profile_notifications_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
These are your global notification settings.
|
||||
|
||||
.prepend-top-default
|
||||
= form_for @user, url: profile_notifications_path, method: :put, html: { class: 'update-notifications form-horizontal global-notifications-form' } do |f|
|
||||
-if @user.errors.any?
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- page_title "Password"
|
||||
- header_title page_title, edit_profile_password_path
|
||||
|
||||
.gray-content-block.top-block
|
||||
.alert.alert-help.prepend-top-default
|
||||
- if @user.password_automatically_set?
|
||||
Set your password.
|
||||
- else
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
- page_title 'Preferences'
|
||||
- header_title page_title, profile_preferences_path
|
||||
- @blank_container = true
|
||||
|
||||
.alert.alert-help
|
||||
.alert.alert-help.prepend-top-default
|
||||
These settings allow you to customize the appearance and behavior of the site.
|
||||
They are saved with your account and will persist to any device you use to
|
||||
access the site.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.gray-content-block.top-block
|
||||
.alert.alert-help.prepend-top-default
|
||||
This information will appear on your profile.
|
||||
- if current_user.ldap_user?
|
||||
Some options are unavailable for LDAP accounts
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
- @blank_container = true
|
||||
|
||||
.project-edit-container.prepend-top-default
|
||||
.project-edit-errors
|
||||
.project-edit-content
|
||||
|
|
Loading…
Reference in a new issue