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

app/models/themengruppe.rb

@@ -11,9 +11,10 @@
 
 class Themengruppe < ActiveRecord::Base
   WORD_COUNT = 50
-  attr_accessible :text, :title
+  attr_accessible :text, :title, :picture
   has_many :themen, class_name: 'Thema'
   has_many :fragen, through: :themen
+  mount_uploader :picture, PictureUploader
   
   validates :title, :presence => true
 

app/views/themen/_form.html.erb

@@ -2,6 +2,7 @@
 <%= semantic_form_for @thema do |f| %>
   <%= f.inputs do %>
     <%= f.input :title %>
+    <%= f.input :picture, :as => :file %>
     <%= f.input :themengruppe %>
     <%= f.input :text, :as=>:tinymce_text%>
   <% end %>

app/views/themengruppen/_form.html.erb

@@ -1,7 +1,9 @@
 <%= semantic_form_for @themengruppe do |f| %>
   <%= f.inputs do %>
     <%= f.input :title %>
+    <%= f.input :picture, :as => :file %>
     <%= f.input :text %>
+
   <% end %>
 
   <%= f.actions do %>

app/views/themengruppen/_themengruppe.html.erb

@@ -1,5 +1,14 @@
-
+<div class="row-fluid">
+	<div class="span2">
+		<%= image_tag themengruppe.picture.thumb.url,{:class=>"img-circle"} %>
+	</div>
+	<div class="span10">
 		 <h3><%=  link_to themengruppe.title, themengruppe %> </h3>
+	</div>
+</div>
+<br/>
+<div class="row-fluid">
+	<div class="span12">
 	<p>
 	<%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
 				themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
@@ -7,7 +16,11 @@
 				themengruppe.text
 	end%>	
 	</p>
-<br/>
+	</div>
+</div>
+
+<div class="row-fluid">
+	<div class="span12">
 		<b><%= I18n.t("themengruppe.themen") %></b>
 		<ul>
 			<% themengruppe.themen.each do |t| %>
@@ -16,3 +29,6 @@
 				</li>
 			<% end %>
 		</ul>
+	</div>
+</div>
+

app/views/themengruppen/index.html.erb

@@ -1,20 +1,22 @@
 <div class="container-fluid">
-
 	<% @themengruppen.each_slice(2) do |row| %>
 	<div class="row-fluid"> 
 		<% row.each do |themengruppe| %>
 		<div class="span6 equalheight">
-      <div class="themengruppe">
+			<div class="container-fluid">
 				<%= render themengruppe %>
-	<p>
+				<br/>
+				<div class="row-fluid">
 					<%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
-	</p>
 				</div>
 			</div>
+		<br/>
+		</div>
 		<% end %>
 	</div>
 	<% end %>
 </div>
+
 <br/>
 
 <script class="hidden-phone">

config/routes.rb

@@ -66,6 +66,7 @@
      
     
      resources :beispiele
+     resources :attachment
      resources :themen
      resources :themengruppen do
        resources :themen, :only=>[:new, :show]

db/migrate/20130823105422_add_picture_to_themengruppe.rb

@@ -0,0 +1,5 @@
+class AddPictureToThemengruppe < ActiveRecord::Migration
+  def change
+	add_column :themengruppen, :picture, :string
+  end
+end