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

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>
<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>

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

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

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

@@ -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>