From 18dfe603099112f99f6b1670c0a549e81b5bccdf Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Mon, 19 Aug 2013 23:38:34 +0200
Subject: [PATCH] =?UTF-8?q?Design=C3=A4nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/lvas.css.scss       |  2 +-
 app/views/studien/semesteransicht.html.erb |  3 +-
 app/views/studien/verwalten.html.erb       | 72 ++++++++++++----------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/app/assets/stylesheets/lvas.css.scss b/app/assets/stylesheets/lvas.css.scss
index d9b9a12..3e95e92 100755
--- a/app/assets/stylesheets/lvas.css.scss
+++ b/app/assets/stylesheets/lvas.css.scss
@@ -4,7 +4,7 @@
 
 div.lva-semester {
 border: solid;
-border-width: 1px;
+border-width: 0px;
 margin: 1px;
 padding: 5px;
 border-color: green;
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 5ae6c83..b5b3a85 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -14,8 +14,9 @@
 	<div class="studien-semester">
 	  <div class="container-fluid">
 	    <div class="row-fluid">
+	      
 	      <div class="span8">
-	    <h2><%= sem.name %></h2>
+			    <h2><%= sem.name %></h2>
 	    </div>
 	    <div class="span4"><div class="pull-right"><%= link_to 'Lvas hinzufügen/entfernen', edit_semester_path(sem), :class=>"btn-small"%></div>
 	    </div></div>
diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb
index c045817..af2b07e 100644
--- a/app/views/studien/verwalten.html.erb
+++ b/app/views/studien/verwalten.html.erb
@@ -7,10 +7,16 @@
       <%= I18n.t("studien.verwaltung.explanation").html_safe %>
       <h2>Studien </h2>
       <div class="verwalten-block">
-	
-	|
-	<% @studien.each do |s| %>
-	<%= (s.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to s.name, s %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_studium_path(s)%> ||<% end %>
+	<div class="row-fluid">
+	  <% @studien.each_slice((Studium.count/2.0).ceil) do |col| %>
+
+	  <div class="span6">
+	    <% col.each do |s| %>
+	    <%= (s.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to s.name, s %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_studium_path(s)%> <br>
+	    <% end %>
+	  </div>
+	  <% end %>
+	</div>
 	<div class="btn-toolbar">
 	  <div class="btn-group">
 	    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
@@ -21,38 +27,42 @@
 	      <li> <%= link_to 'Alle Studien', studien_verwalten_path(:std_verw=>nil) %></li>
 	      <% for s in @studien  %>
 	      <li> <%= link_to s.name, studien_verwalten_path(:std_verw=>s)%> </li>
-	      
 	      <% end %>
+
 	    </ul>
 	    
 	  </div>
 	  <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
 	</div>
+      </div>
+      <h2>Vortragende </h2>
+      <div class="verwalten-block">
+	<div class="row-fluid">
+	  <% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %>
+	  <div class="span4">
+	    <% col.each do |lec| %>
+	    <%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> <br>
+	    <% end %>
 	  </div>
-	  <h2>Vortragende </h2>
-	<div class="verwalten-block">
-
-	  <% @lecturers.each do |lec| %>
-	  	<%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> ||
-	  
 	  <% end %>
-	  <div class="btn-toolbar">
-	      <div class="btn-group">
-		<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-		  <%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %>
+	</div>
+	<div class="btn-toolbar">
+	  <div class="btn-group">
+	    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+	      <%= params[:lec_verw].nil? ? I18n.t("filter.lecturer") : Lecturer.find(params[:lec_verw]).name %>
 
-		  <span class="caret"></span>
-		</a>
-		<ul class="dropdown-menu">
-		  <li> <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %></li>
-		  <% for lec in @lecturers  %>
-		  <li> <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%> </li>
-		  <% end %>
-		</ul>
-		
-	      </div>
-	      <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%>
-	    </div>
+	      <span class="caret"></span>
+	    </a>
+	    <ul class="dropdown-menu">
+	      <li> <%= link_to 'Alle Vortragenden', studien_verwalten_path(:lec_verw=>nil) %></li>
+	      <% for lec in @lecturers  %>
+	      <li> <%= link_to lec.name, studien_verwalten_path(:lec_verw=>lec)%> </li>
+	      <% end %>
+	    </ul>
+
+	  </div>
+	  <%= link_to "Neuer Vortragender", new_lecturer_path, :class=>"btn"%>
+	</div>
       </div>
       <div class="row-fluid">
 	
@@ -60,7 +70,7 @@
 	  <h2>Modulgruppen </h2>
 	  <div class="verwalten-block">
 	    <% @modulgruppen.each do |mg| %>
-	    	<%= (mg.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to mg.name, mg %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modulgruppe_path(mg)%><br>
+	    <%= (mg.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to mg.name, mg %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_modulgruppe_path(mg)%><br>
 	    <% end %>
 	    <div class="btn-toolbar">
 	      <div class="btn-group">
@@ -118,7 +128,7 @@
 
 	    <% @lvas.each do |lva| %>
 	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.name, lva %> |	      
-	     <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
+	    <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
 	    
 	    <% end %>
 	    <div class="btn-toolbar">
@@ -147,7 +157,7 @@
       </div>
     </div>
     <div class="span3">
-        <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
+      <%= link_to I18n.t("filter.reset"), studien_verwalten_path(:std_verw=>nil, :mg_verw=>nil, :m_verw=>nil, :lva_verw=>nil, :b_verw=>nil), :class=>"btn" %>
       <h2>Error Log</h2>
       <ul>
 	<li><font color="red"><b>Red</b></font>: Error, Solve immediately</li>
@@ -169,7 +179,7 @@
 
 
 	<% @beispiele.each do |b| %>
-<%= (b.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %>	<%= link_to b.name, b %> |  <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_beispiel_path(b)%>
+	<%= (b.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %>	<%= link_to b.name, b %> |  <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_beispiel_path(b)%>
 	<% end %>
 	<div class="btn-toolbar">
 	  <div class="btn-group">