From 4e9b7cd85099238a00fd1eae4b00263a7c34c79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6nnqvist?= <simon@iki.fi>
Date: Fri, 13 Feb 2009 01:11:29 +0200
Subject: [PATCH] Made new/edit person both user _form.erb. Updated all views
 to handle approved_membership properly.

---
 app/views/people/_form.erb     |  7 +++++++
 app/views/people/edit.html.erb | 21 +--------------------
 app/views/people/show.html.erb |  5 +++++
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/views/people/_form.erb b/app/views/people/_form.erb
index 277bd79..7826131 100644
--- a/app/views/people/_form.erb
+++ b/app/views/people/_form.erb
@@ -7,6 +7,13 @@
 	<dt><%= t('people.nickname')%></dt>
 	<dd><%= form.text_field :nickname %></dd>
  <%= render :partial => 'fields', :locals => { :f => form } %>
+	<dt><%= t('people.approved_membership')%></dt>
+	<dd><%= form.date_select :approved_membership,
+												:order => [:day,:month,:year],
+												:include_blank => true,
+												:start_year => Time.now.year,
+												:end_year => 1995
+												%></dd>
 	<dt><%= t('comments')%></dt>
 	<dd><%= form.text_area :comments %></dd>
 </dl>
\ No newline at end of file
diff --git a/app/views/people/edit.html.erb b/app/views/people/edit.html.erb
index 1d778fb..abc8903 100644
--- a/app/views/people/edit.html.erb
+++ b/app/views/people/edit.html.erb
@@ -6,25 +6,6 @@
 <%= error_messages_for :person %>
 
 <% form_for :person, :url => person_path(@person), :html => { :method => 'put' } do |f| %>
-<%= f.hidden_field :verified, :value => true %>
-<%# Make common partial for new and edit %>
-	<dl>
-		<dt><%= t('people.firstname')%></dt>
-		<dd><%= f.text_field :firstname %></dd>
-		<dt><%= t('people.lastname')%></dt>
-		<dd><%= f.text_field :lastname %></dd>
-		<dt><%= t('people.nickname')%></dt>
-		<dd><%= f.text_field :nickname %></dd>
-		<%= render :partial => 'fields', :locals => { :f => f } %>
-		<dt><%= t('people.approved_membership')%></dt>
-		<dd><%= f.date_select :approved_membership,
-													:order => [:day,:month,:year],
-													:include_blank => true,
-													:start_year => Time.now.year,
-													:end_year => 1995
-													%></dd>
-		<dt><%= t('comments')%></dt>
-		<dd><%= f.text_area :comments %></dd>
-	</dl>
+   <%= render :partial => 'form', :locals => { :form => f } %>
 	<%= f.submit t('save') %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb
index 2d3fba7..5ab6403 100644
--- a/app/views/people/show.html.erb
+++ b/app/views/people/show.html.erb
@@ -49,6 +49,11 @@
 		<% end %>
 	<% end %>
 
+	<% unless @person.approved_membership.to_s == '' %>
+		<dt><%= t('people.approved_membership') %></dt>
+  	<dd><%= @person.approved_membership %></dd>
+	<% end %>
+
 	<% unless @person.comments.empty? %>
 		<dt><%= t('comments') %></dt>
   	<dd><%= @person.comments %></dd>