From 1a10f4fc5e2bebf4bcaab01928ed40e9341990d2 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Fri, 9 Aug 2013 20:04:23 +0200
Subject: [PATCH 1/2] Kleiner edit

---
 app/views/beispiele/_form.html.erb | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb
index 1e3833c..01cb3b8 100755
--- a/app/views/beispiele/_form.html.erb
+++ b/app/views/beispiele/_form.html.erb
@@ -4,17 +4,10 @@
 
     <%= f.inputs do %>
       <div class="row-fluid">
-    <div class="span4">
-      <%= f.file_field :beispieldatei %>
-      <%= f.hidden_field :beispieldatei_cache %>
-    </div>
-    <div class="span3"> 
-      <%= f.input :lva, :as=>:select, :collection => Lva.all%>
-
-    </div>
-    <div class="span5">
-      <%= f.input :name %>
-    </div>
+      <%= f.file_field :beispieldatei, :wrapper_html=>{:class=>'span4'}%>
+      <%= f.hidden_field :beispieldatei_cache, :wrapper_html=>{:class=>'span0'} %>
+      <%= f.input :lva, :as=>:select, :collection => Lva.all, :wrapper_html=>{:class=>'span3'}%>
+      <%= f.input :name, :wrapper_html=>{:class=>'span5'} %>
       </div>
     
     <div class="row-fluid">

From 9d8b8ad3d603bc8bdad24b27e20af8ae1cf62ce8 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Sat, 10 Aug 2013 00:58:09 +0200
Subject: [PATCH 2/2] kleiner bugfix, layout

---
 app/controllers/beispiele_controller.rb |  2 +-
 app/controllers/studien_controller.rb   |  2 +-
 app/views/beispiele/_form.html.erb      | 28 ++++++++++++++-----------
 app/views/beispiele/show.html.erb       |  4 +++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb
index ccd30a3..c9d4c49 100755
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
@@ -42,7 +42,7 @@ class BeispieleController < ApplicationController
   # POST /beispiele.json
   def create
     @beispiel = Beispiel.new(params[:beispiel])
-
+    
     respond_to do |format|
       if @beispiel.save
         format.html { redirect_to @beispiel, notice: 'Beispiel was successfully created.' }
diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index f2c9231..0504b84 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -214,7 +214,7 @@ class StudienController < ApplicationController
     end
     for b in @beispiele
       if b.valid?
-        @messages << b.name + ' hat keine Lva' if lva.moduls
+        @messages << b.name + ' hat keine Lva' if b.lva.nil?
       else
         @messages << '<font color="red"><b>'+b.name + ': '
         @messages << b.errors.full_messages
diff --git a/app/views/beispiele/_form.html.erb b/app/views/beispiele/_form.html.erb
index 01cb3b8..a5795e7 100755
--- a/app/views/beispiele/_form.html.erb
+++ b/app/views/beispiele/_form.html.erb
@@ -1,25 +1,29 @@
 <div class="container-fluid">
   <div class="span9">
-  <%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
+    <%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
 
     <%= f.inputs do %>
-      <div class="row-fluid">
-      <%= f.file_field :beispieldatei, :wrapper_html=>{:class=>'span4'}%>
-      <%= f.hidden_field :beispieldatei_cache, :wrapper_html=>{:class=>'span0'} %>
-      <%= f.input :lva, :as=>:select, :collection => Lva.all, :wrapper_html=>{:class=>'span3'}%>
-      <%= f.input :name, :wrapper_html=>{:class=>'span5'} %>
-      </div>
+    <%= f.hidden_field :beispieldatei_cache %>
+
+    <%= f.file_field :beispieldatei, :wrapper_html=>{:class=>"span4"}%>
+    <div class="row-fluid">
+      <%= f.input :name, :wrapper_html=>{:class=>'span6'} %>
+      <%= f.input :lva, :as=>:select, :collection => Lva.all, :wrapper_html=>{:class=>'span6'}%>
+
+      
+      <% end %>
+    </div>
     
     <div class="row-fluid">
       <%= f.input :desc %>
     </div>
     <% end %>    
 
-  <%= f.actions do %>
-  <%= f.action :submit, :as => :input %>
+    <%= f.actions do %>
+    <%= f.action :submit, :as => :input %>
 
-  <% end %>
+    <% end %>
 
-  <% end %>
-</div>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/beispiele/show.html.erb b/app/views/beispiele/show.html.erb
index 1115fb3..49501a7 100755
--- a/app/views/beispiele/show.html.erb
+++ b/app/views/beispiele/show.html.erb
@@ -10,7 +10,9 @@
   <%= @beispiel.desc %>
   <%= @beispiel.beispieldatei.url %>
 </p>
-
+<p>
+  <%= @beispiel.lva.name %>
+  </p>
 
 <%= link_to 'Edit', edit_beispiel_path(@beispiel) %> |
 <%= link_to 'Back', beispiele_path %>