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

app/assets/stylesheets/themengruppen.css.scss

@@ -6,6 +6,6 @@ div.themengruppe
 margin:2px;
 border-radius: 10px;
 min-width:13em;
-border: #91B4FF solid 2px;
+border: #91B4FF solid 0px;
 height: 90%
 }

app/models/themengruppe.rb

@@ -1,4 +1,5 @@
 class Themengruppe < ActiveRecord::Base
+  WORD_COUNT = 50
   attr_accessible :text, :title
   has_many :themen, class_name: 'Thema'
   has_many :fragen, through: :themen

app/views/themen/_thema.html.erb

@@ -1,2 +1,2 @@
-  <%= link_to thema.title,themengruppe_thema_path(thema.themengruppe,thema)%>
+  <%= thema.title%>
 

app/views/themengruppen/_themengruppe.html.erb

@@ -1,8 +1,14 @@
 
 <h3> <%=  link_to themengruppe.title, themengruppe %> </h3>
 <p>
-  <%=themengruppe.text %>
+  <%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
+			themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
+		else
+			themengruppe.text
+		end%>
 </p>
+<br/>
+<b><%= I18n.t("themengruppe.themen") %></b>
 <ul>
 	<% themengruppe.themen.each do |t| %>
 		<li>

app/views/themengruppen/index.html.erb

@@ -17,8 +17,10 @@
 </div>
 <br />
 
-<script>
-make_equal_height();
+<script class="hidden-phone">
+
+<!-- make_equal_height();
+-->
 </script>
 
 <%= link_to 'New Themengruppe', new_themengruppe_path %>

app/views/themengruppen/show.html.erb

@@ -14,7 +14,7 @@
 		</div>
 		<div id="collapse<%=thema.id%>" class="accordion-body collapse">
 		  <div class="accordion-inner">
-			<%= render partial: "themen/small", object: thema %>
+			<%= render :partial => 'themen/small', :object => thema %>
 		  </div>
 		</div>
 	  </div>

config/locales/de.yml

@@ -124,3 +124,5 @@ de:
   support:
     array:
       two_words_connector: ', '  
+  themengruppe:
+    themen: "Themen"