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

Merge branch 'kalender' of https://github.com/andreassteph/fetsite into calendar

Browse Source 
Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
This commit is contained in:
Thomas Blazek
2013-08-11 10:34:03 +02:00
parent 661783bcd1 a5a02e065a
commit 88ba8fa1c2
60 changed files with 1575 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/menu.html.erb
View File

@@ -4,8 +4,8 @@
</li>
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
<li><%= link_to I18n.t(:info,:scope=>'home' ) %></li>
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %>
</li>
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
<li><%= link_to "Kalender", calendars_path %></li>
<li><%= link_to "wiki intern", page_path(1) %>
</li>
</ul>