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

calendar show fixed

Browse Source 
tabs fixed + ICS Link hinzugefügt
This commit is contained in:
Andreas Stephanides
2013-08-18 17:47:44 +02:00
parent e298674d87
commit 6f6486c7ae
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/calendars/_tabs.html.erb
View File

@@ -1,8 +1,8 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li <%= (request.fullpath == calendars_path)? 'class="active"' : ''%> > <li <%= (request.fullpath == calendars_path)? 'class="active"'.html_safe : ''%> >
<%= link_to I18n.t 'calendars.alle' , calendars_path %> </li> <%= link_to I18n.t 'calendars.alle' , calendars_path %> </li>
<% for c in Calendar.all %> <% for c in Calendar.all %>
<li <%= (!@calendar.nil? && c == @calendar) ? 'class="active"' : '' %> title="<%= c.name %>"> <li <%= (!@calendar.nil? && c == @calendar) ? 'class="active"'.html_safe : '' %> title="<%= c.name %>">
<%= link_to c.name, c %> <%= link_to c.name, c %>
</li> </li>
<% end %> <% end %>

6
app/views/calendars/show.html.erb
View File

@@ -5,12 +5,14 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<p id="notice"><%= notice %></p> <div class="row-fluid"><p id="notice"><%= notice %></p>
<h1> <h1>
<%= '<i class="icon-globe"></i>'.html_safe unless !@calendar.public%> <%= '<i class="icon-globe"></i>'.html_safe unless !@calendar.public%>
<%= @calendar.name %> <%= @calendar.name %>
</h1> </h1> <%= link_to "Link to iCalendar", calendar_path(@calendar, { format: 'ics'}) %>
</div>
<div class="row-fluid"> <div class="row-fluid">
<ul class="list-group"> <ul class="list-group">
<% @calendar.calentries.each do |entry| %> <% @calendar.calentries.each do |entry| %>