Removed fancybox. Fixed profile, my ordergroup and tasks.

This commit is contained in:
benni 2012-11-12 09:03:23 +01:00
parent dce79802e0
commit 1d9815731c
37 changed files with 124 additions and 518 deletions

View file

@ -1,24 +1,24 @@
- title "Mein Profil"
%p
Hier kannst Du deine Einstellungen ändern, z.b. Deine Telphonnummer oder Dein Passwort.
.left_column{:style => "width: 60%;"}
.box_title
%h2
= h @user.nick
- title "Mein Profil", false
.row-fluid
.span7
%h3
= h @current_user.nick
%small
(Mitglied seit: #{distance_of_time_in_words(Time.now, @user.created_on)})
.column_content
- simple_form_for(@user, :url => { :action => 'update_profile'}) do |f|
(Mitglied seit: #{distance_of_time_in_words(Time.now, @current_user.created_on)})
= simple_form_for(@current_user, :url => { :action => 'update_profile'}) do |f|
= render :partial => 'shared/user_form_fields', :locals => {:f => f}
= submit_tag 'Speichern'
.right_column{:style => "width: 35%;"}
.box_title
.form-actions
= submit_tag 'Speichern', class: 'btn'
.span5
%h2 Du bist Mitglied in folgenden Gruppen
.column_content
- for membership in Membership.find_all_by_user_id(@user.id)
%p
= membership.group.name
= link_to "Neue Mitglieder einladen", new_invite_path(id: membership.group_id)
- if membership.group.type != 'Ordergroup'
= link_to "Mitgliedschaft beenden", cancel_membership_path(membership_id: membership),
confirm: "Bist Du sicher, dass Du Deine Mitgliedschaft beenden willst?", method: :post
%table.table.table-striped
- @current_user.memberships.each do |membership|
%tr
%td= membership.group.name
%td= link_to "Neue Mitglieder einladen", new_invite_path(id: membership.group_id),
remote: true, class: 'btn btn-success btn-small'
- if membership.group.type != 'Ordergroup'
%td= link_to "Mitgliedschaft beenden", cancel_membership_path(membership_id: membership),
confirm: "Bist Du sicher, dass Du Deine Mitgliedschaft beenden willst?", method: :post,
class: 'btn btn-danger btn-small'