Commit 6bf65697 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use fieldset. Improved profile

parent cc539151
...@@ -20,18 +20,6 @@ body { ...@@ -20,18 +20,6 @@ body {
float:right; float:right;
} }
.profile_avatar_holder {
float:left;
width:60px;
height:60px;
margin-right:20px;
img {
width:60px;
height:60px;
background:#eee;
}
}
.visible_link, .visible_link,
.author_link { .author_link {
......
...@@ -156,12 +156,7 @@ header { ...@@ -156,12 +156,7 @@ header {
display: block; } } display: block; } }
.account-links { .account-links {
background: #79C3E0;
display: none;
border-radius: 5px; border-radius: 5px;
width: 100px;
margin-top: 0;
float: right;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
position: relative; position: relative;
&:before { &:before {
...@@ -171,33 +166,33 @@ header { ...@@ -171,33 +166,33 @@ header {
position: absolute; position: absolute;
border: 5px solid transparent; border: 5px solid transparent;
border-color: rgba(255, 255, 255, 0); border-color: rgba(255, 255, 255, 0);
border-bottom-color: #333; border-bottom-color: #555;
text-indent: -9999px; text-indent: -9999px;
top: -10px; top: -10px;
line-height: 0; line-height: 0;
right: 10px; right: 10px;
z-index: 10; } z-index: 10; }
background: #333; background: #555;
display: none; display: none;
z-index: 100000; z-index: 100000;
@include border-radius(4px); @include border-radius(4px);
width: 100px; width: 100px;
position: absolute; position: absolute;
right: 10px; right: 5px;
top: 42px; top: 38px;
margin-top: 0; margin-top: 0;
float: right; float: right;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
a { a {
color: #EEE; color: #fff;
padding: 6px 10px; padding: 7px 10px;
display: block; display: block;
text-shadow: none; text-shadow: none;
border-bottom: 1px solid #555; border-bottom: 1px solid #666;
font-size: 12px; font-size: 12px;
&:hover { &:hover {
color:#eee; color:#fff;
background: #444; background: #333;
} }
} }
} }
......
...@@ -6,7 +6,7 @@ ul.main_menu { ...@@ -6,7 +6,7 @@ ul.main_menu {
border-radius: 4px; border-radius: 4px;
margin: auto; margin: auto;
margin:30px 0; margin:30px 0;
border:1px solid #AAA; border:1px solid #BBB;
height:37px; height:37px;
@include bg-gray-gradient; @include bg-gray-gradient;
position:relative; position:relative;
......
...@@ -6,3 +6,17 @@ ...@@ -6,3 +6,17 @@
} }
} }
} }
.profile_avatar_holder {
float:left;
width:60px;
height:60px;
margin-right:20px;
img {
width:60px;
height:60px;
background:#fff;
padding: 1px;
border: 1px solid #ddd;
}
}
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
- if @keys.blank? - if @keys.blank?
%tr %tr
%td{colspan: 3} %td{colspan: 3}
%h3.nothing_here_message There are no SSH keys with access to your account. %p.nothing_here_message There are no SSH keys with access to your account.
- if Gitlab.config.omniauth_enabled? - if Gitlab.config.omniauth_enabled?
%fieldset %fieldset
%legend %legend Social Accounts
%h3.page_title Social Accounts
.oauth_select_holder .oauth_select_holder
%p.hint Tip: Click on icon to activate sigin with one of the following services %p.hint Tip: Click on icon to activate sigin with one of the following services
- User.omniauth_providers.each do |provider| - User.omniauth_providers.each do |provider|
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
%fieldset %fieldset
%legend %legend
%h3.page_title
Private token Private token
%span.cred.right %span.cred.right
keep it secret! keep it secret!
...@@ -31,8 +29,7 @@ ...@@ -31,8 +29,7 @@
= f.submit 'Generate', class: "btn success btn-build-token" = f.submit 'Generate', class: "btn success btn-build-token"
%fieldset %fieldset
%legend %legend Password
%h3.page_title Password
= form_for @user, url: profile_password_path, method: :put do |f| = form_for @user, url: profile_password_path, method: :put do |f|
.padded .padded
%p.slead After successful password update you will be redirected to login page where you should login with new password %p.slead After successful password update you will be redirected to login page where you should login with new password
......
= form_for @user, url: profile_update_path, remote: true, method: :put do |f| = form_for @user, url: profile_update_path, remote: true, method: :put do |f|
%div %fieldset
%h3.page_title Application theme %legend Application theme
%br
.themes_opts .themes_opts
= label_tag do = label_tag do
.prev .prev
...@@ -23,8 +22,8 @@ ...@@ -23,8 +22,8 @@
%br %br
.clearfix .clearfix
%h3.page_title Code review %fieldset
%br %legend Code review
.themes_opts .themes_opts
= label_tag do = label_tag do
.prev .prev
......
.profile_avatar_holder .profile_avatar_holder
= image_tag gravatar_icon(@user.email, 90), class: "styled_image" = image_tag gravatar_icon(@user.email, 90)
%h3.page_title %h3.page_title
= @user.name = @user.name
%br %br
...@@ -19,21 +19,23 @@ ...@@ -19,21 +19,23 @@
.control-group .control-group
= f.label :name, class: "control-label" = f.label :name, class: "control-label"
.controls .controls
= f.text_field :name, class: "input-xlarge" = f.text_field :name, class: "input-xlarge", required: true
%span.help-block Enter your name, so people you know can recognize you. %span.help-block Enter your name, so people you know can recognize you.
.control-group .control-group
= f.label :email, class: "control-label" = f.label :email, class: "control-label"
.controls .controls
= f.text_field :email, class: "input-xlarge" = f.text_field :email, class: "input-xlarge", required: true
%span.help-block We also use email for avatar detection. %span.help-block We also use email for avatar detection.
.span5.right .span5.right
%div.tips %fieldset.tips
%h6 Tips: %legend Tips:
%ul %ul
%li
%p You can change your password on Account page
-unless Gitlab.config.disable_gravatar? -unless Gitlab.config.disable_gravatar?
%li %li
%p.hint You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"} %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"}
- if Gitlab.config.omniauth_enabled? && @user.provider? - if Gitlab.config.omniauth_enabled? && @user.provider?
%li %li
...@@ -41,7 +43,6 @@ ...@@ -41,7 +43,6 @@
You can login through #{@user.provider.titleize}! You can login through #{@user.provider.titleize}!
= link_to "click here to change", profile_account_path = link_to "click here to change", profile_account_path
%hr
.row .row
.span7 .span7
.control-group .control-group
...@@ -59,23 +60,22 @@ ...@@ -59,23 +60,22 @@
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250 = f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters. %span.help-block Tell us about yourself in fewer than 250 characters.
.span5.right .span5.right
.ui-box.white %fieldset
.ui-box-body %legend
%h4
Personal projects: Personal projects:
%small.right %small.right
%span= current_user.my_own_projects.count %span= current_user.my_own_projects.count
of of
%span= current_user.projects_limit %span= current_user.projects_limit
.padded
.progress .progress
.bar{style: "width: #{current_user.projects_limit_percent}%;"} .bar{style: "width: #{current_user.projects_limit_percent}%;"}
.ui-box.white %fieldset
.ui-box-body %legend
%h4
SSH public keys: SSH public keys:
%strong.right= link_to current_user.keys.count, keys_path %strong.right= link_to current_user.keys.count, keys_path
.padded
= link_to "Add Public Key", new_key_path, class: "btn small" = link_to "Add Public Key", new_key_path, class: "btn small"
.form-actions .form-actions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment