CSS changes

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

@@ -6,16 +6,6 @@ width:90%;
 height:20em;
 }
 
-
+form.formtastic .input label.control-label {
-div.form-group {
+font-weight:bold;
-border-width: 1px;
-border-style: none;
-padding: 10px;
-// border-radius: 10px;
-}
-div.verwalten-block {
-border-width: 1px;
-border-style: solid;
-padding: 5px;
-border-radius:10px;
 }

app/assets/stylesheets/lvas.css.scss

@@ -1,3 +1,11 @@
 // Place all the styles related to the lvas controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+div.lva-semester {
+border: solid;
+border-width: 1px;
+margin: 1px;
+padding: 5px;
+border-color: green;
+}

app/assets/stylesheets/studien.css.scss

@@ -1,3 +1,18 @@
 // Place all the styles related to the studia controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+div.verwalten-block {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+margin: 2px;
+}
+div.studien-semester {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+border-color: blue;
+margin: 2px;
+}

app/views/lvas/_form.html.erb

@@ -28,13 +28,13 @@
 	  
 	  <div class="span3">
 	    <h1> BILD </h1>
-	    <%= f.input :modul,:label=>'<b>Modul</b>'.html_safe, :as=>:check_boxes%>	  
+	    <%= f.input :modul, :as=>:check_boxes%>	  
 	  </div>
 	</div>
       </div>
       <div class="span3">
 	
-	<%= f.input :semester, :label=>'<b>Semester</b>'.html_safe, :as=>:check_boxes%>
+	<%= f.input :semester, :as=>:check_boxes%>
 	
       </div>
     <% end %>

app/views/lvas/_lva_semester.html.erb

@@ -1,10 +1,9 @@
 
-<p class="lva_semester">
+<div class="lva-semester">
   <b><%= link_to lva.name, lva_path(lva)%></b><br>
   Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
   <br>
   <%="LVa-Nr " + lva.lvanr.to_s %>
   <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
   <%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %>
-</p class="lva_semester"> 
+</div class="lva-semester"> 
-<% #toolbar_html(@toolbar_elements) %>

app/views/studien/semesteransicht.html.erb

@@ -11,16 +11,16 @@
     <% @studium.semester.each do |sem| %>
         <div class="row-fluid">
       <div class="span12">
-	<div class="modulgruppe_phase_1">
+	<div class="studien-semester">
 	  <div class="container-fluid">
 	    
 	    <h2><%= sem.name %></h2>
 
-	    <% sem.lvas.each_slice(2) do |row| %>
+	    <% sem.lvas.each_slice(4) do |row| %>
 	      <div class="row-fluid">
 		<% row.each do |l| %>
 		  
-		  <div class="span<%= 12/row.length%>">
+		  <div class="span3">
 		    <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
 		  </div>
 	        <% end %>

app/views/studien/verwalten.html.erb

@@ -24,8 +24,9 @@
 	      
 	      <% end %>
 	    </ul>
-	    <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
+	    
 	  </div>
+	  <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
 	</div>
 	
       </div>
@@ -50,8 +51,10 @@
 		  <li> <%= link_to mg.name, studien_verwalten_path(:mg_verw=>mg)%> </li>
 		  <% end %>
 		</ul>
+		
+	      </div>
 	      <%= link_to "Neue Modulgruppe", new_studium_modulgruppe_path(Studium.first), :class=>"btn" unless Studium.first.nil?%>
-	    </div></div>
+	    </div>
 	    
 	    
 	  </div>
@@ -78,10 +81,10 @@
 		  <li> <%= link_to m.name, studien_verwalten_path(:m_verw=>m)%> </li>
 		  <% end %>
 		</ul>
-		 <%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
-	      </div>
 		
 	      </div>
+	      <%= link_to "Neues Modul", new_modul_path, :class=>"btn"%>
+	    </div>
 	  </div>
 	</div>
 	<div class="span4">
@@ -107,8 +110,10 @@
 		  <li> <%= link_to lva.name, studien_verwalten_path(:lva_verw=>lva)%> </li>
 		  <% end %>
 		</ul>
+
+	      </div>
 	      <%= link_to "Neue LVa", new_lva_path, :class=>'btn'%>
-	    </div></div>
+	    </div>
 	  </div>
 	</div>
 
@@ -141,7 +146,7 @@
 	<% @beispiele.each do |b| %>
 	<%= link_to b.name, b %>
 	<% end %>
-<div class="btn-toolbar">
+	<div class="btn-toolbar">
 	  <div class="btn-group">
 	    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
 	      <%= params[:b_verw].nil? ? I18n.t("filter.beispiel") : Beispiel.find(params[:b_verw]).name %>
@@ -154,8 +159,10 @@
 	      <li> <%= link_to b.name, studien_verwalten_path(:b_verw=>b)%> </li>
 	      <% end %>
 	    </ul>
+
+	  </div>
 	  <%= link_to "Neues Beispiel", new_beispiel_path, :class=>"btn"%>
-	</div></div>
+	</div>
 	
       </div>
     </div>