Mercurial > hg > soundsoftware-site
annotate .svn/pristine/e9/e9dadf508df9bd7d0209e39bdd63dbc10563a076.svn-base @ 1442:23b4cba01fc1 luisf
Merge
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 11 Oct 2013 13:49:30 +0100 |
| parents | 038ba2d95de8 |
| children |
| rev | line source |
|---|---|
| Chris@1296 | 1 <% if @wiki && @wiki.sidebar -%> |
| Chris@1296 | 2 <%= textilizable @wiki.sidebar.content, :text %> |
| Chris@1296 | 3 <% end -%> |
| Chris@1296 | 4 |
| Chris@1296 | 5 <h3><%= l(:label_wiki) %></h3> |
| Chris@1296 | 6 |
| Chris@1296 | 7 <%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br /> |
| Chris@1296 | 8 <%= link_to l(:label_index_by_title), {:action => 'index'} %><br /> |
| Chris@1296 | 9 <%= link_to l(:label_index_by_date), {:controller => 'wiki', :project_id => @project, :action => 'date_index'} %><br /> |