Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
1e3ce077
Commit
1e3ce077
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use page title for header title too
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
fa407597
No related merge requests found
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
47 additions
and
49 deletions
+47
-49
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+4
-0
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+1
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+2
-1
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+3
-6
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+4
-5
app/views/profiles/audit_log.html.haml
app/views/profiles/audit_log.html.haml
+6
-3
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+4
-6
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+7
-6
app/views/profiles/notifications/show.html.haml
app/views/profiles/notifications/show.html.haml
+4
-4
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+5
-5
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+4
-4
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+2
-7
No files found.
app/assets/stylesheets/generic/blocks.scss
View file @
1e3ce077
...
...
@@ -27,6 +27,10 @@
border-bottom
:
1px
solid
#e7e9ed
;
color
:
$gl-gray
;
&
.top-block
{
border-top
:
none
;
}
&
.middle-block
{
margin-top
:
0
;
margin-bottom
:
0
;
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/nav/_profile.html.haml
View file @
1e3ce077
...
...
@@ -11,7 +11,7 @@
=
link_to
profile_path
,
title:
'Profile'
,
data:
{
placement:
'right'
}
do
=
icon
(
'user fw'
)
%span
Profile
Profile
Settings
=
nav_link
(
controller:
[
:accounts
,
:two_factor_auths
])
do
=
link_to
profile_account_path
,
title:
'Account'
,
data:
{
placement:
'right'
}
do
=
icon
(
'gear fw'
)
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/profile.html.haml
View file @
1e3ce077
-
page_title
"Profile Settings"
-
header_title
"Profile Settings"
,
profile_path
-
unless
@header_title
-
header_title
"Profile Settings"
,
profile_path
-
sidebar
"profile"
=
render
template:
"layouts/application"
This diff is collapsed.
Click to expand it.
app/views/profiles/accounts/show.html.haml
View file @
1e3ce077
-
page_title
"Account"
%h3
.page-title
=
page_title
%p
.light
Change your username and basic account settings.
%hr
-
header_title
page_title
,
profile_account_path
-
if
current_user
.
ldap_user?
.alert.alert-info
Some options are unavailable for LDAP accounts
...
...
@@ -69,7 +66,7 @@
-
button_based_providers
.
each
do
|
provider
|
.btn-group
=
link_to
provider_image_tag
(
provider
),
user_omniauth_authorize_path
(
provider
),
method: :post
,
class:
"btn btn-lg
#{
'active'
if
auth_active?
(
provider
)
}
"
,
"data-no-turbolink"
=>
"true"
-
if
auth_active?
(
provider
)
=
link_to
unlink_profile_account_path
(
provider:
provider
),
method: :delete
,
class:
'btn btn-lg'
do
=
icon
(
'close'
)
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/applications.html.haml
View file @
1e3ce077
-
page_title
"Applications"
%h3
.page-title
=
page_title
%p
.light
-
header_title
page_title
,
applications_profile_path
.gray-content-block.top-block
-
if
user_oauth_applications?
Manage applications that can use GitLab as an OAuth provider,
Manage applications that can use GitLab as an OAuth provider,
and applications that you've authorized to use your account.
-
else
Manage applications that you've authorized to use your account.
%hr
-
if
user_oauth_applications?
.oauth-applications
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/audit_log.html.haml
View file @
1e3ce077
-
page_title
"Audit Log"
%h3
.page-title
Audit Log
%p
.light
History of authentications
-
header_title
page_title
,
audit_log_profile_path
=
render
'event_table'
,
events:
@events
\ No newline at end of file
.gray-content-block.top-block
History of authentications
.prepend-top-default
=
render
'event_table'
,
events:
@events
This diff is collapsed.
Click to expand it.
app/views/profiles/emails/index.html.haml
View file @
1e3ce077
-
page_title
"Emails"
%h3
.page-title
=
page_title
%p
.light
Control emails linked to your account
%hr
-
header_title
page_title
,
profile_emails_path
.gray-content-block.top-block
Control emails linked to your account
%ul
%ul
.prepend-top-default
%li
Your
%b
Primary Email
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/keys/index.html.haml
View file @
1e3ce077
-
page_title
"SSH Keys"
%h3
.page-title
=
page_title
-
header_title
page_title
,
profile_keys_path
.gray-content-block.top-block
.pull-right
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-new"
%p
.light
Before you can add an SSH key you need to
=
link_to
"generate it."
,
help_page_path
(
"ssh"
,
"README"
)
%hr
.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'
This diff is collapsed.
Click to expand it.
app/views/profiles/notifications/show.html.haml
View file @
1e3ce077
-
page_title
"Notifications"
%h3
.page-title
=
page_title
%p
.light
-
header_title
page_title
,
profile_notifications_path
.gray-content-block.top-block
These are your global notification settings.
%hr
.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?
%div
.alert.alert-danger
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/passwords/edit.html.haml
View file @
1e3ce077
-
page_title
"Password"
%h3
.page-title
=
page_title
%p
.light
-
header_title
page_title
,
edit_profile_password_path
.gray-content-block.top-block
-
if
@user
.
password_automatically_set?
Set your password.
-
else
Change your password or recover your current one.
%hr
.update-password
.update-password
.prepend-top-default
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
%div
%p
.slead
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/passwords/new.html.haml
View file @
1e3ce077
...
...
@@ -12,7 +12,7 @@
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
-
unless
@user
.
password_automatically_set?
.form-group
=
f
.
label
:current_password
,
class:
'control-label'
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/preferences/show.html.haml
View file @
1e3ce077
-
page_title
'Preferences'
%h3
.page-title
=
page_title
%p
.light
-
header_title
page_title
,
profile_preferences_path
.gray-content-block.top-block
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.
%hr
.prepend-top-default
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'js-preferences-form form-horizontal'
}
do
|
f
|
.panel.panel-default.application-theme
...
...
This diff is collapsed.
Click to expand it.
app/views/profiles/show.html.haml
View file @
1e3ce077
-
page_title
"Profile"
%h3
.page-title
=
page_title
%p
.light
.gray-content-block.top-block
This information will appear on your profile.
-
if
current_user
.
ldap_user?
Some options are unavailable for LDAP accounts
%hr
.prepend-top-default
=
form_for
@user
,
url:
profile_path
,
method: :put
,
html:
{
multipart:
true
,
class:
"edit_user form-horizontal"
},
authenticity_token:
true
do
|
f
|
-
if
@user
.
errors
.
any?
%div
.alert.alert-danger
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment