summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 14:44:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 14:44:38 +0200
commitdcc9dc94d56fc909fa7264e2c0e0541f0029272f (patch)
tree046a96131219ac91a00111ec3f8055d3b147ea45
parent72e410965d89f8e246543cf5e69b75aba94fc1ac (diff)
downloadgitlab-ce-dcc9dc94d56fc909fa7264e2c0e0541f0029272f.tar.gz
Re-organize profile settings titles and headers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/layouts/profile.html.haml4
-rw-r--r--app/views/profiles/applications.html.haml2
-rw-r--r--app/views/profiles/design.html.haml2
-rw-r--r--app/views/profiles/emails/index.html.haml2
-rw-r--r--app/views/profiles/keys/index.html.haml2
-rw-r--r--app/views/profiles/notifications/show.html.haml2
-rw-r--r--app/views/profiles/passwords/edit.html.haml3
-rw-r--r--app/views/profiles/show.html.haml4
8 files changed, 11 insertions, 10 deletions
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 9799b4cc4d7..3193206fe12 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -1,5 +1,5 @@
-- page_title "Profile"
-- header_title "Profile", profile_path
+- page_title "Settings"
+- header_title "Settings", profile_path
- sidebar "profile"
= render template: "layouts/application"
diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml
index c4f6f59624b..06857c302ac 100644
--- a/app/views/profiles/applications.html.haml
+++ b/app/views/profiles/applications.html.haml
@@ -1,6 +1,6 @@
- page_title "Applications"
%h3.page-title
- Application Settings
+ = page_title
%p.light
OAuth2 protocol settings below.
diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml
index af284f60409..6a3b4e88dba 100644
--- a/app/views/profiles/design.html.haml
+++ b/app/views/profiles/design.html.haml
@@ -1,6 +1,6 @@
- page_title "Design"
%h3.page-title
- Design Settings
+ = page_title
%p.light
Appearance settings will be saved to your profile and made available across all devices.
%hr
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 2c0d0e10a4c..88e4f69b14c 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -1,6 +1,6 @@
- page_title "Emails"
%h3.page-title
- Email Settings
+ = page_title
%p.light
Your
%b Primary Email
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index e3af0d4e189..06655f7ba3a 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,6 +1,6 @@
- page_title "SSH Keys"
%h3.page-title
- SSH Keys Settings
+ = page_title
.pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index a74d97dac3b..9480a19f5b2 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -1,6 +1,6 @@
- page_title "Notifications"
%h3.page-title
- Notifications Settings
+ = page_title
%p.light
These are your global notification settings.
%hr
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 21dabbdfe2c..399ae98adf9 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -1,5 +1,6 @@
- page_title "Password"
-%h3.page-title Password Settings
+%h3.page-title
+ = page_title
%p.light
- if @user.password_automatically_set?
Set your password.
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 29c30905117..62fac46df27 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -1,6 +1,6 @@
-- page_title "Settings"
+- page_title "Profile"
%h3.page-title
- Profile Settings
+ = page_title
%p.light
This information will appear on your profile.
- if current_user.ldap_user?