Merge branch 'master' of https://github.com/andreassteph/fetsite

app/views/fetprofiles/_form.html.erb

@@ -1,15 +1,39 @@
+<div class="container-fluid">
+  
 <%= semantic_form_for @fetprofile do |f| %>
   <%= f.inputs do %>
-    <%= f.input :vorname %>
-    <%= f.input :nachname %>
-    <%= f.input :short %>
-    <%= f.input :fetmailalias %>
-    <%= f.input :desc %>
-    <%= f.input :picture %>
-    <%= f.input :active %>
+    <div class="row-fluid">
+    <div class="span4">
+    <%= f.input :vorname %></div>
+    <div class="span4"><%= f.input :nachname %></div>
+    <div class="span4"><%= f.input :short %>
+   </div> </div>
+     <div class="row-fluid">
+    <div class="span12">   
+    <%= f.input :desc %></div>
+    </div> 
+    <div class="row-fluid">
+    <div class="span4"> <%= f.input :active %></div> 
+    <div class="span4"><%= f.input :picture, :as=>:file %></div>
+    <div class="span4">  <%= f.input :fetmailalias %></div> 
+    </div>
+   <% @fetprofile.memberships.each do |m| %>
+  <%= semantic_fields_for m do |mf| %>
+   <div class="row-fluid">
+	   <div class="span1"></div>
+   <div class="span3"><%= mf.input :start, :as=>:date %></div>
+  <div class="span3"><%= mf.input :stop %></div>
+  <div class="span3"><%= mf. input :gremium %></div>
+  <div class="span2"><%= mf.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
+  
+  </div>
   <% end %>
-
+<% end
+end %>
+   <div class="row-fluid">
+   <div class="span12">
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+</div></div></div>

app/views/fetprofiles/index.html.erb

@@ -7,7 +7,7 @@
     <th>Short</th>
     <th>Fetmailalias</th>
     <th>Desc</th>
-    <th>Picture</th>
+
     <th>Active</th>
     <th></th>
     <th></th>
@@ -21,7 +21,7 @@
     <td><%= fetprofile.short %></td>
     <td><%= fetprofile.fetmailalias %></td>
     <td><%= fetprofile.desc %></td>
-    <td><%= fetprofile.picture %></td>
+
     <td><%= fetprofile.active %></td>
     <td><%= link_to 'Show', fetprofile %></td>
     <td><%= link_to 'Edit', edit_fetprofile_path(fetprofile) %></td>

app/views/fetprofiles/show.html.erb

@@ -1,40 +1,35 @@
 <p id="notice"><%= notice %></p>
+<div class="container-fluid">
+  <div class="row-fluid">
+	  <div class="span3">
+		<%= image_tag @fetprofile.picture.portrait.url %>
+	</div>
+	<div class="span9">
+<h2><%= @fetprofile.name %></h2>
 
 <p>
-  <b>Vorname:</b>
-  <%= @fetprofile.vorname %>
-</p>
-
-<p>
-  <b>Nachname:</b>
-  <%= @fetprofile.nachname %>
-</p>
-
-<p>
-  <b>Short:</b>
-  <%= @fetprofile.short %>
-</p>
-
-<p>
-  <b>Fetmailalias:</b>
   <%= @fetprofile.fetmailalias %>
 </p>
-
 <p>
-  <b>Desc:</b>
   <%= @fetprofile.desc %>
 </p>
-
 <p>
-  <b>Picture:</b>
-  <%= @fetprofile.picture %>
+   <%= "<b>Aktiv</b>".html_safe if @fetprofile.active %>
 </p>
 
-<p>
-  <b>Active:</b>
-  <%= @fetprofile.active %>
-</p>
+</div>
+</div>
+  <div class="row-fluid">
+	  <div class="span12">
+<% @fetprofile.memberships.each do |m| %>
+<%= m.start.to_s %>
+<%= m.gremium.try(:name).to_s %>
+<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) %>
+<% end %>
 
+<%= link_to 'Edit', new_fetprofile_membership_path(@fetprofile) %> |
 
 <%= link_to 'Edit', edit_fetprofile_path(@fetprofile) %> |
 <%= link_to 'Back', fetprofiles_path %>
+</div>
+</div></div>

app/views/home/links_notimplemented.html.erb

@@ -3,5 +3,6 @@ Vorhandene Resourcen
 <li><%= link_to "galleries", galleries_path %></li>
 <li><%= link_to "fotos", fotos_path %></li>
 <li><%= link_to "gremien", gremien_path %></li>
+<li><%= link_to "fetprofiles", fetprofiles_path %></li>
 <li><%= link_to "memberships", memberships_path %></li>
 </ul>

app/views/memberships/_form.html.erb

@@ -1,10 +1,9 @@
 <%= semantic_form_for @membership do |f| %>
   <%= f.inputs do %>
-    <%= f.input :fetprofile_id %>
-    <%= f.input :gremium_id %>
+    <%= f.input :gremium, :as=>:radio %>
     <%= f.input :start %>
     <%= f.input :stop %>
-    <%= f.input :typ %>
+    <%= f.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %>
   <% end %>
 
   <%= f.actions do %>