Formatierungen

app/assets/stylesheets/formtastic-changes.css.scss

@@ -5,13 +5,7 @@ form.formtastic textarea {
 width:90%;
 height:20em;
 }
-form.formtastic .stringish label {
+
-font-weight: bold;
-}
-form.formtastic .choice-group label {
-font-weight: bold;
-}
-form.formtastic fieldset div.control-group{}
 
 div.form-group {
 border-width: 1px;
@@ -19,3 +13,8 @@ border-style: dashed;
 padding: 10px;
 border-radius: 10px;
 }
+div.verwalten-block {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+}

app/controllers/modulgruppen_controller.rb

@@ -51,15 +51,10 @@ class ModulgruppenController < ApplicationController
   def create
     @modulgruppe = Modulgruppe.new(params[:modulgruppe])
     
-    if !params[:studium_id].nil?
-      @studium=Studium.find_by_id(params[:studium_id]) 
-    else
-      @studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) 
-    end
     respond_to do |format|
          
       if @modulgruppe.save
-        format.html { redirect_to @studium, notice: 'Modulgruppe was successfully created.' }
+        format.html { redirect_to @modulgruppe.studium, notice: 'Modulgruppe was successfully created.' }
 
       else
         format.html { render action: "new" }

app/views/modulgruppen/_form.html.erb

@@ -1,13 +1,25 @@
 <%= semantic_form_for @modulgruppe do |f| %>
   <%= f.inputs do %>
-    <%= f.input :studium_id, :as =>:select, :collection => Studium.all %>
+    <div class="span8">
-    <%= f.input :typ ,:as => :radio, :collection=>["Pflicht","Vertiefungspflicht","Wahl"]%>
-    <%= f.input :phase,:as => :radio,:collection=>1..3 %>
-    <%= f.input :name %>
-   <%= f.input :desc,:input_html=>{:rows=> 3 }%>
-  <% end %>
 
+	<div class="row-fluid">
+	  <%= f.input :name, :wrapper_html=>{:class=>"span12"}%>
+	  <div class="row-fluid">
+	    <%= f.input :studium_id, :as =>:select, :collection => Studium.all, :wrapper_html=>{:class=>"span4"} %>
+	    <%= f.input :typ, :collection=>["Pflicht","Vertiefungspflicht","Wahl"], :wrapper_html=>{:class=>"span4"}%>
+	    <%= f.input :phase, :as=>:select, :collection=>1..3, :wrapper_html=>{:class=>"span4"} %>
+	  </div>
+	</div>
+
+
+	<div class="row-fluid">
+      <%= f.input :desc %>
+
+      </div>
+  <% end %>
+  </div>
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
+
   <% end %>
 <% end %>

app/views/studien/verwalten.html.erb

@@ -1,8 +1,7 @@
 <div class="container-fluid">
   <%= render 'studien/tabs'%>
   <div class="row-fluid">
-    <div class="span<%= @messages.empty? ? 10 : 7 %>">
+    <div class="span<%= @messages.empty? ? 10 : 8 %>">
-      <div class="container-fluid">
 	<div class="row-fluid">
 	  <div class="span9">
 	    <h1><%= I18n.t("studien.verwaltung") %></h1>
@@ -11,7 +10,7 @@
 	  </div>
 	  
 	  <div class="span3">
-	    <div class="modulgruppe_phase_2">
+	    <div class="verwalten-block">
 	      <h2>Studien <%= link_to "new", new_studium_path %></h2>
 	      <% @studien.each do |s| %>
 		<%= link_to s.name, s %> <%= (s.valid?) ? "Gültig" : "Problemfall" %> <br>
@@ -23,7 +22,7 @@
 	<div class="row-fluid">
 	  
 	  <div class="span3">
-	    <div class="modulgruppe_phase_2">
+	    <div class="verwalten-block">
 	      <h2>Modulgruppen <%= link_to 'new', new_studium_modulgruppe_path(Studium.first) unless Studium.first.nil? %></h2>
 	      <% @modulgruppen.each do |mg| %>
 		<%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %><br>
@@ -31,7 +30,7 @@
 	    </div>
 	  </div>
 	  <div class="span3">
-	    <div class="modulgruppe_phase_2">
+	    <div class="verwalten-block">
 	      <h2>Module <%= link_to "new", new_modul_path %></h2>
 	      <% @module.each do |m| %>
 		<%= link_to m.name, m %>  
@@ -40,7 +39,7 @@
 	    </div>
 	  </div>
 	  <div class="span3">
-	    <div class="modulgruppe_phase_2">
+	    <div class="verwalten-block">
 	      <h2>LVas <%= link_to "new", new_lva_path %></h2>
 	      <% @lvas.each do |lva| %>
 		<%= link_to lva.name, lva %> |	      
@@ -50,7 +49,7 @@
 	    </div>
 	  </div>
 	  <div class="span3">
-	    <div class="modulgruppe_phase_2">
+	    <div class="verwalten-block">
 	      <h2>Beispiele <%= link_to "new", new_beispiel_path %></h2>
 	      <% @beispiele.each do |b| %>
 		<%= link_to b.name, b %>
@@ -63,16 +62,14 @@
 
 	</div>
     </div>
-    </div>
+    <div class="span<%= @messages.empty? ? 2 : 4 %>">
-    <div class="span<%= @messages.empty? ? 2 : 5 %>">
-      <div class="row-fluid">
       <h2>Error Log</h2>
       <ul>
 	<li><b>Red</b>: Error, Solve immediately</li>
 	<li><b>Black</b>: Warning, should be solved</li>
 	<li><b>Green</b>: Everything is fine</li>
       </ul>
-	<div class="modulgruppe_phase_1">
+      <div class="verwalten-block">
 	<ul>
 	  <% @messages.flatten.each do |m| %><br>
 	    <li><%= m.html_safe %></li>
@@ -81,9 +78,6 @@
 	<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
       </div>
     </div>
-    </div>
 
   </div>
 </div>
-
-</div>