andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-19 20:57:48 +02:00
parent 4e7c7c23dd 29388ddcac
commit e50deccf7f
7 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/themengruppen.css.scss
View File

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

1
app/models/themengruppe.rb
View File

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

2
app/views/themen/_thema.html.erb
View File

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

8
app/views/themengruppen/_themengruppe.html.erb
View File

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

28
app/views/themengruppen/index.html.erb
View File

@@ -1,24 +1,26 @@
<div class="container-fluid"> <div class="container-fluid">
<% @themengruppen.each_slice(2) do |row| %> <% @themengruppen.each_slice(2) do |row| %>
<div class="row-fluid"> <div class="row-fluid">
<% row.each do |themengruppe| %> <% row.each do |themengruppe| %>
<div class="span6 equalheight"> <div class="span6 equalheight">
<div class="themengruppe"> <div class="themengruppe">
<%= render themengruppe %> <%= render themengruppe %>
<p> <p>
<%= link_to 'Edit', edit_themengruppe_path(themengruppe) %> <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
</p> </p>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
</div> </div>
<br /> <br />
<script> <script class="hidden-phone">
make_equal_height();
<!-- make_equal_height();
-->
</script> </script>
<%= link_to 'New Themengruppe', new_themengruppe_path %> <%= link_to 'New Themengruppe', new_themengruppe_path %>

2
app/views/themengruppen/show.html.erb
View File

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

4
config/locales/de.yml
View File

@@ -123,4 +123,6 @@ de:
keine: "Keine Fehlermeldungen oder Warnungen" keine: "Keine Fehlermeldungen oder Warnungen"
support: support:
array: array:
two_words_connector: ', ' two_words_connector: ', '
themengruppe:
themen: "Themen"