From fc2bf50488f5b43de2c0c3da81db5f648fbcfa4e Mon Sep 17 00:00:00 2001
From: szpyxlwoni <blasphemymoon@gmail.com>
Date: Thu, 22 Nov 2012 10:18:49 +0800
Subject: [PATCH] fixed some bugs

---
 app/helpers/teams_helper.rb                   |  1 -
 app/views/profile/edit.html.slim              |  5 +--
 .../teams/_approved_membership.html.slim      | 32 ++++++++++++++++++-
 app/views/teams/show.html.slim                |  3 +-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/helpers/teams_helper.rb b/app/helpers/teams_helper.rb
index 42ff0aa..50e9c11 100644
--- a/app/helpers/teams_helper.rb
+++ b/app/helpers/teams_helper.rb
@@ -1,6 +1,5 @@
 module TeamsHelper
   def membership_partial membership
-    return 'my_membership' if membership.person == @current_person
     membership.pending? ? 'pending_membership' : 'approved_membership'
   end
 end
\ No newline at end of file
diff --git a/app/views/profile/edit.html.slim b/app/views/profile/edit.html.slim
index b1217f0..4de0f29 100644
--- a/app/views/profile/edit.html.slim
+++ b/app/views/profile/edit.html.slim
@@ -18,8 +18,9 @@ div.hero-unit.highlight
     div.alert.alert-success =flash[:notice]
 - messages = @current_person.errors.full_messages
 - unless messages.empty?
-  - messages.each do |msg|
-    div.alert.alert-error #{msg}
+    ul.alert.alert-error
+      - messages.each do |msg|
+        li style='margin-left:8px;' = msg
 h1 Edit
 
 = form_for @current_person, url: profile_url, html: {class: 'form-horizontal'} do |form|
diff --git a/app/views/teams/_approved_membership.html.slim b/app/views/teams/_approved_membership.html.slim
index 969d49d..fa7a2f3 100644
--- a/app/views/teams/_approved_membership.html.slim
+++ b/app/views/teams/_approved_membership.html.slim
@@ -5,4 +5,34 @@ div.hero-unit.highlight class="#{membership.status}"
            =image_for membership.person
     div.span4
       = render partial: 'shared/person', locals: {person: membership.person}
-      = render partial: 'shared/membership', locals: {membership: membership}
\ No newline at end of file
+      = render partial: 'shared/membership', locals: {membership: membership}
+      -if membership.person == @current_person
+      = link_to 'edit membership', '#add_sc', class: 'fancybox btn btn-primary'
+          div id="add_sc" style="display:none;"
+            h2 Edit Membership
+            = form_for membership, html: {class: 'form-horizontal'} do |form|
+              fieldset
+                div.control-group
+                  label.control-label for="sc_embed_code" Soundcloud Link
+                  div.controls
+                    = text_field_tag :sc_embed_code
+                    span.help-block (record a soundcloud track, click 'Share' and copy the contents of the 'Embed Code' content here)
+                div.control-group
+                  label.control-label for="role" Role
+                  div.controls
+                    = form.text_field :role
+                div.control-group
+                  label.control-label for="started" Date Started
+                  div.controls
+                    = form.text_field :started
+                div.control-group
+                  label.control-label for="ended" Date Ended
+                  div.controls
+                    = form.text_field :ended
+                div.control-group
+                  label.control-label for="hidden" Hidden
+                  div.controls
+                    = form.check_box :hidden
+                div.form-actions
+                  div.controls
+                    = form.submit 'Update', class: 'btn btn-primary'
\ No newline at end of file
diff --git a/app/views/teams/show.html.slim b/app/views/teams/show.html.slim
index 66f3ed2..4b560b4 100644
--- a/app/views/teams/show.html.slim
+++ b/app/views/teams/show.html.slim
@@ -1,6 +1,7 @@
 - content_for :menu_items do
   li
-    = link_to 'add member', '#add_new', class: 'fancybox'
+    -if @current_person.approved_teams.include?(@team)
+      = link_to 'add member', '#add_new', class: 'fancybox'
   li
     = link_to 'avatars', "/avatars/#{@team.slug}"
   li