From a712fc70f4c214767beec3b825ce1beb49510807 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fetsitetest.fet.htu.tuwien.ac.at>
Date: Mon, 18 Mar 2013 23:07:41 +0100
Subject: [PATCH] moduls

---
 app/controllers/studien_controller.rb |  4 ++--
 app/views/moduls/_form.html.erb       |  2 +-
 app/views/moduls/index.html.erb       | 10 ++++++++--
 app/views/studien/show.html.erb       |  3 ++-
 config/initializers/formtastic.rb     |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 341c305..558b53d 100644
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -1,5 +1,5 @@
 class StudienController < ApplicationController
-
+  
   def index
     @studien = Studium.all
    
@@ -10,7 +10,6 @@ class StudienController < ApplicationController
     @studienphasen=[]
    [1, 2 ,3].each do |ph| 
      modulgruppen_phase=@studium.modulgruppen.where(:phase=>ph)
-
      if modulgruppen_phase.count==1 
       opts={:width=>12, :slice=>1}
      elsif modulgruppen_phase.count <= 4 
@@ -21,6 +20,7 @@ class StudienController < ApplicationController
      modulgruppen =[]
     modulgruppen_phase.each_slice(opts[:slice]) do |s| modulgruppen<<s end
     @studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts)
+    toolbar_elements=[ link_to('<i class="icon-plus"'.html_safe + I18n.t('studien.new') , new_modul_path)]
   end
  end
  
diff --git a/app/views/moduls/_form.html.erb b/app/views/moduls/_form.html.erb
index 7d73f6c..fd67fc1 100644
--- a/app/views/moduls/_form.html.erb
+++ b/app/views/moduls/_form.html.erb
@@ -11,4 +11,4 @@
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
-<%= tinymce %>
\ No newline at end of file
+<%= tinymce %>
diff --git a/app/views/moduls/index.html.erb b/app/views/moduls/index.html.erb
index cd23d5f..6f22799 100644
--- a/app/views/moduls/index.html.erb
+++ b/app/views/moduls/index.html.erb
@@ -1,7 +1,9 @@
-<h1>Listing moduls</h1>
+<h1>Alle Module der Elektrotechnik</h1>
 
-<table>
+<table class="table" >
   <tr>
+    <th>Studium</th>
+    <th>Modulgruppe</th>
     <th>Name</th>
     <th>Desc</th>
     <th></th>
@@ -11,6 +13,10 @@
 
 <% @moduls.each do |modul| %>
   <tr>
+    <td><%= %></td>
+    <td><%= if !modul.modulgruppen.first.nil? 
+modul.modulgruppen.first[:name] 
+end %> </td>
     <td><%= modul.name %></td>
     <td><%= modul.desc %></td>
     <td><%= link_to 'Show', modul_path(modul) %></td>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index f143e65..597138f 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -25,7 +25,8 @@
 <%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
 <%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%>
 <%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %>
+<%= toolbar_html(toolbar_elements) %>
 </span>
 </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/config/initializers/formtastic.rb b/config/initializers/formtastic.rb
index ba963dc..3fbc678 100644
--- a/config/initializers/formtastic.rb
+++ b/config/initializers/formtastic.rb
@@ -7,7 +7,7 @@
 # Formtastic::FormBuilder.default_text_area_height = 5
 
 # Set the default text area width when input is a text. Default is nil.
- Formtastic::FormBuilder.default_text_area_width = 50
+ Formtastic::FormBuilder.default_text_area_width = 100
 
 # Should all fields be considered "required" by default?
 # Defaults to true.