From 116446ff63d82a4fd3885cfef34912e5be701581 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 10 Aug 2013 14:29:36 +0200
Subject: [PATCH] merge layout formular moduls & studien

---
 app/views/moduls/_form.html.erb  | 31 +++++++++++++++++++++++--------
 app/views/studien/_form.html.erb | 29 ++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/app/views/moduls/_form.html.erb b/app/views/moduls/_form.html.erb
index fb6b68b..db03f9d 100755
--- a/app/views/moduls/_form.html.erb
+++ b/app/views/moduls/_form.html.erb
@@ -1,15 +1,30 @@
+<div class="container-fluid">
+  <%= semantic_form_for @modul do |f| %>
 
-<%= semantic_form_for @modul do |f| %>
   <%= f.inputs do %>
-   <% # f.input :modulgruppen,:as => :select,      :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %>
-   <%= f.input :modulgruppen %>
-    <%= f.input :name ,:hint=>true%>
-    <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :depend %>
+  <div class="row-fluid">
+    <div class="span9">
+      <%= f.input :name ,:hint=>true%>
+       <div class="row-fluid">
+    <div class="span8">
+      <%= f.input :desc, :as=>:tinymce_text %>
+    </div>
+    <div class="span4">
+      <%= f.input :depend %>
+    </div>
+  </div>
+    </div>
+    <div class="span3">
+      <%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
+    </div>
+  </div>
+ 
   <% end %>
 
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+
+  <% end %>
+</div>
 <%= tinymce %>
diff --git a/app/views/studien/_form.html.erb b/app/views/studien/_form.html.erb
index 471a8c3..0973ef5 100755
--- a/app/views/studien/_form.html.erb
+++ b/app/views/studien/_form.html.erb
@@ -1,13 +1,28 @@
+<div class="container-fluid">
   <%= tinymce_assets %>
-<%= semantic_form_for @studium do |f| %>
+  <%= semantic_form_for @studium do |f| %>
+  <div class="span9">
   <%= f.inputs do %>
-    <%= f.input :zahl %>
-    <%= f.input :name,:append=>"NAME" %>
+
+  <div class="row-fluid">
+    <div class="span6">
+      <%= f.input :name,:append=>"NAME" %>
+    </div>
+    <div class="span3">
+      <%= f.input :zahl %>
+    </div>
+    <div class="span3">
+      <%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"]%>
+    </div>
+  </div>
+  <div class="row-fluid">
     <%= f.input :desc, :as=>:tinymce_text %>
-    <%= f.input :typ, :as=>:radio, :collection=>["Bachelor","Master"]%>
+  </div>
   <% end %>
-<%= tinymce %>
+  <%= tinymce %>
   <%= f.actions do %>
-    <%= f.action :submit, :as => :input %>
+  <%= f.action :submit, :as => :input %>
   <% end %>
-<% end %>
+  </div>
+  <% end %>
+</div>