bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Blazek
2015-01-14 09:10:57 +01:00
parent f95c8469e3 47b692b243
commit 9cc108b2ed
6 changed files with 15 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/views/home/_search_results.html.erb
View File

@@ -1,7 +1,7 @@
<% unless @results.nil? %>
<ul class="unstyled linkbox-list">
<% @results.results.each do |res| %>
<% @res.each do |res| %>
<% if can?(:show, res) %>
<li>
<%= link_to res, :class=>:linkbox do %>
@@ -13,44 +13,4 @@
</ul>
<% end %>
<% unless @neuigkeiten.empty? %>
<h2>Neuigkeiten</h2>
<% end %>
<% @neuigkeiten.each do |neuigkeit| %>
<ul class="unstyled linkbox-list" style="max-width:70em">
<li>
<%= render neuigkeit %>
</li>
</ul>
<% end %>
<% unless @fetprofiles.empty? %>
<h2>Mitarbeiter</h2>
<% end %>
<% @fetprofiles.each do |fetprofile| %>
<ul class="unstyled linkbox-list" style="max-width:70em">
<li>
<%= render fetprofile %>
</li>
</ul>
<% end %>
<% unless @fetprofiles.empty? %>
<h2>Themen</h2>
<% end %>
<ul class="unstyled content-list" style="max-width:70em">
<% @themen.each do |thema| %>
<% if can? :show, thema %>
<li><%= link_to thema.title,thema %>
<div class="contentbox">
<%= render :partial=>"themen/small", :object=>thema %>
</div>
</li>
<% end %>
<% end %>
</ul>
<%= @res %>

3
app/views/neuigkeiten/_nlink.html.erb
View File

@@ -1,3 +1,4 @@
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> nlink} %>
<h2> <%= nlink.title %> </h2>
<h2> <% nlink.title %> </h2>

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

@@ -1,2 +1,2 @@
<h2><%= fa_icon("info-circle 2x")+" "+ nlink.title %></h2>
<h2><%= fa_icon("info 2x")+" "+ nlink.title %></h2>
<p><%= raw(nlink.text_first_words) %></p>