From 9b7241dfdd4a3a33e137b9aed9b73d59a07973b1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 31 Jul 2013 17:39:57 +0300 Subject: [PATCH] Add page titles with for profile area --- app/assets/stylesheets/gitlab_bootstrap/common.scss | 2 +- app/views/profiles/account.html.haml | 7 +++++++ app/views/profiles/design.html.haml | 6 ++++++ app/views/profiles/groups/index.html.haml | 5 +++++ app/views/profiles/history.html.haml | 5 +++++ app/views/profiles/keys/index.html.haml | 6 ++++-- app/views/profiles/notifications/show.html.haml | 4 +++- 7 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index 1d958a0..4f531b5 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -66,7 +66,7 @@ input[type='text'].danger { text-shadow: 0 1px 1px #fff } -fieldset legend { font-size: 17px; } +fieldset legend { font-size: 15px; } .tab-content { overflow: visible; diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 9b1354d..7951f63 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -1,3 +1,10 @@ +%h3.page-title + Account settings +%p.light + You can change password, username, private token here. + - if current_user.ldap_user? + Some options are unavailable for LDAP accounts +%hr - unless current_user.ldap_user? - if Gitlab.config.omniauth.enabled %fieldset diff --git a/app/views/profiles/design.html.haml b/app/views/profiles/design.html.haml index 9b6cace..75f00ab 100644 --- a/app/views/profiles/design.html.haml +++ b/app/views/profiles/design.html.haml @@ -1,3 +1,9 @@ +%h3.page-title + My appearance settings +%p.light + Appearance settings saved to your profile and available across all devices +%hr + = form_for @user, url: profile_path, remote: true, method: :put do |f| %fieldset.application-theme %legend diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml index 01f73a2..860951b 100644 --- a/app/views/profiles/groups/index.html.haml +++ b/app/views/profiles/groups/index.html.haml @@ -1,3 +1,8 @@ +%h3.page-title + Group membership +%p.light + Members of group have access to all group projects. +%hr .ui-box .title %strong Groups diff --git a/app/views/profiles/history.html.haml b/app/views/profiles/history.html.haml index aa7006c..5e59463 100644 --- a/app/views/profiles/history.html.haml +++ b/app/views/profiles/history.html.haml @@ -1,3 +1,8 @@ +%h3.page-title + Account history +%p.light + You can see all events authored by your account here +%hr .profile_history = render @events %hr diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index 0341376..f2180b9 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -1,9 +1,11 @@ +%h3.page-title + My SSH keys %p.light SSH key allows you to establish a secure connection between your computer and GitLab -%p.light + %br Before you can add ssh key you need to = link_to "generate it", help_ssh_path - +%hr .ui-box diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 3b8da83..d7963a8 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -1,6 +1,8 @@ %h3.page-title Notifications settings - +%p.light + Application use email specified in your profile for notifications +%hr .alert.alert-info %p %i.icon-circle.cred -- libgit2 0.21.2