From 04b91b9f33dfa06c6c6d36eac0ae7c66809d5f02 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Wed, 21 Aug 2013 13:48:49 +0200
Subject: [PATCH] Lecturer in Lva eingebunden, Image thumb integriert

---
 app/models/lecturer.rb                        |  4 +-
 app/views/calendars/index.html.erb            | 40 +++++++++----------
 app/views/lecturers/_form.html.erb            | 24 +++++++++--
 app/views/lecturers/_lec_lva.html.erb         | 12 +++++-
 app/views/lvas/show.html.erb                  | 16 ++++----
 .../20130821113333_add_link_to_lecturers.rb   |  5 +++
 6 files changed, 68 insertions(+), 33 deletions(-)
 create mode 100644 db/migrate/20130821113333_add_link_to_lecturers.rb

diff --git a/app/models/lecturer.rb b/app/models/lecturer.rb
index 773e2de..664e612 100644
--- a/app/models/lecturer.rb
+++ b/app/models/lecturer.rb
@@ -1,4 +1,6 @@
 class Lecturer < ActiveRecord::Base
-  attr_accessible :email, :name, :oid, :picture, :lva_ids
+  attr_accessible :email, :name, :oid, :picture, :remove_picture, :picture_cache, :lva_ids, :link
   has_and_belongs_to_many :lvas
+  mount_uploader :picture, PictureUploader
+  resourcify
 end
diff --git a/app/views/calendars/index.html.erb b/app/views/calendars/index.html.erb
index ad394cb..fd90c6c 100644
--- a/app/views/calendars/index.html.erb
+++ b/app/views/calendars/index.html.erb
@@ -1,28 +1,28 @@
 <div class="container-fluid">
-<div class="row-fluid">
-<div class="span12">
-<%= render 'tabs' %>
-</div>
-</div>
+  <div class="row-fluid">
+    <div class="span12">
+      <%= render 'tabs' %>
+    </div>
+  </div>
 
-<div class="row-fluid">
-<div class="span12">
-<h1><%= I18n.t 'calendars.calendar' %></h1>
-<% @calendars.each do |calendar| %>
-    <div class="media">
+  <div class="row-fluid">
+    <div class="span12">
+      <h1><%= I18n.t 'calendars.calendar' %></h1>
+      <% @calendars.each do |calendar| %>
+      <div class="media">
 	<a class="pull-left" href="#">
-	    <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
+	  <img class="media-object img-circle" src="<%= calendar.picture.thumb.url %>"/>
 	</a>
 	<div class="media-body">
-	    <h4><%= link_to calendar.name, calendar %></h4>
+	  <h4><%= link_to calendar.name, calendar %></h4>
 	</div>
+      </div>
+      <% end %>
     </div>
-<% end %>
-</div>
-</div>
-<div class="row-fluid">
-<div class="span12">
-<%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %>
-</div>
-</div>
+  </div>
+  <div class="row-fluid">
+    <div class="span12">
+      <%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %>
+    </div>
+  </div>
 </div>
diff --git a/app/views/lecturers/_form.html.erb b/app/views/lecturers/_form.html.erb
index d9f1416..5dbf669 100644
--- a/app/views/lecturers/_form.html.erb
+++ b/app/views/lecturers/_form.html.erb
@@ -1,10 +1,28 @@
 <%= semantic_form_for @lecturer do |f| %>
   <%= f.inputs do %>
+<div class="row-fluid">
+  <div class="span6">
     <%= f.input :name %>
     <%= f.input :email %>
-    <%= f.input :oid %>
-    <%= f.input :picture, :as=>:file %>
-    <%= f.input :lvas %>
+    <%= f.input :link %>
+    </div>
+    <div class="span3">
+<p>
+    <label>Bild</label>
+    <%= image_tag(@lecturer.picture.thumb.url) unless @lecturer.picture.nil? %>
+    <%= f.file_field :picture %>
+    <%= f.hidden_field :picture_cache %>
+  </p>
+   <p>
+    <label>
+      <%= f.check_box :remove_picture %>
+      Bild Entfernen
+    </label>
+  </p>
+  </div>
+  <div class="span3">
+    <%= f.input :lvas, :as=>:check_boxes%>
+    </div>
   <% end %>
 
   <%= f.actions do %>
diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb
index 0cc48224..21a9536 100644
--- a/app/views/lecturers/_lec_lva.html.erb
+++ b/app/views/lecturers/_lec_lva.html.erb
@@ -1 +1,11 @@
-<h3><%= lec_lva.name %></h3>
+<div class="media">
+	<a class="pull-left" href="#">
+	  <img class="media-object img" src="<%= lec_lva.picture.thumb.url %>"/>
+	</a>
+	<div class="media-body">
+	  <h4><%= link_to lec_lva.name, lec_lva %></h4>
+	  	Email: <%= mail_to lec_lva.email %><br>
+        TISS: <%= link_to lec_lva.name, lec_lva.link %>
+	</div>
+      </div>
+
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index 99bc1ff..7aa4d24 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -18,11 +18,11 @@
       </div>
       <div class="row-fluid">
 	<h2>Beispiele</h2>
-<ul>
-  <% @lva.beispiele.each do |b|%>
+	<ul>
+	  <% @lva.beispiele.each do |b|%>
 
 	  <%= render b%>
-	<% end %>
+	  <% end %>
       </div>
     </div>
     <div class="span4">
@@ -48,12 +48,12 @@
 	</ul>
       </div>
       <div class="lva-sidebar">
-      <h2> <%= I18n.t "lecturers.lecturers" %> </h2>
-      <% @lva.lecturers.each do |lec| %>
-      <%= render :partial=>'lecturers/lec_lva', :object=>lec %>
+	<h2> <%= I18n.t "lecturers.lecturers" %> </h2>
+	<% @lva.lecturers.each do |lec| %>
+	<%= render :partial=>'lecturers/lec_lva', :object=>lec %>
 
-      <% end %>
-    </div>
+	<% end %>
+      </div>
     </div>
   </div>
 
diff --git a/db/migrate/20130821113333_add_link_to_lecturers.rb b/db/migrate/20130821113333_add_link_to_lecturers.rb
new file mode 100644
index 0000000..f376657
--- /dev/null
+++ b/db/migrate/20130821113333_add_link_to_lecturers.rb
@@ -0,0 +1,5 @@
+class AddLinkToLecturers < ActiveRecord::Migration
+  def change
+    add_column :lecturers, :link, :string
+  end
+end