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

Kalender überarbeitet Issue 91

Browse Source
This commit is contained in:
Andreas Stephanides
2013-11-28 10:14:36 +01:00
parent 6fa208dcbe
commit 0a507502ba
16 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/views/rubriken/index.html.erb
View File

@@ -1,11 +1,28 @@
<%= render 'tabs' %>
<h1><%= I18n.t("rubrik.title")%></h1>
<p id="notice"><%= notice %></p>
<ul class="unstyled linkbox-list" style="max-width:70em">
<% @neuigkeiten.each do |n| %>
<li><%= render n %> </li>
<% end %>
</ul>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<h1><%= I18n.t("rubrik.title")%></h1>
</div>
</div>
<div class="row-fluid">
<div class="span9">
<ul class="unstyled linkbox-list" style="max-width:70em">
<% @neuigkeiten.each do |n| %>
<li><%= render n %> </li>
<% end %>
</ul>
</div>
<div class="span3">
<%= render 'calendars/calentries', :object=>@calentries %>
</div>
</div>
</div>

17
app/views/rubriken/show.html.erb
View File

@@ -1,7 +1,8 @@
<%= render 'tabs' %>
<p id="notice"><%= notice %></p>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<h1><%= @rubrik.name %></h1>
<p>
<%= @rubrik.desc %>
@@ -12,8 +13,10 @@
<%= m.email%>,
<% end%>
</i>
</div></div>
<div class="row-fluid">
<div class="span9">
<% @neuigkeiten.each_slice(1) do |row| %>
<ul class="unstyled" style="max-width:70em">
<% row.each do |neuigkeit| %>
@@ -24,10 +27,18 @@
</ul>
<% end %>
</div>
<div class="span3">
<%= render 'calendars/calentries', :object=>@rubrik.calendar.calentries %>
</div>
</div>
<br>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>