fetprofileprivate data

app/views/fetprofiles/_form.html.erb

@@ -28,6 +28,29 @@
       <div class="span4">  <%= f.input :fetmailalias %></div> 
     </div>
     
+<div class="row-fluid">
+<div class="span6">
+Adresse:
+
+<%=f.input :street %>
+<%=f.input :plz %>
+<%=f.input :city %>
+KOntakt:
+<%=f.input :instant %>
+<%=f.input :skype %>
+<%=f.input :telnr %>
+<%=f.input :hdynr %>
+
+</div>
+<div class="span6">
+Geburtstag:
+<%=f.input :birth_day %>
+<%=f.input :birth_month %>
+<%=f.input :birth_year %>
+
+</div>
+
+</div>
 <% @memberships.each do |m| %>
 
     <%= f.semantic_fields_for :memberships, m do |membership| %>

app/views/fetprofiles/_interninfo.html.erb

@@ -0,0 +1,13 @@
+<p>
+  <b>Adresse:</b>
+  <%= interninfo.plz %> 
+  <%= interninfo.city %>, 
+  <%= interninfo.street %> 
+</p>
+<p>
+ <%= raw("<b>Telefon: </b>")+ interninfo.telnr + "<br>" unless interninfo.telnr.empty?%>
+ <%= raw("<b>Handy: </b>") +interninfo.hdynr unless interninfo.hdynr.empty? %><br>
+<%= raw("<b>Skype: </b>") +interninfo.skype unless interninfo.skype.empty? %><br>
+<%= raw("<b>Instant Messaging: </b>") +interninfo.instant unless interninfo.instant.empty? %><br>
+
+</p>

app/views/fetprofiles/_internrow.html.erb

@@ -0,0 +1,12 @@
+<tr>
+<td> <%= link_to internrow.name, internrow %>
+</td>
+<td> <%= internrow.adress %></td>
+<td> 
+ <%= raw("Telefon: ")+ internrow.telnr + "<br>" unless internrow.telnr.nil? || internrow.telnr.empty?%>
+ <%= raw("Handy: ") +internrow.hdynr + raw("<br>") unless internrow.hdynr.nil? || internrow.hdynr.empty? %>
+<%= raw("Skype: ") +internrow.skype + raw("<br>") unless internrow.skype.nil? || internrow.skype.empty? %>
+<%= raw("Instant Messaging: ") +internrow.instant + raw("<br>") unless internrow.instant.nil? || internrow.instant.empty? %>
+</td>
+<td><%= internrow.fetmail %></td>
+</tr>

app/views/fetprofiles/internlist.html.erb

@@ -0,0 +1,5 @@
+<table style="width:100%" class="table table-striped">
+<% @fetprofiles.each do |item| %>
+<%= render partial: "internrow", object: item %>
+<% end %>
+</table>

app/views/fetprofiles/show.html.erb

@@ -10,10 +10,15 @@
       <p>
 	<%= @fetprofile.fetmail %>
       </p>
-      <p>
+  respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @fetprofiles }
+    end
+  
+     <p>
 	<%= @fetprofile.desc %>
       </p>
-
+      <%= render partial: "interninfo", object: @fetprofile if can?(:seeintern, @fetprofile) %>
       <ul>
 	<% @memberships.each do |m| %>
 	<li>

app/views/home/intern.html.erb

@@ -1,10 +1,20 @@
 <h1> FET Intern NEU </h1>
-<h2>Neuigkeiten</h2>
-<ul class="unstyled linkbox-list" style="max-width:70em">
-  <% @neuigkeiten.each do |n| %>
-  <li><%= render n if can?(:show, n) %> </li>
-  <% end %>
-</ul>
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span6">
+      <%= link_to "Adressliste", internlist_fetprofiles_path %>
+      <%= link_to "Internes Nachschlagewerk" %>
+    </div>
+    <div class="span6">
+      <h2>Neuigkeiten</h2>
+      <ul class="unstyled linkbox-list">	
+	<% @neuigkeiten.each do |n| %>
+	<li><%= render n if can?(:show, n) %></li>
+	<% end %>
+      </ul>
+    </div>
+  </div>
+</div>
 
 <h2></h2>