Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAleksei Kvitinskii <aleksei.kvitinskii@active.by>2011-10-20 02:34:05 +0400
committerAleksei Kvitinskii <aleksei.kvitinskii@active.by>2011-10-20 02:34:05 +0400
commitfce1428d1055eeed98af56be5ae7e8de84c08edf (patch)
treed837909ea9b6e1387c71de5ef2c2ae568323f28c /app/views
parent0443346e8cc88f2051751111ba0005b860ad483d (diff)
extended user profile with social fields
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/users/_form.html.haml17
-rw-r--r--app/views/admin/users/show.html.haml11
-rw-r--r--app/views/profile/show.html.haml25
3 files changed, 51 insertions, 2 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index 17be416fa1d..aa9df298e11 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -25,13 +25,26 @@
= f.label :password_confirmation
%br
= f.password_field :password_confirmation
- .span-11
- .field.prepend-top.append-bottom
+ .field.prepend-top
= f.check_box :admin
= f.label :admin
+ .span-11
.field.prepend-top
= f.text_field :projects_limit, :class => "small_input"
= f.label :projects_limit
+
+ .field
+ = f.label :skype
+ %br
+ = f.text_field :skype
+ .field
+ = f.label :linkedin
+ %br
+ = f.text_field :linkedin
+ .field
+ = f.label :twitter
+ %br
+ = f.text_field :twitter
.clear
%br
.actions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index b1d110bec27..aee73c38ee7 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -14,6 +14,17 @@
%b Projects limit:
= @admin_user.projects_limit
+ %p
+ %b Skype:
+ = @admin_user.skype
+ %p
+ %b LinkedIn:
+ = @admin_user.linkedin
+ %p
+ %b Twitter:
+ = @admin_user.twitter
+
+
.clear
= link_to 'Edit', edit_admin_user_path(@admin_user)
\|
diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml
index 12737ba8143..ef23a1692a1 100644
--- a/app/views/profile/show.html.haml
+++ b/app/views/profile/show.html.haml
@@ -6,3 +6,28 @@
%p
%b Email:
= @user.email
+
+%br
+
+= form_for @user, :url => profile_edit_path, :method => :put do |f|
+ -if @user.errors.any?
+ #error_explanation
+ %ul
+ - @user.errors.full_messages.each do |msg|
+ %li= msg
+
+ .div
+ = f.label :skype
+ %br
+ = f.text_field :skype
+ .div
+ = f.label :linkedin
+ %br
+ = f.text_field :linkedin
+ .div
+ = f.label :twitter
+ %br
+ = f.text_field :twitter
+ .actions
+ = f.submit 'Save', :class => "lbutton vm"
+