Merge remote-tracking branch 'thomasb/master'

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb

app/views/lvas/show.html.erb

@@ -1,10 +1,17 @@
-<%= render 'layouts/topbar'%>
-<p id="notice"><%= notice %></p>
-<p>
+<div class="container-fluid">
+  <%= render 'studien/tabs'%>
+  <p id="notice"><%= notice %></p>
 
-  <h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
-  
-</p>
+  <div class="row-fluid">
+    <div class="span8">
+      <h1><%= @lva.name %></h1>
+      
+      <h2>Beschreibung</h2>
+      <div class="lva-beschreibung">
+	<%= @lva.desc %>
+      </div>
+      <div class="row-fluid">
+	<h2>Beispiele</h2>
 
   <p><h4>Beschreibung</h4>
   <%= @lva.desc %>
@@ -15,22 +22,35 @@
 <ul>
   <% @lva.beispiele.each do |b|%>
 
-    <li><%= render b%></li>
 
-  <% end %>
-</ul>
-<h4>Module</h4>
-<ul>
-  <% @lva.modul.each do |modul| %>
-    <li><b><%= link_to modul.name , modul_path(modul)%></b>
+	  <%= render b%>
+	<% end %>
+      </div>
+    </div>
+    <div class="span4">
+      <div class="lva-sidebar">
 	<ul>
-      <% modul.modulgruppen.each do |g| %>
+	  <li><b>LVA-Nummer:</b> <%=@lva.lvanr %></li>
+	  <li><b>ECTS:</b> <%=@lva.ects %></li>
+	  <li><b>Stunden:</b> <%=@lva.ects %></li>
+	</ul>
+	<h2>Module</h2>
+	<ul>
+	  <% @lva.modul.each do |modul| %>
+	  <li><b><%= link_to modul.name , modul_path(modul)%></b>
+	    <ul>
+	      <% modul.modulgruppen.each do |g| %>
 
-	<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
-      <% end %>
-      </ul>
-    </li>
-    
-  <% end %>
-</ul>
-<%= render 'layouts/pretty_toolbar' %>
+	      <li><%= link_to g.studium.name , studium_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
+	      <% end %>
+	    </ul>
+	  </li>
+	  
+	  <% end %>
+	</ul>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'layouts/pretty_toolbar' %>
+</div>