From 47989d6037cf8dee0897a22ecb53921c680e9bce Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 May 2015 14:54:05 +0200
Subject: [PATCH] Consistent header look for setting pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/views/profiles/accounts/show.html.haml | 5 ++++
app/views/profiles/applications.html.haml | 1 +
app/views/profiles/emails/index.html.haml | 32 ++++++++++++----------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index 06bad7dd84a..5939c951fe8 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -1,4 +1,9 @@
- page_title "Account"
+%h3.page-title
+ = page_title
+%p.light
+ Change your username and basic account settings.
+%hr
- if current_user.ldap_user?
.alert.alert-info
Some options are unavailable for LDAP accounts
diff --git a/app/views/profiles/applications.html.haml b/app/views/profiles/applications.html.haml
index 06857c302ac..353b2496a7c 100644
--- a/app/views/profiles/applications.html.haml
+++ b/app/views/profiles/applications.html.haml
@@ -3,6 +3,7 @@
= page_title
%p.light
OAuth2 protocol settings below.
+%hr
%fieldset.oauth-applications
%legend Your applications
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 88e4f69b14c..66812872c41 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -2,22 +2,26 @@
%h3.page-title
= page_title
%p.light
- Your
- %b Primary Email
- will be used for avatar detection and web based operations, such as edits and merges.
-%p.light
- Your
- %b Notification Email
- will be used for account notifications.
-%p.light
- Your
- %b Public Email
- will be displayed on your public profile.
-%p.light
- All email addresses will be used to identify your commits.
-
+ Control emails linked to your account
%hr
+
+%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
Emails (#{@emails.count + 1})
--
GitLab