Merge branch 'master' of https://github.com/Inachos/fetsite

app/views/lecturers/_form.html.erb

@@ -3,7 +3,7 @@
     <%= f.input :name %>
     <%= f.input :email %>
     <%= f.input :oid %>
-    <%= f.input :picture %>
+    <%= f.input :picture, :as=>:file %>
     <%= f.input :lvas %>
   <% end %>
 

app/views/lvas/_form.html.erb

@@ -40,7 +40,7 @@
       <div class="span3">
 	
 	<%= f.input :semester, :as=>:check_boxes%>
-	
+	<%= f.input :lecturers, :as=>:check_boxes%>
       </div>
     <% end %>
     <%= f.actions do %>

app/views/rubriken/_tabs.html.erb

@@ -1,6 +1,6 @@
 <ul class="nav nav-tabs">
- <li <%= (request.fullpath == rubriken_path)? 'class="active"'.html_safe : ''%> >
- <%= link_to I18n.t ('rubriken.alle') , calendars_url %> </li>
+ <li <%=  'class="active"'.html_safe if (request.fullpath == rubriken_path)%> >
+ <%= link_to I18n.t('rubriken.alle') , rubriken_path %> </li>
 <% for r in Rubrik.all %>
   <li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"'.html_safe : '' %> title="<%= r.name %>">
     <%= link_to r.name, r %>

app/views/studien/verwalten.html.erb

@@ -28,7 +28,31 @@
 	  </div>
 	  <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
 	</div>
-	
+	  </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 %>
+
+		  <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">